aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixed font-size/line-height stuffsSimon L'nu2012-05-2811-294/+172
* Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2811-76/+168
|\
| * slackr - tone down the shadows a smidginfriendica2012-05-271-4/+9
| * add plugin hooks to gender, sexpref, and marital selectorsfriendica2012-05-271-0/+7
| * birthday in november,december bugfriendica2012-05-271-2/+2
| * rework the way private photos are embedded to avoid url differences and also ...friendica2012-05-276-69/+142
| * handle multiple underscores in D* linksfriendica2012-05-262-1/+8
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-263-88/+89
|\|
| * more ssl policy stufffriendica2012-05-261-15/+12
| * allow force ssl on notificationsfriendica2012-05-263-73/+77
* | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2612-499/+543
|\|
| * missing entries on personal tab after sql text search optimisefriendica2012-05-252-7/+6
| * bug #434 - default group placement not working after accepting dfrn friend re...friendica2012-05-251-1/+1
| * fix wall_uploaded photo permissions on group post by memberfriendica2012-05-251-1/+3
| * improve location change notificationsfriendica2012-05-251-1/+10
| * keep private FB stuff out of personal notesfriendica2012-05-253-39/+50
| * Merge https://github.com/friendica/friendica into pullfriendica2012-05-2510-444/+450
| |\
| | * DE update to strings and templatesTobias Diekershoff2012-05-253-397/+419
| * | rev updatefriendica2012-05-254-89/+90
* | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
| |/ |/|
* | Merge pull request #313 from fabrixxm/masterSimon2012-05-243-5/+7
|\ \
| * | fix small js error when user not logged inroot2012-05-241-1/+1
| * | install wizard: fix php executable pathroot2012-05-242-4/+6
* | | Merge pull request #314 from simonlnu/masterSimon2012-05-244-42/+24
|\ \ \ | |_|/ |/| |
| * | update dark a bit. i messed up some buttonsSimon L'nu2012-05-244-42/+24
| * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
|/ /
* | slackr: improve interactivityfriendica2012-05-231-0/+14
* | slackr: hide calendar when postingfriendica2012-05-231-0/+8
* | Merge https://github.com/friendica/friendica into pullfriendica2012-05-234-39/+70
|\ \
| * \ Merge pull request #312 from simonlnu/masterSimon2012-05-234-39/+70
| |\ \
| | * | clean up and more fixingSimon L'nu2012-05-234-39/+70
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-233-151/+174
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
* | | | more theme stufffriendica2012-05-233-1/+56
|/ / /
* | | slackr - better highlighting of current selectionsfriendica2012-05-231-1/+6
* | | slackr - knock the sharp edges off the events calendarfriendica2012-05-231-1/+1
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-05-2312-137/+278
|\| |
| * | Merge pull request #309 from fabrixxm/masterSimon2012-05-234-38/+56
| |\|
| | * Update install wizardroot2012-05-234-38/+56
| * | Merge pull request #311 from simonlnu/masterSimon2012-05-235-64/+164
| |\ \
| | * | clean up and make nice the dispy photo edit stuffSimon L'nu2012-05-235-64/+164
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| |/ /
| * | Merge pull request #310 from simonlnu/masterSimon2012-05-237-35/+58
| |\ \ | | |/ | |/|
| | * add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-237-35/+58
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2319-269/+417
| | |\ | | |/ | |/|
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-220-0/+0
* | | rev updatefriendica2012-05-232-150/+168
|/ /
* | photo rotationfriendica2012-05-234-4/+75
* | event calendar themingfriendica2012-05-221-0/+3
* | import quattro event reminderfriendica2012-05-222-0/+40