| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| |\ | |||||
| | * | 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> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-17 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | Merge pull request #144 from simonlnu/master | Simon | 2012-03-16 | 3 | -7/+9 |
| | |\ | | | | | | | remove auto-complete from some themes since the comment one is now global | ||||
| | | * | remove auto-complete from darkzero-NS, dispys, since the comment one is now ↵ | Simon L'nu | 2012-03-16 | 2 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | global Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | make auto-complete work in more places | Simon L'nu | 2012-03-16 | 1 | -1/+9 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | * remotes/upstream/master: * master: | ||||
| | * | Merge pull request #143 from simonlnu/master | Simon | 2012-03-16 | 1 | -0/+3 |
| | |\ | | | | | | | make auto-complete in darkzero-NS. | ||||
| | | * | make auto-complete in darkzero-NS. other themes can use this easily. might ↵ | Simon L'nu | 2012-03-16 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | need to edit the id it hooks into Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 2 | -7/+18 |
| | | |\ | | |/ | |/| | | | | | | | | | | | | | | | | * remotes/upstream/master: convert boolean or int settings to strings to work around issues with template processing add "send pm" link to photo dropdown for Diaspora contacts * master: | ||||
| | * | | convert boolean or int settings to strings to work around issues with ↵ | friendica | 2012-03-16 | 1 | -7/+7 |
| | | | | | | | | | | | | | template processing | ||||
| | * | | add "send pm" link to photo dropdown for Diaspora contacts | friendica | 2012-03-16 | 1 | -0/+11 |
| | | | | |||||
| | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | |/ | | | | | | | | | | | | | * remotes/upstream/master: wrong link in d* comment notifications * master: | ||||
| | * | Merge branch 'pull' | friendica | 2012-03-16 | 19 | -200/+325 |
| | |\ | |||||
| | | * | Merge pull request #142 from simonlnu/master | Simon | 2012-03-16 | 2 | -0/+18 |
| | | |\ | | | | | | | | | make profiles-menu disappear when clicked outside of it | ||||
| | | | * | make profiles-menu disappear when clicked outside it | Simon L'nu | 2012-03-16 | 2 | -0/+18 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | | | * | Merge branch 'master', remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-03-16 | 0 | -0/+0 |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Bugfix of old IEs Forgot to remove a debug line Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button * master: | ||||
| | | * | Merge pull request #141 from CatoTH/master | Simon | 2012-03-16 | 4 | -10/+18 |
| | | |\ | | | | | | | | | Private messages - tabindex | ||||
| | | | * | Bugfix of old IEs | Tobias Hößl | 2012-03-16 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | Forgot to remove a debug line | Tobias Hößl | 2012-03-16 | 1 | -1/+0 |
| | | | | | |||||
| | | | * | Use tabindex to enable easy navigation in the dialog to write private mails; ↵ | Tobias Hößl | 2012-03-16 | 4 | -11/+20 |
| | | | | | | | | | | | | | | | | | Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button | ||||
| | | * | | Merge pull request #140 from simonlnu/master | Simon | 2012-03-16 | 15 | -195/+294 |
| | | |\ \ | | | | | | | | | | | weee, dispys get another update | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |