aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * put back inChristian Vogeley2015-01-111-0/+18
| | | * .Christian Vogeley2015-01-111-0/+131
| | | * .Christian Vogeley2015-01-111-1/+1
| | | * fix accidentally removed fileChristian Vogeley2015-01-111-0/+446
| | | * Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-111714-40293/+538358
| | | |\ | | | |/ | | |/|
| | | * Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-113-2/+28
| | | * mergeChristian Vogeley2014-12-277-757/+18
| * | | revupfriendica2015-01-111-1/+1
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-102-2/+5
|\| |
| * | connection clone issuesfriendica2015-01-102-2/+5
* | | Merge branch 'master' into trinidadfriendica2015-01-1058-6617/+7131
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-1011-5411/+5452
| |\ \
| | * \ Merge pull request #839 from einervonvielen/dev_beginning_fix1RedMatrix2015-01-111-17/+25
| | |\ \
| | | * | Changed step-by-step manual for beginning developers.Einer von Vielen2015-01-101-1/+1
| | | * | Changed step-by-step manual for beginning devolopers.Einer von Vielen2015-01-101-17/+25
| | * | | Fix unescaped image dataHabeas Codice2015-01-101-0/+1
| | |/ /
| | * | Merge pull request #838 from f03el/mastergit-marijus2015-01-103-2696/+2709
| | |\ \
| | | * | Fix typo and rephrase Swedish translationErik Lundin2015-01-101-5/+5
| | | * | Update Swedish strings from TransifexErik Lundin2015-01-102-2691/+2704
| | * | | Merge pull request #837 from git-marijus/mastergit-marijus2015-01-104-2/+8
| | |\ \ \ | | | |/ / | | |/| |
| | | * | basic changes for file activitymarijus2015-01-094-2/+8
| | |/ /
| | * | Merge pull request #836 from tuscanhobbit/devPaolo T2015-01-092-2696/+2709
| | |\ \
| | | * | Updated Italian translationPaolo Tacconi2015-01-092-2696/+2709
| | |/ /
| * / / doc updatesfriendica2015-01-1047-1206/+1679
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-081-1/+3
|\| |
| * | clean up some url anomalies in dir_sort_links after security fixfriendica2015-01-081-1/+3
* | | Merge branch 'master' into trinidadfriendica2015-01-081-1/+4
|\| |
| * | double q argument could also cause issuesfriendica2015-01-081-1/+4
* | | Merge branch 'master' into trinidadfriendica2015-01-081-2/+2
|\| |
| * | SECURITY: dir_sort_links() exposes session cookiefriendica2015-01-081-2/+2
* | | Merge branch 'master' into trinidadfriendica2015-01-0811-77/+186
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-086-59/+167
| |\ \
| | * \ Merge pull request #833 from pafcu/oneautocompleterpafcu2015-01-084-35/+62
| | |\ \
| | | * | 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 dro...Stefan Parviainen2015-01-081-9/+24
| | | * | 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 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