Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into trinidad | friendica | 2015-01-07 | 21 | -154/+129 |
|\ | |||||
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 15 | -143/+116 |
| |\ | |||||
| | * | Merge pull request #829 from pafcu/oneautocompleter | RedMatrix | 2015-01-08 | 15 | -142/+115 |
| | |\ | | | | | | | | | Steps towards a single autocompleter | ||||
| | | * | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 12 | -191/+708 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | also style the collapse link | marijus | 2015-01-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Typo + comment | Stefan Parviainen | 2015-01-07 | 1 | -1/+1 |
| | | | | |||||
| | | * | Remove out-of-date mod_message.js | Stefan Parviainen | 2015-01-07 | 1 | -13/+0 |
| | | | | |||||
| | | * | Add autosubmit feature to textcomplete based autocompleter | Stefan Parviainen | 2015-01-07 | 6 | -7/+18 |
| | | | | |||||
| | | * | Make mod_sources autocomplete use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -13/+5 |
| | | | | |||||
| | | * | Make photos tag autocomplete use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -13/+5 |
| | | | | |||||
| | | * | Make mod_connections search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -9/+1 |
| | | | | |||||
| | | * | Return results from acl.php in standard form | Stefan Parviainen | 2015-01-07 | 1 | -20/+0 |
| | | | | |||||
| | | * | Allow passing autocomplete type to contact_autocomplete | Stefan Parviainen | 2015-01-07 | 3 | -4/+6 |
| | | | | |||||
| | | * | Disable browser-based autocomplete when using the textcomplete based one | Stefan Parviainen | 2015-01-07 | 1 | -0/+3 |
| | | | | |||||
| | | * | Make searchbox use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -6/+1 |
| | | | | |||||
| | | * | Make mail use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -9/+2 |
| | | | | |||||
| | | * | Make mod_poke use textcomplete | Stefan Parviainen | 2015-01-07 | 2 | -14/+25 |
| | | | | |||||
| | | * | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 3 | -27/+41 |
| | | | | |||||
| | | * | Rename some stuff related to autocomplete | Stefan Parviainen | 2015-01-07 | 5 | -14/+14 |
| | | | | |||||
| | | * | Allow textcomplete to work on inputs (PR also filed upstream) | Stefan Parviainen | 2015-01-07 | 1 | -3/+4 |
| | | | | |||||
| * | | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 5 | -8/+10 |
| | | | | |||||
| * | | | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 2 | -3/+3 |
| |/ / | |||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 1 | -3/+8 |
|\| | | |||||
| * | | don't update locally deleted items | friendica | 2015-01-06 | 1 | -3/+8 |
| | | | |||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 1 | -1/+1 |
|\| | | |||||
| * | | this brings us up to date | friendica | 2015-01-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 1 | -2/+2 |
|\| | | |||||
| * | | don't let dns_get_record() "write to screen" if it errors. | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 1 | -0/+17 |
|\| | | |||||
| * | | Merge pull request #826 from pafcu/cache_autocomplete | RedMatrix | 2015-01-07 | 1 | -0/+17 |
| |\ \ | | | | | | | | | Cache autocomplete results locally (the one in the editor) | ||||
| | * | | Cache autocomplete results locally (the one in the editor) | Stefan Parviainen | 2015-01-06 | 1 | -0/+17 |
| | |/ | |||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 1 | -2/+2 |
|\| | | |||||
| * | | lines reversed in handle_tag() | friendica | 2015-01-06 | 1 | -2/+2 |
| | | | |||||
* | | | begin the grand unification for 3.0. Start by splitting DAV into a web ↵ | friendica | 2015-01-06 | 2 | -27/+156 |
| | | | | | | | | | | | | accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources. | ||||
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 3 | -152/+229 |
|\| | | |||||
| * | | Merge pull request #825 from einervonvielen/dev_beginning_fix | RedMatrix | 2015-01-07 | 1 | -7/+8 |
| |\ \ | | | | | | | | | Corrected errors in chapter 'Contribute your changes via github' | ||||
| | * | | Corrected errors in chapter 'Contribute your changes via github' | Einer von Vielen | 2015-01-06 | 1 | -7/+8 |
| | | | | | | | | | | | | | | | | - changed commit statement - changed push statement (it pointed to the orign) | ||||
| * | | | Merge branch 'pafcu-mainjsoptimize' | friendica | 2015-01-06 | 2 | -145/+221 |
| |\ \ \ | |||||
| | * | | | Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into ↵ | friendica | 2015-01-06 | 2 | -145/+221 |
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pafcu-mainjsoptimize Conflicts: view/js/main.js | ||||
| | * | | | Don't update fuzzy time for items in a collapsed thread to increase performance. | Stefan Parviainen | 2015-01-06 | 1 | -6/+13 |
| | | | | | |||||
| | * | | | Update jquery.timeago.js to add support for dispose action | Stefan Parviainen | 2015-01-06 | 1 | -139/+208 |
| | | | | | |||||
* | | | | | Merge branch 'master' into trinidad | friendica | 2015-01-06 | 6 | -6/+412 |
|\| | | | | |||||
| * | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-06 | 5 | -5/+411 |
| |\ \ \ \ | |||||
| | * | | | | add some style to divgrowmore | marijus | 2015-01-06 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| | * | | | Merge pull request #823 from einervonvielen/dev_beginning | mrjive | 2015-01-06 | 2 | -0/+405 |
| | |\ \ \ | | | | | | | | | | | | | Step-by-step manual to debug the red matrix (php) and to contribute code | ||||
| | | * | | | spelling | Einer von Vielen | 2015-01-06 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | added modification of branch | Einer von Vielen | 2015-01-06 | 1 | -53/+64 |
| | | | | | | |||||
| | | * | | | Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵ | Einer von Vielen | 2015-01-06 | 1 | -0/+393 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github | ||||
| | | * | | | Mainly it shows how to debug the red matrix (php) in a virtual machine and ↵ | Einer von Vielen | 2015-01-06 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | contribute changes via git. It will guide to the following steps: - Install a Virtual Machine - Install Apache Web Server - Install PHP, MySQL, phpMyAdmin - Fork the project on github to be able contribute - Install the RED Matrix - Debug the server via eclipse - Contribute your changes via github | ||||
| | * | | | | Merge pull request #822 from pafcu/master | pafcu | 2015-01-06 | 2 | -4/+5 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | Add title to bb_observer tags to further clarify a bit what's going on |