| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | move friend suggestions to top of contact page, add default contact profile ↵ | friendica | 2012-03-20 | 2 | -2/+23 |
| | | | | | photos if missing | ||||
| * | Merge branch 'pull' | friendica | 2012-03-20 | 3 | -13/+148 |
| |\ | |||||
| | * | Merge pull request #153 from simonlnu/master | Simon | 2012-03-20 | 3 | -13/+148 |
| | |\ | | | | | | | intro boxen tweaks, dispy gets synced with -dark | ||||
| | | * | some tweakings for intro boxes (finally got an intro i could see :). dispy ↵ | Simon L'nu | 2012-03-20 | 3 | -13/+148 |
| | | | | | | | | | | | | | | | | | | | synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 1 | -4/+5 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | * remotes/upstream/master: bug #339 - lostpass sending to username, not email * master: | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-20 | 6 | -103/+98 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: add IP address to failed login log message modified: include/text.php Stupid bug fixed cleanup after openid refactoring refactor openid logins/registrations modified: include/text.php deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png some openid fixes, use identity url from openid server and normalise it. support "no_smilies" ctrl + left|right cursor keys to prev/next photos add 'loggin_out' hook * master: | ||||
| | | * \ | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-19 | 10 | -30/+66 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Existing photos could not be used as profile photos anymore - should be fixed now. And some extra logging in the CSRF-Protection to make debugging easier community discovery cont., cleanup of DB debugging * master: | ||||
| | | * | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 0 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: revup CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it) * master: | ||||
| * | | | | | missed a default profile photo replacement in notifications | friendica | 2012-03-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | change default profile photo to something more interesting than a reddish ↵ | friendica | 2012-03-20 | 9 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | brown square | ||||
| * | | | | | slightly relax overly strict permissions in community and search to match ↵ | friendica | 2012-03-20 | 3 | -9/+12 |
| |/ / / / | | | | | | | | | | | | | those in display - tl;dr public conversations are publicly visible | ||||
| * | | / | bug #339 - lostpass sending to username, not email | friendica | 2012-03-20 | 1 | -4/+5 |
| | |_|/ |/| | | |||||
| * | | | add IP address to failed login log message | friendica | 2012-03-19 | 1 | -1/+2 |
| | | | | |||||
| * | | | Merge pull request #152 from ↵ | friendica | 2012-03-19 | 1 | -24/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | beardy-unixer/84f8e2eaa87c90473ce79ebcd4f76f3657258f27 Smiley removal | ||||
| | * | | | modified: include/text.php | Thomas | 2012-03-19 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | Stupid bug fixed | ||||
| | * | | | modified: include/text.php | Thomas | 2012-03-19 | 1 | -21/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out. | ||||
| | * | | | Merge remote-tracking branch 'main/master' | Thomas | 2012-03-19 | 207 | -1628/+11133 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Thomas | 2012-03-09 | 83 | -123/+11136 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge pull request #150 from fabrixxm/master | friendica | 2012-03-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | Add "logging_out" hook | ||||
| | * \ \ \ \ \ | Merge remote-tracking branch 'friendica/master' | Fabio Comuni | 2012-03-19 | 161 | -1042/+3487 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | add 'loggin_out' hook | Fabio Comuni | 2012-03-12 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | cleanup after openid refactoring | friendica | 2012-03-19 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | refactor openid logins/registrations | friendica | 2012-03-19 | 3 | -77/+60 |
| | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | | some openid fixes, use identity url from openid server and normalise it. | friendica | 2012-03-19 | 4 | -3/+15 |
| | |/ / / / / |/| | | | | | |||||
| * | | | | | | support "no_smilies" | friendica | 2012-03-19 | 1 | -0/+5 |
| | | | | | | | |||||
| * | | | | | | ctrl + left|right cursor keys to prev/next photos | friendica | 2012-03-19 | 1 | -1/+12 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge pull request #149 from CatoTH/master | Simon | 2012-03-19 | 2 | -9/+13 |
| |\ \ \ \ \ | | | | | | | | | | | | | Add a missing security token [Using photos as profile photos] | ||||
| | * | | | | | Existing photos could not be used as profile photos anymore - should be ↵ | Tobias Hößl | 2012-03-19 | 2 | -9/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | fixed now. And some extra logging in the CSRF-Protection to make debugging easier | ||||
| * | | | | | | community discovery cont., cleanup of DB debugging | friendica | 2012-03-18 | 8 | -21/+53 |
| | |_|_|_|/ |/| | | | | |||||
| * | | | | | Merge branch 'pull' | friendica | 2012-03-18 | 5 | -10/+29 |
| |\ \ \ \ \ | |||||
| | * | | | | | Merge pull request #147 from CatoTH/master | friendica | 2012-03-18 | 5 | -10/+29 |
| | |\| | | | | | | | | | | | | | | | | CSRF-Protection in the group-related form | ||||
| | | * | | | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵ | Tobias Hößl | 2012-03-18 | 5 | -10/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | group, adding/removing members from it) | ||||
| * | | | | | | revup | friendica | 2012-03-18 | 1 | -1/+1 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #148 from simonlnu/master | Simon | 2012-03-18 | 2 | -2/+2 |
| |\ \ \ \ \ | | | | | | | | | | | | | fix the comment box being too wide and looking off-kilter | ||||
| | * | | | | | fix the comment box being too wide and looking off-kilter | Simon L'nu | 2012-03-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-18 | 8 | -25/+17 |
| | |\ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: replace split() by explode(); split is deprecated lost changes to tinymce/bbcode remove admin view of local directory bug #337, call template_unescape() only at the end of template processing queue optimisation - back off delivery attempts to once per hour after the first 12 hours. * master: | ||||
| * | | | | | | Merge pull request #146 from CatoTH/master | friendica | 2012-03-18 | 2 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / | |/| | | | | replace split() by explode(); split is deprecated | ||||
| | * | | | | | replace split() by explode(); split is deprecated | Tobias Hößl | 2012-03-18 | 2 | -2/+2 |
| |/ / / / / | |||||
| * | | | | | lost changes to tinymce/bbcode | friendica | 2012-03-17 | 1 | -61/+136 |
| | | | | | | |||||
| * | | | | | remove admin view of local directory | friendica | 2012-03-17 | 2 | -151/+63 |
| | | | | | | |||||
| * | | | | | bug #337, call template_unescape() only at the end of template processing | friendica | 2012-03-17 | 4 | -5/+5 |
| | | | | | | |||||
| * | | | | | queue optimisation - back off delivery attempts to once per hour after the ↵ | friendica | 2012-03-17 | 1 | -3/+8 |
| | | | | | | | | | | | | | | | | | | | | | first 12 hours. | ||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 3 | -4/+4 |
| | |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: compare ssl_policy precisely in case somebody was bitten by template processor bug template processor broken with foreach k=>v and k is integer 0 * master: | ||||
| * | | | | | compare ssl_policy precisely in case somebody was bitten by template ↵ | friendica | 2012-03-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | processor bug | ||||
| * | | | | | template processor broken with foreach k=>v and k is integer 0 | friendica | 2012-03-17 | 2 | -3/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 0 | -0/+0 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cut/paste error scheme checking for webservers without $_SERVER['HTTPS'] * master: | ||||
| * | | | | cut/paste error | friendica | 2012-03-17 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | scheme checking for webservers without $_SERVER['HTTPS'] | friendica | 2012-03-16 | 1 | -1/+6 |
| | | | | | |||||
| * | | | | Merge pull request #145 from simonlnu/master | Simon | 2012-03-16 | 4 | -16/+10 |
| |\ \ \ \ | | | | | | | | | | | [fix] whitespace in photo_view and like_noshare. dispy-dark clean up | ||||
| | * | | | | [fix] whitespace in photo_view and like_noshare. dispy-dark clean up | Simon L'nu | 2012-03-17 | 4 | -16/+10 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |