aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge pull request #832 from zzottel/masterzzottel2015-01-081-24/+103
| | |\ \ \ \ \
| | | * | | | | 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
| | |\| | | | |
| | | * | | | | 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 branch 'master' into trinidadfriendica2015-01-0721-154/+129
|\| | | | |
| * | | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-0715-143/+116
| |\ \ \ \ \
| | * | | | | Merge pull request #829 from pafcu/oneautocompleterRedMatrix2015-01-0815-142/+115
| | |\| | | |
| | | * | | | 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
| |/ / / / /
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-061-3/+8
|\| | | | |
| * | | | | don't update locally deleted itemsfriendica2015-01-061-3/+8
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-061-1/+1
|\| | | | |
| * | | | | this brings us up to datefriendica2015-01-061-1/+1
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-061-2/+2
|\| | | | |
| * | | | | don't let dns_get_record() "write to screen" if it errors.friendica2015-01-061-2/+2
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-061-0/+17
|\| | | | |
| * | | | | Merge pull request #826 from pafcu/cache_autocompleteRedMatrix2015-01-071-0/+17
| |\ \ \ \ \
| | * | | | | Cache autocomplete results locally (the one in the editor)Stefan Parviainen2015-01-061-0/+17
| | |/ / / /
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-061-2/+2
|\| | | | |
| * | | | | lines reversed in handle_tag()friendica2015-01-061-2/+2
* | | | | | begin the grand unification for 3.0. Start by splitting DAV into a web access...friendica2015-01-062-27/+156
* | | | | | Merge branch 'master' into trinidadfriendica2015-01-063-152/+229
|\| | | | |
| * | | | | Merge pull request #825 from einervonvielen/dev_beginning_fixRedMatrix2015-01-071-7/+8
| |\ \ \ \ \
| | * | | | | Corrected errors in chapter 'Contribute your changes via github'Einer von Vielen2015-01-061-7/+8
| * | | | | | Merge branch 'pafcu-mainjsoptimize'friendica2015-01-062-145/+221
| |\ \ \ \ \ \
| | * | | | | | Merge branch 'mainjsoptimize' of git://github.com/pafcu/red into pafcu-mainjs...friendica2015-01-062-145/+221
| |/| | | | | |
| | * | | | | | Don't update fuzzy time for items in a collapsed thread to increase performance.Stefan Parviainen2015-01-061-6/+13
| | * | | | | | Update jquery.timeago.js to add support for dispose actionStefan Parviainen2015-01-061-139/+208
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Merge branch 'master' into trinidadfriendica2015-01-066-6/+412
|\| | | | | |
| * | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-065-5/+411
| |\ \ \ \ \ \