Commit graph

11219 commits

Author SHA1 Message Date
marijus
8835f646ae Revert "Revert "Merge pull request #583 from git-marijus/master""
This reverts commit 08638f3ec8.
2014-09-11 10:35:19 +02:00
Paolo T
8bf4b5e776 Merge pull request #584 from tuscanhobbit/master
Merge pull request #2 from friendica/master
2014-09-11 08:55:04 +02:00
friendica
5b774e26ca make sure we add the file 2014-09-10 23:09:54 -07:00
friendica
4c8036f530 endless scroll on connections page 2014-09-10 23:08:24 -07:00
friendica
10f6f355d4 disabling ability for diaspora to plustag redmatrix forums. See the notes. 2014-09-10 22:35:09 -07:00
friendica
f1539a65e5 possible solution to diaspora walltowall mistaken attribution 2014-09-10 22:21:19 -07:00
friendica
6991a3ac01 more compatibility notes 2014-09-10 21:43:25 -07:00
friendica
de89bdc45f encrypt diaspora_meta since it may contain private message contents 2014-09-10 19:02:00 -07:00
friendica
6ab21b3d4f make verify_email the default for new installs (at least English installs), and provide a setting on the admin page for it. 2014-09-10 17:42:13 -07:00
friendica
79bd451631 fix the like signatures to the "new ordering" - inbound and outbound 2014-09-10 16:32:19 -07:00
friendica
08638f3ec8 Revert "Merge pull request #583 from git-marijus/master"
autoload broken - even after clearing cache and retrying.

This reverts commit 13e7a8f123, reversing
changes made to 4712b78e52.
2014-09-10 16:09:01 -07:00
friendica
eae146d85d Revert "Revert "update nl - attempt 2""
This reverts commit 8e179aa734.
2014-09-10 16:04:12 -07:00
friendica
8e179aa734 Revert "update nl - attempt 2"
This reverts commit 4712b78e52.
2014-09-10 16:02:25 -07:00
RedMatrix
13e7a8f123 Merge pull request #583 from git-marijus/master
photo justification
2014-09-11 08:46:58 +10:00
marijus
d825adf423 without this check we kill the directory autoload 2014-09-10 17:40:50 +02:00
marijus
c1c2214b47 photo justification 2014-09-10 17:10:39 +02:00
Jeroen
4712b78e52 update nl - attempt 2 2014-09-10 14:10:20 +00:00
Jeroen
81ae6f83f3 update nl 2014-09-10 14:05:12 +00:00
jeroenpraat
9f5ad8e9de channel or account 2014-09-10 14:04:14 +02:00
jeroenpraat
e1ddcc32b7 should be updated 2014-09-10 14:03:19 +02:00
friendica
d891b09b22 don't include plus-sign in the stored term for imported mentions 2014-09-10 01:27:52 -07:00
friendica
e45a9b1522 this should be the final piece of the puzzle 2014-09-09 23:23:52 -07:00
friendica
f09b7ca409 cross-network mention issues 2014-09-09 23:12:17 -07:00
friendica
cb10da3eef Did I ever mention how much I HATE hacking crypto? If you've got a protocol doc that says how you sign something, you damm well better sign it that way. 2014-09-09 22:45:26 -07:00
friendica
e7b005b1f8 go through the entire discovery sequence for mentions to make sure we have the correct URL 2014-09-09 22:33:23 -07:00
friendica
c1713d49e0 diaspora connections being marked orphan on directory servers 2014-09-09 21:54:25 -07:00
friendica
f606dec47b Merge https://github.com/friendica/red into pending_merge 2014-09-09 21:39:10 -07:00
friendica
c02554ad36 some fixes for auto-perms across networks 2014-09-09 21:38:51 -07:00
Thomas Willingham
1ce132a1ca Doco - URL update, kill dupe 2014-09-10 05:02:12 +01:00
friendica
89b65e554c reduce log level of inbound d* posts until we get through some of the more serious federation issues 2014-09-09 20:32:03 -07:00
friendica
5ede60e742 and provide a strong hint by showing the errant account_flags 2014-09-09 18:26:40 -07:00
friendica
c11fc95d97 in case somebody has problems and does an update to try and fix it, put something in the logs to show what's happening. 2014-09-09 18:23:50 -07:00
friendica
18f8f08367 argument order reversed in downgrade_accounts 2014-09-09 17:25:31 -07:00
friendica
537f101554 encode rss message-id's - warning this will double store all existing rss feed items and probably make a mess of things 2014-09-09 16:28:33 -07:00
friendica
f52e754dc6 put back old pointer 2014-09-09 15:53:58 -07:00
friendica
35051405a0 Merge https://github.com/friendica/red into pending_merge 2014-09-09 15:53:25 -07:00
friendica
420fd59513 fix empty reshared content 2014-09-09 15:52:52 -07:00
Thomas Willingham
9aadf82972 Merge pull request #582 from beardy-unixer/master
Doco
2014-09-09 21:33:30 +01:00
Thomas Willingham
ec4f30c3f6 Merge remote-tracking branch 'upstream/master' 2014-09-09 21:32:25 +01:00
Thomas Willingham
652ec8c3fc Doco - note in Nginx file to kill a recurring support request. 2014-09-09 21:31:33 +01:00
friendica
409c89d629 doco correction 2014-09-09 04:10:01 -07:00
friendica
386156138f syntax error in dba driver, document z_post_url 2014-09-09 02:42:07 -07:00
friendica
9753453ec4 if we have php54 don't log the whole damn stack on a db error, just the current frame 2014-09-09 01:23:52 -07:00
friendica
4384fa8b12 d* friending vsprintf error 2014-09-09 01:14:15 -07:00
friendica
384eace32a heavy lifting on diaspora likes. Still needs much more work - especially as we're ignoring signatures at this time 2014-09-08 22:32:05 -07:00
friendica
e4e9098f39 prevent red#matrix smilie replacements from tripping over each other. 2014-09-08 21:36:33 -07:00
friendica
b7c1ad8cb2 diaspora_like - sql error 2014-09-08 21:08:50 -07:00
friendica
21290bffce one more time 2014-09-08 20:47:36 -07:00
friendica
b56e49d196 missed one 2014-09-08 20:45:17 -07:00
friendica
c6d07feff5 This is long overdue - use a symblic constant NULL_DATE instead of the easily mis-typed sequence '0000-00-00 00:00:00' 2014-09-08 20:35:15 -07:00