Commit graph

824 commits

Author SHA1 Message Date
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
friendica acc4bbeb6e Merge pull request #129 from CatoTH/master
CSRF-Protection and minor changes
2012-03-13 14:36:52 -07:00
friendica acf75e85c8 revup 2012-03-12 19:12:00 -07:00
Tobias Hößl 9574f7df03 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-12 19:06:45 +00:00
friendica d9bee73edf community meta tag renamed from "ika" 2012-03-11 15:50:23 -07:00
Tobias Hößl 4df08433c6 Merge branch 'master' of git://github.com/friendica/friendica 2012-03-11 11:27:47 +00:00
friendica 20d1a16dbb revup 2012-03-10 14:44:43 -08:00
friendica 92a93642e1 revup 2012-03-09 14:43:48 -08:00
Tobias Hößl 635958e11d Merge branch 'master' of git://github.com/friendica/friendica 2012-03-09 10:00:12 +00:00
friendica 3cfa83c3db revup 2012-03-08 14:34:58 -08:00
friendica dd3b3c2454 revup 2012-03-07 15:54:37 -08:00
friendica 731b19c025 revup 2012-03-06 13:57:38 -08:00
friendica c6dce8dd6b revup 2012-03-05 13:37:32 -08:00
friendica cd5a11bb0f revup 2012-03-04 13:39:17 -08:00
friendica 20d37f2e3e revup 2012-03-04 02:25:32 -08:00
friendica a66648356f add diabook to default themes 2012-03-02 16:24:26 -08:00
friendica be231e3466 item table update for file feature 2012-03-02 00:09:10 -08:00
friendica 58e3372b23 probe for very old (0.97 or 1.0) RSS feed with an incorrect or generic content-type 2012-03-01 18:49:23 -08:00
friendica bbebb4c2a0 notification enhancements 2012-02-29 18:19:08 -08:00
friendica 84d5f495e6 better handling of multiple notifications for same item, and old notifications 2012-02-29 16:26:07 -08:00
friendica 4dd4a22582 From Tobias H - catch some irregularities caused by cut/paste code 2012-02-28 14:52:23 -08:00
Tobias Hößl 3d249f0edd Merge remote branch 'upstream/master' 2012-02-28 21:19:02 +00:00
Tobias Hößl 36a1a43f06 Avoid notices 2012-02-28 13:42:12 +00:00
friendica 53412dacd4 update globaldir when page-type changes, add spam date field 2012-02-27 23:27:16 -08:00
friendica d7407f8daa cleanup notify subject lines 2012-02-27 17:18:19 -08:00
Tobias Hößl 7c30fca981 Avoid a Notice 2012-02-27 22:17:57 +00:00
friendica fc036210fb spam db 2012-02-26 18:53:48 -08:00
friendica 89560edde2 Merge pull request #50 from annando/master
massive changes in mail and design updates in "vier"
2012-02-26 15:07:34 -08:00
Michael fe3dfbee56 Mail: New options for actions after importing mails. 2012-02-26 23:39:29 +01:00
friendica bdb14d5aad relative link redirects 2012-02-26 14:34:01 -08:00
Abinoam P. Marques Jr da52792d06 DB_UPDATE_VERSION incremented 2012-02-25 16:59:44 -08:00
friendica 579738aff7 fixed link for toggling plugin from detail page 2012-02-25 13:00:44 -08:00
friendica a3cf563b68 update author name across items if changed. 2012-02-24 20:40:09 -08:00
friendica b95e3ac496 more privacy docs 2012-02-24 12:52:50 -08:00
friendica 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
friendica b4d38f6eed implement firehose notify in ping, strip links so notify popup displays correctly in all themes 2012-02-23 16:50:29 -08:00
friendica 58a9c652de Merge pull request #45 from annando/master
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
friendica f9eddad44f allow forum posts by followers on Diaspora 2012-02-22 19:56:28 -08:00
friendica a97cb88b65 logger_debug was used as string instead of constant 2012-02-21 14:15:10 -08:00
friendica b821399f00 email notify now redirected through mod_notify, weirdness in local deliver caused by community page changes 2012-02-20 19:50:05 -08:00
friendica 4fbd93f7e7 revup 2012-02-20 13:29:46 -08:00
Michael 0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
friendica 2fe479034c revup 2012-02-19 14:37:01 -08:00
friendica 346b44fbf6 revup 2012-02-17 10:13:06 -08:00
friendica 7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica 18b307f983 revup 2012-02-15 14:12:35 -08:00
friendica 7697bde0ca revup 2012-02-14 13:56:43 -08:00
friendica c87aa8f927 poll structures 2012-02-13 18:02:43 -08:00
friendica dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00