aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | | | * | | | | | | Merge pull request #147 from CatoTH/masterfriendica2012-03-185-10/+29
| | | | | | | | | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CSRF-Protection in the group-related form
| | | | | | | | | | | * | | | | | CSRF-Protection in the group-related form (creating, renaming and dropping a ↵Tobias Hößl2012-03-185-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | group, adding/removing members from it)
| | | | | | | | | * | | | | | | | revupfriendica2012-03-181-1/+1
| | | | | | | | | |/ / / / / / /
| | | | | | | | | * | | | | | | Merge pull request #148 from simonlnu/masterSimon2012-03-182-2/+2
| | | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix the comment box being too wide and looking off-kilter
| | | | | | | | | | * | | | | | | fix the comment box being too wide and looking off-kilterSimon L'nu2012-03-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | | | | * | | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-188-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/masterfriendica2012-03-182-2/+2
| | | | | | | | |/| | | | | | | | | | | | | | | | | | |/ / / / / / | | | | | | | | | |/| | | | | | replace split() by explode(); split is deprecated
| | | | | | | | | * | | | | | | replace split() by explode(); split is deprecatedTobias Hößl2012-03-182-2/+2
| | | | | | | | |/ / / / / / /
| | | | | | | | * | | | | | | lost changes to tinymce/bbcodefriendica2012-03-171-61/+136
| | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | remove admin view of local directoryfriendica2012-03-172-151/+63
| | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | bug #337, call template_unescape() only at the end of template processingfriendica2012-03-174-5/+5
| | | | | | | | | | | | | | |
| | | | | | | | * | | | | | | queue optimisation - back off delivery attempts to once per hour after the ↵friendica2012-03-171-3/+8
| | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | first 12 hours.
| | | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-173-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 ↵friendica2012-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processor bug
| | | | | | | * | | | | | | template processor broken with foreach k=>v and k is integer 0friendica2012-03-172-3/+3
| | | | | | |/ / / / / / /
| | | | | | | * / / / / / Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: cut/paste error scheme checking for webservers without $_SERVER['HTTPS'] * master:
| | | | | | * | | | | | cut/paste errorfriendica2012-03-171-1/+1
| | | | | | | | | | | |
| | | | | | * | | | | | scheme checking for webservers without $_SERVER['HTTPS']friendica2012-03-161-1/+6
| | | | | | | | | | | |
| | | | | | * | | | | | Merge pull request #145 from simonlnu/masterSimon2012-03-164-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 upSimon L'nu2012-03-174-16/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-170-0/+0
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| | | | | | * | | | | | Merge pull request #144 from simonlnu/masterSimon2012-03-163-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'nu2012-03-162-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | global Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | * | | | | | make auto-complete work in more placesSimon L'nu2012-03-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| | | | | | * | | | | | Merge pull request #143 from simonlnu/masterSimon2012-03-161-0/+3
| | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | make auto-complete in darkzero-NS.
| | | | | | | * | | | | | make auto-complete in darkzero-NS. other themes can use this easily. might ↵Simon L'nu2012-03-161-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'nu2012-03-162-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 ↵friendica2012-03-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | template processing
| | | | | | * | | | | | | add "send pm" link to photo dropdown for Diaspora contactsfriendica2012-03-161-0/+11
| | | | | | | | | | | | |
| | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: wrong link in d* comment notifications * master:
| | | | | | * | | | | | Merge branch 'pull'friendica2012-03-1619-200/+325
| | | | | | |\ \ \ \ \ \
| | | | | | | * \ \ \ \ \ Merge pull request #142 from simonlnu/masterSimon2012-03-162-0/+18
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | make profiles-menu disappear when clicked outside of it
| | | | | | | | * | | | | | make profiles-menu disappear when clicked outside itSimon L'nu2012-03-162-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-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/masterSimon2012-03-164-10/+18
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private messages - tabindex
| | | | | | | | * | | | | | Bugfix of old IEsTobias Hößl2012-03-161-1/+1
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Forgot to remove a debug lineTobias Hößl2012-03-161-1/+0
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Use tabindex to enable easy navigation in the dialog to write private mails; ↵Tobias Hößl2012-03-164-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/masterSimon2012-03-1615-195/+294
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | weee, dispys get another update
| | | | | | | | * | | | | | weee, dispys get another updateSimon L'nu2012-03-1615-195/+294
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
| | | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-165-98/+141
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | |/ / / / / / | | | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: syntax error from pasted text, remove ^M's bug #335 network search broken after new ssl policy settings whitespace notification for disapora comments * master:
| | | | | | | | * | | | | | Merge branch 'master', remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-03-160-0/+0
| | | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: * master:
| | | | | | * | | | | | | | | wrong link in d* comment notificationsfriendica2012-03-162-2/+2
| | | | | | |/ / / / / / / /
| | | | | | * | | | | | | | syntax error from pasted text, remove ^M'sfriendica2012-03-161-96/+96
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | bug #335 network search broken after new ssl policy settingsfriendica2012-03-162-2/+2
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | whitespacefriendica2012-03-161-0/+1
| | | | | | | | | | | | | |
| | | | | | * | | | | | | | notification for disapora commentsfriendica2012-03-161-0/+42
| | | | | |/ / / / / / / /
| | | | | * | / / / / / / Merge pull request #139 from simonlnu/masterSimon2012-03-151-1/+1
| | | | | |\| | | | | | | | | | | | | |/ / / / / / | | | | | |/| | | | | | missing close double quote in mail_list.tpl
| | | | | | * | | | | | missing close double quote in mail_list.tplSimon L'nu2012-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 23:06:53 +0000