aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provide backend option to only expire other peoples' conversations.friendica2012-05-281-1/+8
|
* more theme cleanupfriendica2012-05-284-2/+24
|
* Merge https://github.com/friendica/friendica into pullfriendica2012-05-2811-294/+172
|\
| * Merge pull request #315 from simonlnu/masterSimon2012-05-2811-294/+172
| |\ | | | | | | fixed font-size/line-height stuffs
| | * fixed font-size/line-height stuffsSimon L'nu2012-05-2811-294/+172
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2811-76/+168
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slackr - tone down the shadows a smidgin add plugin hooks to gender, sexpref, and marital selectors birthday in november,december bug rework the way private photos are embedded to avoid url differences and also check the permissions if possible to make sure that nothing sneaks by. handle multiple underscores in D* links * master:
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-263-88/+89
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: more ssl policy stuff allow force ssl on notifications * master:
| | * \ Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2612-499/+543
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: missing entries on personal tab after sql text search optimise bug #434 - default group placement not working after accepting dfrn friend request fix wall_uploaded photo permissions on group post by member improve location change notifications keep private FB stuff out of personal notes rev update DE update to strings and templates * master:
| | * | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: fix small js error when user not logged in install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect * master:
* | | | | rev updatefriendica2012-05-283-202/+202
|/ / / /
* | | | 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
| | | | | | | | | | | | | | | | check the permissions if possible to make sure that nothing sneaks by.
* | | | handle multiple underscores in D* linksfriendica2012-05-262-1/+8
| |_|/ |/| |
* | | more ssl policy stufffriendica2012-05-261-15/+12
| | |
* | | allow force ssl on notificationsfriendica2012-05-263-73/+77
| |/ |/|
* | 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 ↵friendica2012-05-251-1/+1
| | | | | | | | request
* | 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
| |/
| * Merge pull request #313 from fabrixxm/masterSimon2012-05-243-5/+7
| |\ | | | | | | install wizard: fix php executable path
| | * fix small js error when user not logged inroot2012-05-241-1/+1
| | |
| | * install wizard: fix php executable pathroot2012-05-242-4/+6
| | | | | | | | | | | | | | | | | | - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect
| * | Merge pull request #314 from simonlnu/masterSimon2012-05-244-42/+24
| |\ \ | | | | | | | | update dark a bit. i messed up some buttons
| | * | update dark a bit. i messed up some buttonsSimon L'nu2012-05-244-42/+24
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-240-0/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slackr: improve interactivity slackr: hide calendar when posting more theme stuff * master:
* / / rev updatefriendica2012-05-254-89/+90
|/ /
* | 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
| |\ \ | | | | | | | | a few more fixes
| | * | clean up and more fixingSimon L'nu2012-05-234-39/+70
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-233-151/+174
| | |\ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: slackr - better highlighting of current selections slackr - knock the sharp edges off the events calendar rev update * master:
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section * master:
* | | | 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 wizard
| | * Update install wizardroot2012-05-234-38/+56
| | | | | | | | | | | | | | | | | | - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section
| * | Merge pull request #311 from simonlnu/masterSimon2012-05-235-64/+164
| |\ \ | | | | | | | | clean up and fixing things
| | * | clean up and make nice the dispy photo edit stuffSimon L'nu2012-05-235-64/+164
| | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-230-0/+0
| |/ / | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| * | Merge pull request #310 from simonlnu/masterSimon2012-05-237-35/+58
| |\ \ | | |/ | |/| add a placeholder attribute on #search-text; dispy fixes
| | * add a placeholder attribute on search-text; dispy fixesSimon L'nu2012-05-237-35/+58
| | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | * Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-05-2319-269/+417
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: photo rotation event calendar theming import quattro event reminder mark bubbles unsupported keep FB out of private notes clear submanage, etc from session on logout if identity (uid) changes - reload any other open browser windows on next ping. * master: