Commit Graph

5143 Commits

Author SHA1 Message Date
friendica a7fd3a8b24 Merge branch 'pull' 2012-03-15 01:48:10 -07:00
friendica 4cd3d5cd02 Merge https://github.com/friendica/friendica into pull 2012-03-15 01:48:07 -07:00
zottel 282465edab Merge remote branch 'upstream/master' 2012-03-15 08:36:05 +01:00
tommy tomson 6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 2012-03-15 08:29:39 +01:00
Tobias Diekershoff 80b57e664a Merge branch 'master' of https://github.com/friendica/friendica 2012-03-15 06:31:47 +01:00
Simon L'nu 6e133e75c3 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
  roll protocol version due to ssl_policy settings
  force login to ssl on SSL_POLICY_SELFSIGN
  basic ssl_policy for important modules
  ssl_policy stuff
  revup
  splitted tests into several files
  removed done TODO
  get_tags tests corrected. They test for the right things now.
  addon settings form error
  more work on filer, comment level and file tag removal
  added slack-NS, non-scrolly, slackr-based theme.
  get tags test improved
  splitted test cases.
  changed a test string
  added some tests
  added library and include to .htaccess
  excludes reports from git
  better tests
  added test blueprints, fixed? encoding issues

* master:
2012-03-15 01:02:44 -04:00
friendica b06c5983a4 don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts 2012-03-14 21:58:54 -07:00
friendica b44533e9fb roll protocol version due to ssl_policy settings 2012-03-14 21:40:36 -07:00
friendica 93a8907f43 force login to ssl on SSL_POLICY_SELFSIGN 2012-03-14 21:29:44 -07:00
friendica 110e8f2919 basic ssl_policy for important modules 2012-03-14 21:20:20 -07:00
friendica f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica 64e3e3590b revup 2012-03-14 16:09:13 -07:00
friendica 531201f2a1 Merge pull request #132 from campino/master
Test cases
2012-03-14 15:16:30 -07:00
friendica 959aa13de0 Merge pull request #133 from tonybaldwin/master
slack-NS
2012-03-14 15:15:34 -07:00
friendica dcdfa96a1f Merge branch 'pull' 2012-03-14 14:34:52 -07:00
friendica 2dc527609e Merge https://github.com/friendica/friendica into pull 2012-03-14 14:34:48 -07:00
zottel 2481758886 Merge remote branch 'upstream/master' 2012-03-14 16:29:22 +01:00
Simon L'nu ebccf13c4c Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix in nav
  add links to home, profile, photos, events, notes to aside in network-stream

* master:
2012-03-14 11:02:14 -04:00
Simon c95deb4839 Merge pull request #134 from simonlnu/master
PHP Fatal error:  Call-time pass-by-reference has been removed in mod/item.php on line 630
2012-03-14 08:02:04 -07:00
Simon L'nu 0bf9595ab1 PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 11:00:20 -04:00
Alexander Kampmann 70709a8825 Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
	view/de/strings.php
2012-03-14 12:57:35 +01:00
tommy tomson f03c57007a fix in nav 2012-03-14 12:56:59 +01:00
Alexander Kampmann 509ed2604f splitted tests into several files 2012-03-14 12:54:49 +01:00
tommy tomson 42462cc1f0 add links to home, profile, photos, events, notes to aside in network-stream 2012-03-14 12:50:11 +01:00
Alexander Kampmann c0c98206ef removed done TODO 2012-03-14 12:31:25 +01:00
Alexander Kampmann 509532d168 get_tags tests corrected. They test for the right things now. 2012-03-14 12:30:52 +01:00
friendica 9df67e5cfe Merge branch 'pull' 2012-03-13 23:53:33 -07:00
friendica 7e270b043c addon settings form error 2012-03-13 23:52:13 -07:00
Tobias Diekershoff 4fcdada432 Merge branch 'master' of https://github.com/friendica/friendica 2012-03-14 07:20:13 +01:00
Simon fb77bfa648 Merge pull request #131 from simonlnu/master
massive work done to both dispys, mostly -dark
2012-03-13 22:10:02 -07:00
Simon L'nu 975781d3e2 massive work done to both dispys, mostly -dark
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-14 01:05:08 -04:00
friendica 4972d7ef6e more work on filer, comment level and file tag removal 2012-03-13 20:46:37 -07:00
Tony Baldwin 1ae740535d added slack-NS, non-scrolly, slackr-based theme. 2012-03-13 23:05:04 -04:00
Simon L'nu a2073bcfc0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  sort inbox by recently replied conversations first
  file as widget and basic filing implementation for duepuntozero,slackr much more work needed - this is just for test/evaluation currently
  don't count self in number of contatcs
  invite potential connectees to the free social web
  In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better.
  Some security against XSRF-attacks
  A 'PHP Fatal error:  Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.
  Mostly some checks in order to avoid Notices; 1 real bugfix in /mod/network.php
  Avoid notices
  contact.network is used later to check if a direct link or a redirect by /redir/contactid should be used
  wasn't actually changed before
  Avoid a notice
  Avoid a Notice
  Avoid a Notice
  Avoid a Notice

* master:
2012-03-13 22:41:45 -04:00
friendica de017d1ed7 sort inbox by recently replied conversations first 2012-03-13 19:27:52 -07:00
friendica be48fff157 file as widget and basic filing implementation for duepuntozero,slackr
much more work needed - this is just for test/evaluation currently
2012-03-13 18:13:03 -07:00
friendica 8a789a33d1 Merge branch 'pull' 2012-03-13 16:02:52 -07:00
friendica db80ffa0ff don't count self in number of contatcs 2012-03-13 16:02:20 -07:00
friendica 2173f418dd Merge pull request #130 from CatoTH/master
HTML2BBCode with [EMBED]: Compute in JS instead of PHP
2012-03-13 15:45:12 -07:00
friendica 427362c324 Merge branch 'pull' 2012-03-13 15:41:13 -07:00
friendica dc84da520d invite potential connectees to the free social web 2012-03-13 15:40:16 -07:00
Tobias Hößl 7868e3897b In HTML2BBCode: fetch the URL of [EMBED] using JavaScript instead of an ajax-call to a php-script. Once there actually is embedded Code in the HTML, this function is called after every single keypress. Not only is making an ajax-call every keypress bandith intensive - it also made typing hard / slow. Making a lot of JavaScript-RegExp-Computation every keypress isn't exactly great either, but still performs better. 2012-03-13 21:46:57 +00:00
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
Simon L'nu 1763a6c9c2 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term,  and theming.

* master:
2012-03-13 14:41:46 -04:00
Tobias Hößl 43430ef561 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-13 18:34:15 +00:00
friendica 5a41676465 initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming. 2012-03-13 04:04:26 -07:00
Tobias Diekershoff 5bae7159cc Merge branch 'master' of https://github.com/friendica/friendica 2012-03-13 06:50:14 +01:00
Simon L'nu 203fa94e17 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  click anywhere to close notifications -> zeros and bubbles
  revup
  fix css
  use fancybox instead of lightbox
  fixes

* master:
2012-03-13 00:25:20 -04:00
friendica bf7425c591 click anywhere to close notifications -> zeros and bubbles 2012-03-12 20:21:32 -07:00
friendica e12706e825 Merge branch 'pull' 2012-03-12 19:12:39 -07:00