clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,812 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

4812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tobias Diekershoff 751e4181e5 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-18 07:19:20 +01:00
friendica 4bb280bc2f lost changes to tinymce/bbcode 2012-03-17 22:18:21 -07:00
friendica 9e731506c2 remove admin view of local directory 2012-03-17 22:14:17 -07:00
friendica 67fd539f53 bug #337, call template_unescape() only at the end of template processing 2012-03-17 18:15:36 -07:00
Simon L'nu 939c8d3c8d Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-17 20:03:34 -04:00
Tobias Diekershoff 5fd03583a4 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-17 12:29:21 +01:00
Michael Vogel f5db142d93 Quotes with author are now having an "open/close" link 2012-03-17 12:15:59 +01:00
friendica 94fac6d767 queue optimisation - back off delivery attempts to once per hour after the first 12 hours. 2012-03-17 03:43:02 -07:00
Michael Vogel 8a1f175df0 New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements 2012-03-17 11:07:49 +01:00
friendica 26258bca77 compare ssl_policy precisely in case somebody was bitten by template processor bug 2012-03-17 02:36:59 -07:00
friendica e0e008fb8d template processor broken with foreach k=>v and k is integer 0 2012-03-17 02:26:52 -07:00
Tobias Diekershoff 96da328acf Merge branch 'master' of https://github.com/friendica/friendica 2012-03-17 08:44:36 +01:00
Simon L'nu c7759af8c5 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  cut/paste error
  scheme checking for webservers without $_SERVER['HTTPS']

* master:
 2012-03-17 03:23:46 -04:00
friendica 057a142b8c cut/paste error 2012-03-17 00:08:52 -07:00
friendica 511d8a30a0 scheme checking for webservers without $_SERVER['HTTPS'] 2012-03-16 23:51:49 -07:00
Simon 2785bb413e Merge pull request #145 from simonlnu/master 
[fix] whitespace in photo_view and like_noshare. dispy-dark clean up
 2012-03-16 23:05:37 -07:00
Simon L'nu 87fdae2dd8 [fix] whitespace in photo_view and like_noshare. dispy-dark clean up 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-17 01:55:40 -04:00
Simon L'nu 2b06b081d3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-17 01:47:53 -04:00
Simon 4a6f114ec0 Merge pull request #144 from simonlnu/master 
remove auto-complete from some themes since the comment one is now global
 2012-03-16 18:24:26 -07:00
Simon L'nu 75883b196e remove auto-complete from darkzero-NS, dispys, since the comment one is now global 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 21:23:24 -04:00
Simon L'nu 49540fb958 make auto-complete work in more places 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 21:20:23 -04:00
Simon L'nu 030c8a089a Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-16 21:19:17 -04:00
Simon 8af36b92bb Merge pull request #143 from simonlnu/master 
make auto-complete in darkzero-NS.
 2012-03-16 17:31:24 -07:00
Simon L'nu 368d93625d make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 20:29:02 -04:00
Simon L'nu 6bc2d58a98 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-16 20:26:38 -04:00
friendica 82f2bfea5b convert boolean or int settings to strings to work around issues with template processing 2012-03-16 16:05:16 -07:00
Simon L'nu 0e9d5e0ce8 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:
  wrong link in d* comment notifications

* master:
 2012-03-16 18:35:50 -04:00
friendica 949c6d47b5 add "send pm" link to photo dropdown for Diaspora contacts 2012-03-16 15:19:38 -07:00
friendica 141ae076ad Merge branch 'pull' 2012-03-16 15:08:32 -07:00
friendica 58940175e1 wrong link in d* comment notifications 2012-03-16 15:07:45 -07:00
Simon c7dd52be62 Merge pull request #142 from simonlnu/master 
make profiles-menu disappear when clicked outside of it
 2012-03-16 13:44:39 -07:00
Simon L'nu 91fee866b7 make profiles-menu disappear when clicked outside it 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 16:43:34 -04:00
Simon L'nu 01f8710832 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-16 16:41:19 -04:00
Simon 1246a40ec2 Merge pull request #141 from CatoTH/master 
Private messages - tabindex
 2012-03-16 10:54:20 -07:00
Tobias Hößl 90bb32ab73 Bugfix of old IEs 2012-03-16 17:47:40 +00:00
Tobias Hößl 27054964fe Forgot to remove a debug line 2012-03-16 17:46:26 +00:00
Tobias Hößl 75823c2353 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 2012-03-16 17:45:07 +00:00
Simon 925b9c5b9c Merge pull request #140 from simonlnu/master 
weee, dispys get another update
 2012-03-16 10:35:19 -07:00
Simon L'nu 7b15f27ba4 weee, dispys get another update 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 13:31:59 -04:00
Simon L'nu a8c1cbc655 Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* 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:
 2012-03-16 13:28:22 -04:00
friendica 28f941193d syntax error from pasted text, remove ^M's 2012-03-16 06:02:26 -07:00
friendica 224dfa848b bug #335 network search broken after new ssl policy settings 2012-03-16 05:51:04 -07:00
friendica 805087af67 whitespace 2012-03-16 05:41:29 -07:00
friendica be1bd9ff4e notification for disapora comments 2012-03-16 05:19:29 -07:00
Tobias Diekershoff 74c64ef2d2 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-16 07:13:14 +01:00
Simon 47e1b8d0c0 Merge pull request #139 from simonlnu/master 
missing close double quote in mail_list.tpl
 2012-03-15 22:58:54 -07:00
Simon L'nu e21bf3341b Merge branch 'master', remote-tracking branch 'remotes/upstream/master' 
* remotes/upstream/master:

* master:
 2012-03-16 01:57:59 -04:00
Simon L'nu d965f73ef1 missing close double quote in mail_list.tpl 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 01:57:27 -04:00
Simon cecd62373b Merge pull request #138 from simonlnu/master 
more changes in dispy-dark
 2012-03-15 22:56:46 -07:00
Simon L'nu 6bdb71f01c more changes in dispy-dark 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-03-16 01:55:34 -04:00