Commit Graph

4901 Commits

Author SHA1 Message Date
friendica 5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
friendica e1de2e3de0 don't change ssl settings on local photos for remote contact 2012-04-02 19:38:13 -07:00
Simon L'nu 06942b3654 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  bug #363 and a couple of other reported ssl link issues

* master:
2012-04-02 21:55:10 -04:00
friendica 9391fc965d bug #363 and a couple of other reported ssl link issues 2012-04-02 17:43:11 -07:00
Simon L'nu 9cb3fc226a Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  diabook-themes: css-fixes
  diabook-themes: fixes in js
  diabook-themes: fixed pageheader
  diabook-themes: bugfixes / css-fixes
  make the "new calendar" (javascript interactive) the default
  remove zrl from query string
  catch a couple more Oo smilies
  add page_content_top hook

* master:
2012-04-02 16:53:47 -04:00
Michael Vogel 81dfb61f93 API: template for test function added 2012-04-02 22:36:05 +02:00
Michael Vogel 3dc317dcc6 Merge commit 'upstream/master' 2012-04-02 22:00:22 +02:00
tommy tomson 6dfd55668f diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00
tommy tomson 076b1b374b diabook-themes: fixes in js 2012-04-02 18:16:58 +02:00
tommy tomson b5d57d5313 diabook-themes: fixed pageheader 2012-04-02 17:17:14 +02:00
tommy tomson 9faa940f04 diabook-themes: bugfixes / css-fixes 2012-04-02 15:06:55 +02:00
friendica 2352e6c1cb make the "new calendar" (javascript interactive) the default 2012-04-02 01:46:35 -07:00
friendica 62e528ba43 remove zrl from query string 2012-04-02 00:45:45 -07:00
zottel 7127626f55 Merge remote branch 'upstream/master' 2012-04-02 08:52:24 +02:00
friendica 1f74bd1b78 catch a couple more Oo smilies 2012-04-01 22:57:50 -07:00
friendica 7df6ab9a87 add page_content_top hook 2012-04-01 22:22:26 -07:00
Simon L'nu 5eca42975c Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  add title to D* posts
  allow users to set categories on their posts
  Modified peopleyouknow to handle sites without Facebook better
  diabook-themes: add link to global dir in "find friends" at right_aside
  modified:   mod/newmember.php
  New user quick start.
  check for style.php existence before inclusion
  Moved Diaspora notes away from top, per user request

* master:
2012-04-01 23:56:13 -04:00
friendica 5d35f0d54a add title to D* posts 2012-04-01 19:16:13 -07:00
friendica 07cfdba9c3 Merge pull request #200 from unary/categories
allow users to set categories on their posts
2012-04-01 19:03:20 -07:00
Michael Johnston 581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica 06e9a8b7a0 Merge pull request #199 from beardy-unixer/1457d6e90f36a6a7bb07df3579b6e5c0475b121d
Better peopleyouknow for sites without Facebook
2012-04-01 17:53:59 -07:00
Thomas Willingham 1457d6e90f Modified peopleyouknow to handle sites without Facebook better 2012-04-02 01:26:45 +01:00
friendica 845b123b47 Merge pull request #198 from beardy-unixer/master
New User Quick Start
2012-04-01 16:49:19 -07:00
Thomas Willingham 210586eaed Merge remote-tracking branch 'upstream/master' 2012-04-02 00:29:27 +01:00
tommy tomson 23dc376364 diabook-themes: add link to global dir in "find friends" at right_aside 2012-04-02 01:29:20 +02:00
Thomas Willingham 8406803473 modified: mod/newmember.php
Add a link to the quick start
2012-04-02 00:27:47 +01:00
Thomas Willingham 8c9c561f6c New user quick start. 2012-04-02 00:23:58 +01:00
friendica f95db4382e check for style.php existence before inclusion 2012-04-01 16:21:55 -07:00
Thomas Willingham d0ddd380e7 Moved Diaspora notes away from top, per user request 2012-04-02 00:18:03 +01:00
Simon L'nu 9472ba8d20 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  slight improvement in handling of plaintext feeds
  css-fixes
  add new messages-layout in diabook
  fix the display of community-plugin in diabook-themes
  that didn't quite work out
  document tinymce fixes/workarounds
  various bugfixes and css-fixes
  qcomment overflow
  try slightly better detection of html in feeds
  send unverified private mail using zrl

* master:
2012-04-01 18:59:53 -04:00
friendica 2589feef70 Merge branch 'pull' 2012-04-01 15:44:27 -07:00
friendica 00bbb9ad36 slight improvement in handling of plaintext feeds 2012-04-01 15:43:57 -07:00
Michael Vogel a39d8d3f02 The "vier"-theme is now working again. But there is still work needed 2012-04-02 00:08:49 +02:00
tommy tomson 408de09f72 css-fixes 2012-04-02 00:05:49 +02:00
Michael Vogel 5409825fe7 New script that checks if a script is running 2012-04-01 20:56:27 +02:00
Michael Vogel 4cf1e5aa21 poller: An optional lockfile is used to check if the poller is already running 2012-04-01 20:52:33 +02:00
tomtom84 31d04d685e Merge pull request #197 from tomtom84/master
fixes in diabook-derivates
2012-04-01 09:13:35 -07:00
tommy tomson f075e977fe add new messages-layout in diabook 2012-04-01 18:12:20 +02:00
tomtom84 6c302e78da Merge pull request #196 from tomtom84/master
fixes in diabook-derivates
2012-04-01 07:35:47 -07:00
tommy tomson ff12637ceb fix the display of community-plugin in diabook-themes 2012-04-01 16:34:31 +02:00
friendica 9b4bef8ac4 that didn't quite work out 2012-04-01 06:46:12 -07:00
Michael Vogel 7d23149a61 Merge commit 'upstream/master' 2012-04-01 14:11:37 +02:00
friendica bb67ca9f1c Merge branch 'pull' 2012-04-01 04:13:58 -07:00
tomtom84 d1783bba17 Merge pull request #195 from tomtom84/master
fixes in diabook-derivates
2012-04-01 04:13:48 -07:00
friendica 63ea378d92 document tinymce fixes/workarounds 2012-04-01 04:13:27 -07:00
tommy tomson 15ba0ef5d0 various bugfixes and css-fixes 2012-04-01 13:12:15 +02:00
friendica bc283f7c5d qcomment overflow 2012-04-01 03:37:41 -07:00
friendica f0b8d01615 try slightly better detection of html in feeds 2012-04-01 03:19:37 -07:00
friendica ae5e5bf1e4 Merge branch 'pull' 2012-04-01 01:03:05 -07:00