Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-11 | 11 | -152/+32 |
|\ | |||||
| * | Merge pull request #840 from cvogeley/master | RedMatrix | 2015-01-12 | 11 | -152/+32 |
| |\ | |||||
| | * | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | * | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | * | Correction | Christian Vogeley | 2015-01-11 | 3 | -4/+3 |
| | * | corrcetion | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | * | Correct | Christian Vogeley | 2015-01-11 | 1 | -19/+18 |
| | * | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -18/+0 |
| | * | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -4/+0 |
| | * | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+4 |
| | * | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+18 |
| | * | . | Christian Vogeley | 2015-01-11 | 1 | -0/+131 |
| | * | . | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | * | fix accidentally removed file | Christian Vogeley | 2015-01-11 | 1 | -0/+446 |
| | * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 1714 | -40293/+538358 |
| | |\ | | |/ | |/| | |||||
| | * | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 3 | -2/+28 |
| | * | merge | Christian Vogeley | 2014-12-27 | 7 | -757/+18 |
* | | | revup | friendica | 2015-01-11 | 1 | -1/+1 |
|/ / | |||||
* | | connection clone issues | friendica | 2015-01-10 | 2 | -2/+5 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-10 | 11 | -5411/+5452 |
|\ \ | |||||
| * \ | Merge pull request #839 from einervonvielen/dev_beginning_fix1 | RedMatrix | 2015-01-11 | 1 | -17/+25 |
| |\ \ | |||||
| | * | | Changed step-by-step manual for beginning developers. | Einer von Vielen | 2015-01-10 | 1 | -1/+1 |
| | * | | Changed step-by-step manual for beginning devolopers. | Einer von Vielen | 2015-01-10 | 1 | -17/+25 |
| * | | | Fix unescaped image data | Habeas Codice | 2015-01-10 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #838 from f03el/master | git-marijus | 2015-01-10 | 3 | -2696/+2709 |
| |\ \ | |||||
| | * | | Fix typo and rephrase Swedish translation | Erik Lundin | 2015-01-10 | 1 | -5/+5 |
| | * | | Update Swedish strings from Transifex | Erik Lundin | 2015-01-10 | 2 | -2691/+2704 |
| * | | | Merge pull request #837 from git-marijus/master | git-marijus | 2015-01-10 | 4 | -2/+8 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | 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 | Paolo Tacconi | 2015-01-09 | 2 | -2696/+2709 |
| |/ / | |||||
* / / | doc updates | friendica | 2015-01-10 | 47 | -1206/+1679 |
|/ / | |||||
* | | 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 |
| |\ \ | |||||
| | * | | 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 dro... | Stefan Parviainen | 2015-01-08 | 1 | -9/+24 |
| | * | | 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 current English one | zottel | 2015-01-08 | 1 | -24/+103 |
| * | | | | Merge pull request #831 from zzottel/master | zzottel | 2015-01-08 | 1 | -0/+2 |
| |\| | | | |||||
| | * | | | 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 |
| |\| | | |||||
| | * | | Merge autocomplete caching, show more results in navbar search | Stefan Parviainen | 2015-01-07 | 12 | -191/+708 |
| | |\ \ | | |/ / | |/| | |