| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-25 | 50 | -501/+1196 |
| | | |\ |
|
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-24 | 41 | -601/+974 |
| | | |\ \ |
|
| | | * \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-23 | 222 | -13881/+170 |
| | | |\ \ \ |
|
| | | * \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 67 | -294/+231 |
| | | |\ \ \ \ |
|
| | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-04-22 | 0 | -0/+0 |
| * | | | | | | | rev update, fix autoname test "random" failure | friendica | 2012-04-26 | 3 | -32/+35 |
| |/ / / / / / |
|
| * | | | | | | bug #307, explaining decentralised private photos is impossible. | friendica | 2012-04-25 | 1 | -0/+23 |
| * | | | | | | this turns out to be harder than I thought | friendica | 2012-04-25 | 2 | -2/+2 |
| * | | | | | | Merge pull request #264 from mschmitt/master | friendica | 2012-04-25 | 2 | -78/+112 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Esperanto at 100% again | Martin Schmitt | 2012-04-25 | 2 | -78/+112 |
| | | |_|_|_|/
| |/| | | | |
|
| * | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-25 | 12 | -12/+96 |
| |\| | | | | |
|
| | * | | | | | Merge pull request #263 from tomtom84/master | tomtom84 | 2012-04-24 | 12 | -12/+96 |
| | |\ \ \ \ \ |
|
| | | * | | | | | diabook-themes: fix css to login.tpl | tommy tomson | 2012-04-25 | 12 | -12/+96 |
| * | | | | | | | cleanup - make bb-buttons vanish when comment closed | friendica | 2012-04-25 | 14 | -374/+16 |
| |/ / / / / / |
|
| * | | | | | | restore qcomment selector | friendica | 2012-04-24 | 7 | -21/+35 |
| * | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-04-24 | 36 | -94/+934 |
| |\ \ \ \ \ \ |
|
| | * | | | | | | Merge pull request #262 from tomtom84/master | friendica | 2012-04-24 | 22 | -0/+732 |
| | |\| | | | | |
|
| | | * | | | | | zero-themes: add bbcode-toolbar to commentbox | tommy tomson | 2012-04-25 | 22 | -0/+732 |
| | |/ / / / / |
|
| | * | | | | | diabook-themes: small fix | tommy tomson | 2012-04-25 | 3 | -8/+31 |
| | * | | | | | Merge pull request #261 from fabrixxm/eventspage | friendica | 2012-04-24 | 6 | -82/+167 |
| | |\ \ \ \ \ |
|
| | | * | | | | | quattro: small week calendar view for event/birthday reminders | Fabio Comuni | 2012-04-24 | 2 | -0/+40 |
| | | * | | | | | remove html from get_birthdays() and get_events() | Fabio Comuni | 2012-04-24 | 3 | -23/+53 |
| | | * | | | | | events page: set calendar start date from url (events/[year]/[month]/) and sh... | Fabio Comuni | 2012-04-24 | 2 | -60/+75 |
| | | | |_|_|/
| | |/| | | |
|
| | * | | | | | Diabook-dark css fix | Thomas Willingham | 2012-04-24 | 1 | -3/+3 |
| | * | | | | | Diabook-dark, couple of new icons, and another css fix. | Thomas Willingham | 2012-04-24 | 4 | -1/+1 |
| * | | | | | | rev update | friendica | 2012-04-24 | 2 | -393/+150 |
| |/ / / / / |
|
| * / / / / | fix tags test with new url | friendica | 2012-04-24 | 1 | -2/+2 |
| |/ / / / |
|
| * | | | | 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 |
| | |_|/ / /
|/| | | | |
|
| * | | | | | 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 |
| | |_|_|/
|/| | | |
|
| * | | | | 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 |
| | | |\| | | |
|
