aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #837 from git-marijus/mastergit-marijus2015-01-104-2/+8
|\ | | | | basic changes for file activity
| * basic changes for file activitymarijus2015-01-094-2/+8
|/
* Merge pull request #836 from tuscanhobbit/devPaolo T2015-01-092-2696/+2709
|\ | | | | Updated Italian translation
| * Updated Italian translationPaolo Tacconi2015-01-092-2696/+2709
|/
* clean up some url anomalies in dir_sort_links after security fixfriendica2015-01-081-1/+3
|
* double q argument could also cause issuesfriendica2015-01-081-1/+4
|
* SECURITY: dir_sort_links() exposes session cookiefriendica2015-01-081-2/+2
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-086-59/+167
|\
| * Merge pull request #833 from pafcu/oneautocompleterpafcu2015-01-084-35/+62
| |\ | | | | | | Fixes for the new autocompletion
| | * Fix saved searches on network page, fix caching mith multiple autocompletersStefan Parviainen2015-01-083-29/+40
| | |
| | * Fix issue with case sensitive filtering in autocomplete, put autocomplete ↵Stefan Parviainen2015-01-081-9/+24
| | | | | | | | | | | | dropdown on top of navbar, show entry to leave the text unchanged
| | * Honor requested count in navbar searchStefan Parviainen2015-01-081-1/+2
| | |
| * | Merge pull request #832 from zzottel/masterzzottel2015-01-081-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 onezottel2015-01-081-24/+103
| | | |
| * | | Merge pull request #831 from zzottel/masterzzottel2015-01-081-0/+2
| |\| | | | | | | | | | update German main help file
| | * | remove extra blank linezottel2015-01-081-1/+0
| | | |
| | * | update German main help filezottel2015-01-081-0/+3
| |/ /
* | | include channel clones in PM deliveries (also some whitespace edits)friendica2015-01-084-17/+18
| | |
* | | the yearly license updatefriendica2015-01-071-1/+1
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0715-143/+116
|\ \
| * | Merge pull request #829 from pafcu/oneautocompleterRedMatrix2015-01-0815-142/+115
| |\| | | | | | | Steps towards a single autocompleter
| | * Merge autocomplete caching, show more results in navbar searchStefan Parviainen2015-01-0712-191/+708
| | |\ | | |/ | |/|
| * | also style the collapse linkmarijus2015-01-071-1/+1
| | |
| | * Typo + commentStefan Parviainen2015-01-071-1/+1
| | |
| | * Remove out-of-date mod_message.jsStefan Parviainen2015-01-071-13/+0
| | |
| | * Add autosubmit feature to textcomplete based autocompleterStefan Parviainen2015-01-076-7/+18
| | |
| | * Make mod_sources autocomplete use textcompleteStefan Parviainen2015-01-071-13/+5
| | |
| | * Make photos tag autocomplete use textcompleteStefan Parviainen2015-01-071-13/+5
| | |
| | * Make mod_connections search use textcompleteStefan Parviainen2015-01-071-9/+1
| | |
| | * Return results from acl.php in standard formStefan Parviainen2015-01-071-20/+0
| | |
| | * Allow passing autocomplete type to contact_autocompleteStefan Parviainen2015-01-073-4/+6
| | |
| | * Disable browser-based autocomplete when using the textcomplete based oneStefan Parviainen2015-01-071-0/+3
| | |
| | * Make searchbox use textcompleteStefan Parviainen2015-01-071-6/+1
| | |
| | * Make mail use textcompleteStefan Parviainen2015-01-071-9/+2
| | |
| | * Make mod_poke use textcompleteStefan Parviainen2015-01-072-14/+25
| | |
| | * Make nav search use textcompleteStefan Parviainen2015-01-073-27/+41
| | |
| | * Rename some stuff related to autocompleteStefan Parviainen2015-01-075-14/+14
| | |
| | * Allow textcomplete to work on inputs (PR also filed upstream)Stefan Parviainen2015-01-071-3/+4
| | |
* | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-075-8/+10
| | |
* | | don't allow admin to delete the sys channel from the channel manage pagefriendica2015-01-062-3/+3
|/ /
* | don't update locally deleted itemsfriendica2015-01-061-3/+8
| |
* | this brings us up to datefriendica2015-01-061-1/+1
| |
* | don't let dns_get_record() "write to screen" if it errors.friendica2015-01-061-2/+2
| |
* | Merge pull request #826 from pafcu/cache_autocompleteRedMatrix2015-01-071-0/+17
|\ \ | | | | | | Cache autocomplete results locally (the one in the editor)
| * | Cache autocomplete results locally (the one in the editor)Stefan Parviainen2015-01-061-0/+17
| |/
* | lines reversed in handle_tag()friendica2015-01-061-2/+2
| |
* | Merge pull request #825 from einervonvielen/dev_beginning_fixRedMatrix2015-01-071-7/+8
|\ \ | | | | | | Corrected errors in chapter 'Contribute your changes via github'
| * | Corrected errors in chapter 'Contribute your changes via github'Einer von Vielen2015-01-061-7/+8
| | | | | | | | | | | | - changed commit statement - changed push statement (it pointed to the orign)
* | | Merge branch 'pafcu-mainjsoptimize'friendica2015-01-062-145/+221
|\ \ \
| * | | Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into ↵friendica2015-01-062-145/+221
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | pafcu-mainjsoptimize Conflicts: view/js/main.js