| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-28 | 11 | -76/+168 |
| |\ |
|
| | * | 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 |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-26 | 3 | -88/+89 |
| |\| |
|
| | * | more ssl policy stuff | friendica | 2012-05-26 | 1 | -15/+12 |
| | * | allow force ssl on notifications | friendica | 2012-05-26 | 3 | -73/+77 |
| * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-26 | 12 | -499/+543 |
| |\| |
|
| | * | 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 |
| | |\ |
|
| | | * | DE update to strings and templates | Tobias Diekershoff | 2012-05-25 | 3 | -397/+419 |
| | * | | rev update | friendica | 2012-05-25 | 4 | -89/+90 |
| * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-24 | 0 | -0/+0 |
| | |/
|/| |
|
| * | | 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 |
| * | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-05-23 | 12 | -137/+278 |
| |\| | |
|
| | * | | Merge pull request #309 from fabrixxm/master | Simon | 2012-05-23 | 4 | -38/+56 |
| | |\| |
|
| | | * | Update install wizard | root | 2012-05-23 | 4 | -38/+56 |
| | * | | Merge pull request #311 from simonlnu/master | Simon | 2012-05-23 | 5 | -64/+164 |
| | |\ \ |
|
| | | * | | clean up and make nice the dispy photo edit stuff | Simon L'nu | 2012-05-23 | 5 | -64/+164 |
| | | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 0 | -0/+0 |
| | |/ / |
|
| | * | | Merge pull request #310 from simonlnu/master | Simon | 2012-05-23 | 7 | -35/+58 |
| | |\ \
| | |/
| |/| |
|
| | | * | add a placeholder attribute on search-text; dispy fixes | Simon L'nu | 2012-05-23 | 7 | -35/+58 |
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-23 | 19 | -269/+417 |
| | | |\
| | |/
| |/| |
|
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-05-22 | 0 | -0/+0 |
| * | | | rev update | friendica | 2012-05-23 | 2 | -150/+168 |
| |/ / |
|
| * | | photo rotation | friendica | 2012-05-23 | 4 | -4/+75 |
| * | | event calendar theming | friendica | 2012-05-22 | 1 | -0/+3 |
| * | | import quattro event reminder | friendica | 2012-05-22 | 2 | -0/+40 |
| * | | mark bubbles unsupported | friendica | 2012-05-22 | 2 | -0/+0 |
