aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 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 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
| |/ /
* | | Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-03-22389-10614/+22032
|\| |
| * | 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
| | |/ /
| * / / work around doubled linefeeds in tinymce3.5b2friendica2012-03-211-0/+10
| |/ /
| * | revert permissions relaxation on communityfriendica2012-03-211-2/+2
| | |
| * | add comix-plainfriendica2012-03-217-1/+415
| | |
| * | smooth the comix comment boxfriendica2012-03-212-2/+36
| | |
| * | make autocomplete work with updated tinymcefriendica2012-03-211-10/+10
| | |
| * | ika to icafriendica2012-03-211-1/+1
| | |
| * | private file in repositoryfriendica2012-03-211-0/+0
| | |
| * | facepark is unsupported ATMfriendica2012-03-212-0/+0
| | |
| * | Merge branch 'pull'friendica2012-03-2025-0/+3661
| |\ \
| | * \ Merge pull request #154 from tonybaldwin/masterfriendica2012-03-2025-0/+3661
| | |\ \ | | | | | | | | | | added theme
| | | * \ Merge remote branch 'upstream/master'tony baldwin2012-03-21426-11330/+19994
| | | |\ \
| | | * | | added Vijay's theme from facepark.intony baldwin2012-03-2125-0/+3661
| | | | | |
| * | | | | remove stray template variable from old codefriendica2012-03-202-3/+1
| |/ / / /
| * | | | add comix themefriendica2012-03-205-0/+386
| | | | |
| * | | | use password field for DB inputfriendica2012-03-201-1/+1
| | |/ / | |/| |
| * | | added README to mcefixes to explain what is going on.friendica2012-03-201-0/+4
| | | |
| * | | update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocksfriendica2012-03-20296-10368/+17048
| | | |
| * | | more friend suggestionsfriendica2012-03-201-1/+1
| | | |