| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-24 | 41 | -601/+974 |
| |\ |
|
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-23 | 30 | -463/+737 |
| | |\ |
|
| | | * | Merge pull request #260 from mschmitt/master | friendica | 2012-04-23 | 9 | -459/+733 |
| | | |\ |
|
| | | | * | Esperanto at 100% again | Martin Schmitt | 2012-04-24 | 9 | -459/+733 |
| | | |/ |
|
| | | * | Merge pull request #259 from beardy-unixer/master | friendica | 2012-04-23 | 21 | -4/+4 |
| | | |\ |
|
| | | | * | Improvements to diabook-dark | Thomas Willingham | 2012-04-24 | 21 | -4/+4 |
| | | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-24 | 6 | -118/+203 |
| | | | |\
| | | |/
| | |/| |
|
| | | | * | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-24 | 2106 | -17706/+98887 |
| | | | |\ |
|
| | | | * \ | Merge remote-tracking branch 'upstream/master' | Thomas Willingham | 2012-04-02 | 0 | -0/+0 |
| | | | |\ \ |
|
| | * | | | | | separate tag search from body search | friendica | 2012-04-23 | 5 | -20/+34 |
| | |/ / / / |
|
| | * | | | | move unfriend to standalone function for use in account removal | friendica | 2012-04-23 | 2 | -33/+47 |
| | * | | | | more work on mail2 (introductions), added 'm' (mail) flag to ACL backend for ... | friendica | 2012-04-23 | 4 | -85/+156 |
| | | |_|/
| |/| | |
|
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-23 | 222 | -13881/+170 |
| |\| | | |
|
| | * | | | DE strings, correction of a typo | Tobias Diekershoff | 2012-04-23 | 2 | -198/+98 |
| | * | | | diabok-themes: fixed bug in green-wide and dark-wide | tommy tomson | 2012-04-23 | 5 | -12/+12 |
| | * | | | diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpl... | tommy tomson | 2012-04-23 | 211 | -13669/+5 |
| | * | | | diabook-themes: bugfix in admin-section | tommy tomson | 2012-04-23 | 1 | -1/+1 |
| | * | | | allow bbcode representation of html symbols such as © by wrapping in bb ... | friendica | 2012-04-23 | 1 | -0/+3 |
| | * | | | protect jappixmini/proxy from typo check, more work on email2 connector | friendica | 2012-04-23 | 2 | -1/+51 |
| * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 67 | -294/+231 |
| |\| | | |
|
| | * | | | bug #388 - notify_comment received after post deleted | friendica | 2012-04-22 | 2 | -2/+2 |
| | * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-22 | 73 | -714/+1005 |
| | |\ \ \ |
|
| | | * \ \ | Merge pull request #258 from unary/api | friendica | 2012-04-22 | 2 | -13/+36 |
| | | |\ \ \ |
|
| | | | * | | | api: add support for StatusNet-style media param to API | Michael Johnston | 2012-04-22 | 2 | -13/+36 |
| | | * | | | | Merge pull request #257 from CatoTH/master | friendica | 2012-04-22 | 1 | -0/+2 |
| | | |\ \ \ \ |
|
| | | | * | | | | Merge branch 'master' of git://github.com/friendica/friendica | Tobias Hößl | 2012-04-22 | 748 | -2940/+62981 |
| | | | |\| | | |
|
| | | | * | | | | Add a hook | Tobias Hößl | 2012-04-22 | 1 | -0/+2 |
| | | * | | | | | diabook-themes: bugfix | tommy tomson | 2012-04-22 | 15 | -27/+31 |
| | | * | | | | | diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer | tommy tomson | 2012-04-22 | 45 | -101/+108 |
| | | | |/ / /
| | |/| | | |
|
| | * | | | | | don't allow non-existent themes as choices | friendica | 2012-04-22 | 3 | -151/+52 |
| * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 0 | -0/+0 |
| | |/ / / /
|/| | | | |
|
| * | | | | | DE strings update | Tobias Diekershoff | 2012-04-22 | 8 | -542/+789 |
| * | | | | | diabook-themes: comment-bbcode-bugfix | tommy tomson | 2012-04-22 | 2 | -9/+9 |
| * | | | | | Merge pull request #256 from simonlnu/master | Simon | 2012-04-21 | 2 | -22/+30 |
| |\ \ \ \ \
| |/ / / /
|/| | | | |
|
| | * | | | | fix tinymce theming | Simon L'nu | 2012-04-22 | 2 | -22/+30 |
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 384 | -56031/+194 |
| | |\ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-21 | 382 | -55989/+76 |
| |\ \ \ \ \ |
|
| | * | | | | | diabook-themes: deleted obsolete diabook-folder & minor bug-fixes | tommy tomson | 2012-04-22 | 382 | -55989/+76 |
| * | | | | | | rev update | friendica | 2012-04-21 | 2 | -42/+118 |
| |/ / / / / |
|
| | * / / / | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-21 | 0 | -0/+0 |
| |/ / / / |
|
| * | | | | 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 |
