| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| | | * | | | | | | | | | | | | | | | | | Merge commit 'upstream/master' | Michael Vogel | 2012-04-15 | 162 | -136/+8652 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #317 from CatoTH/master | Simon | 2012-05-29 | 1 | -6/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | | Add two hooks, event_created and event_updated. One Bugfix for the <id>...</i... | Tobias Hößl | 2012-05-29 | 1 | -6/+11 |
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | |/| | | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #318 from simonlnu/master | Simon | 2012-05-29 | 5 | -28/+38 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | fix toolbar. more size dynamicism | Simon L'nu | 2012-05-29 | 5 | -28/+38 |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-29 | 0 | -0/+0 |
| | |/ / / / / / / / / / / / / / / / / / |
|
| * / / / / / / / / / / / / / / / / / / | bugfixes: private photo embeds and search for strings with % | friendica | 2012-05-29 | 4 | -148/+154 |
| |/ / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | ability to only expire contacts, not self | friendica | 2012-05-29 | 4 | -5/+10 |
| * | | | | | | | | | | | | | | | | | | Provide backend option to only expire other peoples' conversations. | friendica | 2012-05-28 | 1 | -1/+8 |
| * | | | | | | | | | | | | | | | | | | more theme cleanup | friendica | 2012-05-28 | 4 | -2/+24 |
| * | | | | | | | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-28 | 11 | -294/+172 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #315 from simonlnu/master | Simon | 2012-05-28 | 11 | -294/+172 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | fixed font-size/line-height stuffs | Simon L'nu | 2012-05-28 | 11 | -294/+172 |
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-28 | 11 | -76/+168 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-26 | 3 | -88/+89 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-26 | 12 | -499/+543 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ /
| | | |/| | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-24 | 0 | -0/+0 |
| * | | | | | | | | | | | | | | | | | | | | | rev update | friendica | 2012-05-28 | 3 | -202/+202 |
| |/ / / / / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | | | | slackr - tone down the shadows a smidgin | friendica | 2012-05-27 | 1 | -4/+9 |
| * | | | | | | | | | | | | | | | | | | | | add plugin hooks to gender, sexpref, and marital selectors | friendica | 2012-05-27 | 1 | -0/+7 |
| * | | | | | | | | | | | | | | | | | | | | birthday in november,december bug | friendica | 2012-05-27 | 1 | -2/+2 |
| * | | | | | | | | | | | | | | | | | | | | rework the way private photos are embedded to avoid url differences and also ... | friendica | 2012-05-27 | 6 | -69/+142 |
| * | | | | | | | | | | | | | | | | | | | | handle multiple underscores in D* links | friendica | 2012-05-26 | 2 | -1/+8 |
| | |_|/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | | more ssl policy stuff | friendica | 2012-05-26 | 1 | -15/+12 |
| * | | | | | | | | | | | | | | | | | | | allow force ssl on notifications | friendica | 2012-05-26 | 3 | -73/+77 |
| | |/ / / / / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | | missing entries on personal tab after sql text search optimise | friendica | 2012-05-25 | 2 | -7/+6 |
| * | | | | | | | | | | | | | | | | | | bug #434 - default group placement not working after accepting dfrn friend re... | friendica | 2012-05-25 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | fix wall_uploaded photo permissions on group post by member | friendica | 2012-05-25 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | improve location change notifications | friendica | 2012-05-25 | 1 | -1/+10 |
| * | | | | | | | | | | | | | | | | | | keep private FB stuff out of personal notes | friendica | 2012-05-25 | 3 | -39/+50 |
| | |_|_|_|_|_|_|/ / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-25 | 10 | -444/+450 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | | rev update | friendica | 2012-05-25 | 4 | -89/+90 |
| | | | | | | | | | | | | | | | | | * | admin: remove update link in admin menu | root | 2012-05-25 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | DE update to strings and templates | Tobias Diekershoff | 2012-05-25 | 3 | -397/+419 |
| | |/ / / / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | | | Merge pull request #313 from fabrixxm/master | Simon | 2012-05-24 | 3 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | fix small js error when user not logged in | root | 2012-05-24 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | | | install wizard: fix php executable path | root | 2012-05-24 | 2 | -4/+6 |
| | * | | | | | | | | | | | | | | | | Merge pull request #314 from simonlnu/master | Simon | 2012-05-24 | 4 | -42/+24 |
| |/| | | | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | | update dark a bit. i messed up some buttons | Simon L'nu | 2012-05-24 | 4 | -42/+24 |
| | * | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-24 | 0 | -0/+0 |
| |/ / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | slackr: improve interactivity | friendica | 2012-05-23 | 1 | -0/+14 |
| * | | | | | | | | | | | | | | | | slackr: hide calendar when posting | friendica | 2012-05-23 | 1 | -0/+8 |
| * | | | | | | | | | | | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 4 | -39/+70 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #312 from simonlnu/master | Simon | 2012-05-23 | 4 | -39/+70 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | clean up and more fixing | Simon L'nu | 2012-05-23 | 4 | -39/+70 |
| | | * | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 3 | -151/+174 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 0 | -0/+0 |
| * | | | | | | | | | | | | | | | | | | more theme stuff | friendica | 2012-05-23 | 3 | -1/+56 |
| |/ / / / / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | | | | slackr - better highlighting of current selections | friendica | 2012-05-23 | 1 | -1/+6 |
| * | | | | | | | | | | | | | | | | | slackr - knock the sharp edges off the events calendar | friendica | 2012-05-23 | 1 | -1/+1 |
