Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #837 from git-marijus/master | git-marijus | 2015-01-10 | 4 | -2/+8 |
|\ | | | | | basic changes for file activity | ||||
| * | basic changes for file activity | marijus | 2015-01-09 | 4 | -2/+8 |
|/ | |||||
* | Merge pull request #836 from tuscanhobbit/dev | Paolo T | 2015-01-09 | 2 | -2696/+2709 |
|\ | | | | | Updated Italian translation | ||||
| * | Updated Italian translation | Paolo Tacconi | 2015-01-09 | 2 | -2696/+2709 |
|/ | |||||
* | clean up some url anomalies in dir_sort_links after security fix | friendica | 2015-01-08 | 1 | -1/+3 |
| | |||||
* | double q argument could also cause issues | friendica | 2015-01-08 | 1 | -1/+4 |
| | |||||
* | SECURITY: dir_sort_links() exposes session cookie | friendica | 2015-01-08 | 1 | -2/+2 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-08 | 6 | -59/+167 |
|\ | |||||
| * | Merge pull request #833 from pafcu/oneautocompleter | pafcu | 2015-01-08 | 4 | -35/+62 |
| |\ | | | | | | | Fixes for the new autocompletion | ||||
| | * | Fix saved searches on network page, fix caching mith multiple autocompleters | Stefan Parviainen | 2015-01-08 | 3 | -29/+40 |
| | | | |||||
| | * | Fix issue with case sensitive filtering in autocomplete, put autocomplete ↵ | Stefan Parviainen | 2015-01-08 | 1 | -9/+24 |
| | | | | | | | | | | | | dropdown on top of navbar, show entry to leave the text unchanged | ||||
| | * | Honor requested count in navbar search | Stefan Parviainen | 2015-01-08 | 1 | -1/+2 |
| | | | |||||
| * | | Merge pull request #832 from zzottel/master | zzottel | 2015-01-08 | 1 | -24/+103 |
| |\ \ | | | | | | | | | updated German translation of features.bb help file to match English version | ||||
| | * | | updated German translation of features.bb help file to match current English one | zottel | 2015-01-08 | 1 | -24/+103 |
| | | | | |||||
| * | | | Merge pull request #831 from zzottel/master | zzottel | 2015-01-08 | 1 | -0/+2 |
| |\| | | | | | | | | | | update German main help file | ||||
| | * | | remove extra blank line | zottel | 2015-01-08 | 1 | -1/+0 |
| | | | | |||||
| | * | | update German main help file | zottel | 2015-01-08 | 1 | -0/+3 |
| |/ / | |||||
* | | | include channel clones in PM deliveries (also some whitespace edits) | friendica | 2015-01-08 | 4 | -17/+18 |
| | | | |||||
* | | | the yearly license update | friendica | 2015-01-07 | 1 | -1/+1 |
|/ / | |||||
* | | 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 |
|/ / | |||||
* | | don't update locally deleted items | friendica | 2015-01-06 | 1 | -3/+8 |
| | | |||||
* | | this brings us up to date | friendica | 2015-01-06 | 1 | -1/+1 |
| | | |||||
* | | don't let dns_get_record() "write to screen" if it errors. | friendica | 2015-01-06 | 1 | -2/+2 |
| | | |||||
* | | 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 |
| |/ | |||||
* | | lines reversed in handle_tag() | friendica | 2015-01-06 | 1 | -2/+2 |
| | | |||||
* | | 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 |