aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* remove extraneous debug file left over from postgres work.friendica2015-01-111-1/+0
* that was not intended to be merged with master yet. Put it under a definefriendica2015-01-111-2/+36
* optionally use openssl encryption functions (higher performance over mcrypt, ...friendica2015-01-111-2/+2
* allow the use of openssl cryptofriendica2015-01-111-0/+6
* basic backend work for creating consensus itemsfriendica2015-01-115-27/+84
* Merge branch 'master' into trinidadfriendica2015-01-1112-153/+33
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-1111-152/+32
| |\
| | * Merge pull request #840 from cvogeley/masterRedMatrix2015-01-1211-152/+32
| | |\
| | | * CorrectionChristian Vogeley2015-01-111-1/+1
| | | * CorrectionChristian Vogeley2015-01-111-1/+1
| | | * CorrectionChristian Vogeley2015-01-113-4/+3
| | | * corrcetionChristian Vogeley2015-01-111-1/+1
| | | * CorrectChristian Vogeley2015-01-111-19/+18
| | | * Revert "put back in"Christian Vogeley2015-01-111-18/+0
| | | * Revert "put back in"Christian Vogeley2015-01-111-4/+0
| | | * put back inChristian Vogeley2015-01-111-0/+4
| | | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 18:18:05 +0000