| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' of github.com:annando/friendica | Michael | 2012-05-16 | 981 | -4562/+162753 |
| |\ |
|
| | * | API: RSS-Feeds are now shortened to 1000 characters. (With added link) | Michael Vogel | 2012-04-22 | 1 | -45/+48 |
| | * | Merge commit 'upstream/master' | Michael Vogel | 2012-04-21 | 864 | -4473/+154113 |
| | |\ |
|
| | | * | rev update | friendica | 2012-04-21 | 2 | -416/+560 |
| | | * | Merge pull request #255 from simonlnu/master | Simon | 2012-04-20 | 2 | -0/+4 |
| | | |\ |
|
| | | | * | fix checkbox/radio buttons for some browsers | Simon L'nu | 2012-04-20 | 2 | -0/+4 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 0 | -0/+0 |
| | | |/ |
|
| | | * | diabook-themes: add diabook-dark | tommy tomson | 2012-04-21 | 117 | -1/+18810 |
| | | * | diabook-themes: add diabook-green and some minor css/bug-fixes | tommy tomson | 2012-04-20 | 121 | -30/+19091 |
| | | * | rev update | friendica | 2012-04-20 | 2 | -7/+7 |
| | | * | Merge pull request #254 from simonlnu/master | Simon | 2012-04-20 | 21 | -21/+1803 |
| | | |\ |
|
| | | | * | fix the buttons. don't hide the buttons once shown | Simon L'nu | 2012-04-20 | 4 | -14/+2 |
| | | | * | optimise imgs; add some comment editing knobs | Simon L'nu | 2012-04-20 | 21 | -21/+1815 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 10 | -39/+118 |
| | | | |\ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-20 | 471 | -28/+75613 |
| | | | |\ \ |
|
| | | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| | | * | | | | Merge pull request #253 from fabrixxm/master | fabrixxm | 2012-04-20 | 8 | -50/+50 |
| | | |\ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | | | * | | | escape email template var names. fix bug n385. | Fabio Comuni | 2012-04-20 | 8 | -50/+50 |
| | | | | |/
| | | |/| |
|
| | | * | | | Merge remote-tracking branch 'CatoTH/master' into req245 | Fabio Comuni | 2012-04-20 | 10 | -39/+118 |
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | | * | | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 3 | -6/+15 |
| | | | * | | XSRF protection and PHPdoc for mod/admin.php | Tobias Hößl | 2012-04-18 | 8 | -33/+103 |
| | | * | | | Merge pull request #252 from tomtom84/master | tomtom84 | 2012-04-19 | 471 | -28/+75613 |
| | | |\ \ \
| | | |_|/
| | |/| | |
|
| | | | * | | diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink ... | tommy tomson | 2012-04-20 | 471 | -28/+75613 |
| | | |/ / |
|
| | | * | | Merge pull request #251 from simonlnu/master | Simon | 2012-04-19 | 2 | -4/+2 |
| | | |\ \ |
|
| | | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 0 | -0/+0 |
| | | | |\ \
| | | |/ /
| | |/| | |
|
| | | * | | | Merge pull request #250 from simonlnu/master | Simon | 2012-04-19 | 4 | -4/+5 |
| | | |\ \ \ |
|
| | | | | * | | fix .item-select | Simon L'nu | 2012-04-19 | 2 | -4/+2 |
| | | | |/ / |
|
| | | | * | | tweak drop-down and add in filebrowser | Simon L'nu | 2012-04-19 | 4 | -4/+5 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-19 | 6 | -27/+237 |
| | | | |\ \
| | | |/ /
| | |/| | |
|
| | | * | | | Merge pull request #248 from fabrixxm/tmcefilebrowser | fabrixxm | 2012-04-19 | 4 | -2/+212 |
| | | |\ \ \ |
|
| | | | * | | | filebrowser: fix style, show 10 recent photos if not in an album | Fabio Comuni | 2012-04-18 | 2 | -2/+9 |
| | | | * | | | filebrowser: more style, load min and max scale photos | Fabio Comuni | 2012-04-18 | 2 | -46/+57 |
| | | | * | | | tinymce: add inlinepopups plugin | Fabio Comuni | 2012-04-18 | 2 | -2/+2 |
| | | | * | | | tinymce: add filebrowser for photos and attached files | Fabio Comuni | 2012-04-18 | 4 | -0/+192 |
| | | | | |/
| | | |/| |
|
| | | * | | | Merge pull request #249 from mschmitt/master | fabrixxm | 2012-04-18 | 2 | -25/+25 |
| | | |\ \ \ |
|
| | | | * | | | Hadn't merged fixed typo from upstream. | Martin Schmitt | 2012-04-19 | 2 | -2/+2 |
| | | | * | | | EO translation fixes | Martin Schmitt | 2012-04-19 | 2 | -27/+27 |
| | | |/ / / |
|
| | | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
| | | | |/
| | |/| |
|
| | | * | | Merge pull request #247 from simonlnu/master | Simon | 2012-04-18 | 14 | -14/+14 |
| | | |\ \ |
|
| | | | * | | only affect immediate li children | Simon L'nu | 2012-04-18 | 2 | -2/+2 |
| | | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 0 | -0/+0 |
| | | | |\ \
| | | |/ /
| | |/| | |
|
| | | * | | | Merge pull request #246 from simonlnu/master | Simon | 2012-04-18 | 4 | -76/+105 |
| | | |\ \ \
| | | |_|/
| | |/| | |
|
| | | | | * | fix silly abandonded typo. shouldn't affect translations | Simon L'nu | 2012-04-18 | 12 | -12/+12 |
| | | | |/ |
|
| | | | * | fix alignment issues with toolbar | Simon L'nu | 2012-04-18 | 4 | -76/+105 |
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-18 | 32 | -88/+8975 |
| | | | |\
| | | |/
| | |/| |
|
| | | * | | diabook-themes: some css/bug-fixes | tommy tomson | 2012-04-18 | 29 | -86/+441 |
| | | * | | Merge pull request #244 from mschmitt/master | friendica | 2012-04-17 | 2 | -0/+8532 |
| | | |\ \ |
|
| | | | * | | messages.po/strings.php at 100% Esperanto | Martin Schmitt | 2012-04-17 | 2 | -0/+8532 |
| | | * | | | Merge pull request #243 from CatoTH/master | friendica | 2012-04-17 | 1 | -2/+2 |
| | | |\ \ \
| | | |/ /
| | |/| | |
|
| | | | * | | Typo | Tobias Hößl | 2012-04-17 | 1 | -2/+2 |
| | | |/ / |
|
