aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* work in progress js_uploader plugin, turn java uploader into plugin - not don...Friendika2011-01-2668-0/+6768
* whitespace onlyFriendika2011-01-261-1/+1
* no comment box if no notify, not no pollFriendika2011-01-251-2/+2
* smilies on new item viewFriendika2011-01-251-1/+1
* greenzero stripped to bare essentials, imported from duepuntozeroFriendika2011-01-251-1865/+7
* renamed theme - it was a bit too longFriendika2011-01-254-0/+0
* Merge branch 'master' of https://github.com/tobiasd/friendika into tobiasd-ma...Friendika2011-01-2554-0/+4756
|\
| * Merge git://github.com/tobiasd/friendikaTobias Diekershoff2011-01-254-0/+1887
| |\
| | * a green variation of the duepuntozero themeTobias Diekershoff2011-01-254-0/+1887
| | * Merge branch 'master' of git://github.com/tobiasd/friendikaTobias Diekershoff2011-01-257-12/+63
| | |\
| | * \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-245-52/+233
| | |\ \
| | * \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2463-10/+3047
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-236-9/+10
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-222-3/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-1/+1
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-212-5/+9
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-22/+22
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-212-2/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-213-32/+32
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-211-23/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/tobiasd/friendikaroot2011-01-2149-0/+2867
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-216-35/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-2010-31/+173
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1913-11/+67
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1817-60/+97
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-159-76/+136
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-148-7/+179
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-134-1/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-1310-10/+130
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-114-13/+58
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-101-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0818-693/+98
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-066-8/+706
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-063-8/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-058-6/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0512-6/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-048-34/+61
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0427-112/+2022
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-0310-22/+48
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-025-5/+42
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2011-01-011-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-319-57/+1253
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-3012-79/+906
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-285-21/+157
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-272-3/+138
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2610-17/+63
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-254-1/+20
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://github.com/friendika/friendikaroot2010-12-2513-28/+120
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 17:32:17 +0000