aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'zottel2012-03-235-34/+4953
|\
| * fix in css right_asidetommy tomson2012-03-235-34/+4953
| |
* | Merge remote branch 'upstream/master'zottel2012-03-2312-34/+375
|\|
| * small fixtommy tomson2012-03-231-1/+1
| |
| * Merge pull request #159 from tomtom84/mastertomtom842012-03-222-14/+15
| |\ | | | | | | fixes in theme diabook
| | * fix 1024resolutiontommy tomson2012-03-232-14/+15
| |/
| * Merge pull request #158 from tomtom84/masterfriendica2012-03-226-11/+329
| |\ | | | | | | add right_aside to theme diabook ... need author
| | * add right_aside to theme diabooktommy tomson2012-03-236-11/+329
| |/
| * ability to change tags in edited postsfriendica2012-03-225-14/+36
| |
* | Merge remote branch 'upstream/master'zottel2012-03-2222-20/+349
|\|
| * Merge branch 'pull'friendica2012-03-224-7/+52
| |\
| | * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-223-4/+246
| | |\
| | * | quattro(-green) styling the 'filed under: remove' textTobias Diekershoff2012-03-224-7/+52
| | | |
| * | | normalise comparison link on delegation pagefriendica2012-03-221-1/+1
| | |/ | |/|
| * | Merge pull request #157 from campino/masterfriendica2012-03-223-4/+246
| |\ \ | | |/ | |/| Tests for the template engine
| | * new lines removedAlexander Kampmann2012-03-222-1/+2
| | |
| | * removed some new lines to cut down number of changed filesAlexander Kampmann2012-03-223-2/+1
| | |
| | * removed unneccessary stuffAlexander Kampmann2012-03-222-23/+0
| | |
| | * Merge branch 'master' of git://github.com/friendica/friendicaAlexander Kampmann2012-03-22498-11542/+24259
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: boot.php database.sql include/template_processor.php update.php
| | * | removed problem from previous commitAlexander Kampmann2012-03-221-3/+0
| | | |
| | * | tests for the template engineAlexander Kampmann2012-03-222-1/+225
| | | |
| | * | integrated profilerAlexander Kampmann2012-03-153-41/+26
| | | |
| | * | added simple build-in profilingAlexander Kampmann2012-03-155-2/+64
| | | |
| | * | another test for xmlifyAlexander Kampmann2012-03-151-1/+22
| | | |
| * | | it's only item.filer ;-)Tobias Diekershoff2012-03-222-2/+2
| | | |
| * | | Merge branch 'quattrofiler'Tobias Diekershoff2012-03-222-0/+6
| |\ \ \
| | * | | non static filer textTobias Diekershoff2012-03-222-2/+2
| | | | |
| | * | | adding filer functionality to quattro(-green)Tobias Diekershoff2012-03-222-0/+6
| | | | |
| * | | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-2212-8/+44
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| | * | missing tooltip for "file as"friendica2012-03-226-6/+6
| | | |
| | * | prevent re-registrations using a deleted username - not an issue with ↵friendica2012-03-226-2/+38
| | | | | | | | | | | | | | | | Friendica but could create a serious privacy issue with federated platforms
| * | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-226-0/+10
| |\| |
| * | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-22389-10614/+22032
| |\ \ \
| * \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-186-23/+15
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-173-4/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1731-321/+504
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1651-189/+619
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1538-284/+1398
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1447-338/+752
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1329-58/+379
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-1210-156/+196
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Revert "OpenID: display error msg if ID URL used to register an account does ↵Tobias Diekershoff2012-03-111-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not exist" This reverts commit 3c168503834651b56b9b5de61621e8fbe958c298.
| * | | | | | | | | | | | OpenID: display error msg if ID URL used to register an account does not existTobias Diekershoff2012-03-111-4/+9
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge remote branch 'upstream/master'zottel2012-03-2236-65/+552
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #156 from tomtom84/mastertomtom842012-03-216-0/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | fixes in diabook-derivates
| | * | | | | | | | | | | add file_as-option to diabook-derivatestommy tomson2012-03-226-0/+10
| |/ / / / / / / / / / /
| * | | | | | | | | | | support lowercase :-p smiliefriendica2012-03-211-0/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'pull'friendica2012-03-2114-46/+65
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge pull request #155 from tomtom84/mastertomtom842012-03-2114-46/+65
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes in diabook-derivates
| | | * | | | | | | | | | | add icons to aside diabook, fixes in csstommy tomson2012-03-2214-46/+65
| | |/ / / / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 23:55:58 +0000