aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | don't allow non-existent themes as choicesfriendica2012-04-223-151/+52
| |/ / / / /
| * | | | | Merge https://github.com/friendica/friendica into pullfriendica2012-04-21382-55989/+76
| |\ \ \ \ \
| | * | | | | diabook-themes: deleted obsolete diabook-folder & minor bug-fixestommy tomson2012-04-22382-55989/+76
| | |/ / / /
| * / / / / rev updatefriendica2012-04-212-42/+118
| |/ / / /
| * | | | rev updatefriendica2012-04-212-416/+560
| * | | | Merge pull request #255 from simonlnu/masterSimon2012-04-202-0/+4
| |\ \ \ \
| | * | | | fix checkbox/radio buttons for some browsersSimon L'nu2012-04-202-0/+4
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-200-0/+0
| |/ / / /
| * | | | diabook-themes: add diabook-darktommy tomson2012-04-21117-1/+18810
| * | | | diabook-themes: add diabook-green and some minor css/bug-fixestommy tomson2012-04-20121-30/+19091
| * | | | rev updatefriendica2012-04-202-7/+7
* | | | | Merge remote branch 'upstream/master'zottel2012-04-20636-4024/+115549
|\| | | |
| * | | | Merge pull request #254 from simonlnu/masterSimon2012-04-2021-21/+1803
| |\ \ \ \
| | * | | | fix the buttons. don't hide the buttons once shownSimon L'nu2012-04-204-14/+2
| | * | | | optimise imgs; add some comment editing knobsSimon L'nu2012-04-2021-21/+1815
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-2010-39/+118
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-20471-28/+75613
| | |\ \ \ \ \
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-190-0/+0
| * | | | | | | Merge pull request #253 from fabrixxm/masterfabrixxm2012-04-208-50/+50
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | escape email template var names. fix bug n385.Fabio Comuni2012-04-208-50/+50
| | | |/ / / / | | |/| | | |
| * | | | | | Merge remote-tracking branch 'CatoTH/master' into req245Fabio Comuni2012-04-2010-39/+118
| |\ \ \ \ \ \ | | |/ / / / / | |/| | / / / | | | |/ / / | | |/| | |
| | * | | | XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-183-6/+15
| | * | | | XSRF protection and PHPdoc for mod/admin.phpTobias Hößl2012-04-188-33/+103
| * | | | | Merge pull request #252 from tomtom84/mastertomtom842012-04-19471-28/+75613
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ...tommy tomson2012-04-20471-28/+75613
| |/ / / /
| * | | | Merge pull request #251 from simonlnu/masterSimon2012-04-192-4/+2
| |\ \ \ \
| | * \ \ \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-190-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #250 from simonlnu/masterSimon2012-04-194-4/+5
| |\ \ \ \ \
| | | * | | | fix .item-selectSimon L'nu2012-04-192-4/+2
| | |/ / / /
| | * | | | tweak drop-down and add in filebrowserSimon L'nu2012-04-194-4/+5
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-196-27/+237
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #248 from fabrixxm/tmcefilebrowserfabrixxm2012-04-194-2/+212
| |\ \ \ \ \
| | * | | | | filebrowser: fix style, show 10 recent photos if not in an albumFabio Comuni2012-04-182-2/+9
| | * | | | | filebrowser: more style, load min and max scale photosFabio Comuni2012-04-182-46/+57
| | * | | | | tinymce: add inlinepopups pluginFabio Comuni2012-04-182-2/+2
| | * | | | | tinymce: add filebrowser for photos and attached filesFabio Comuni2012-04-184-0/+192
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #249 from mschmitt/masterfabrixxm2012-04-182-25/+25
| |\ \ \ \ \
| | * | | | | Hadn't merged fixed typo from upstream.Martin Schmitt2012-04-192-2/+2
| | * | | | | EO translation fixesMartin Schmitt2012-04-192-27/+27
| |/ / / / /
| | | * / / Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| | |/ / / | |/| | |
| * | | | Merge pull request #247 from simonlnu/masterSimon2012-04-1814-14/+14
| |\ \ \ \
| | * | | | only affect immediate li childrenSimon L'nu2012-04-182-2/+2
| | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-180-0/+0
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #246 from simonlnu/masterSimon2012-04-184-76/+105
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | | * | | fix silly abandonded typo. shouldn't affect translationsSimon L'nu2012-04-1812-12/+12
| | |/ / /
| | * | | fix alignment issues with toolbarSimon L'nu2012-04-184-76/+105
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-04-1832-88/+8975
| | |\ \ \ | | |/ / / | |/| | |
| * | | | diabook-themes: some css/bug-fixestommy tomson2012-04-1829-86/+441
| * | | | Merge pull request #244 from mschmitt/masterfriendica2012-04-172-0/+8532
| |\ \ \ \
| | * | | | messages.po/strings.php at 100% EsperantoMartin Schmitt2012-04-172-0/+8532