Commit graph

273 commits

Author SHA1 Message Date
friendica
411b6a71b4 Merge https://github.com/friendica/friendica into pull 2012-09-04 22:53:32 -07:00
friendica
4cd8233f61 remote_user can now support multiple contacts being logged in at once 2012-09-04 22:50:28 -07:00
Zach Prezkuta
79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06:00
friendica
68d7a3ae01 put a variant of the parent_uri into email notification message-ids. Current message-ids aren't completel legal. More work to do. 2012-08-15 17:14:29 -07:00
Domovoy
4b514ea989 Fallback so that we alway have a thr-parent 2012-08-07 10:04:47 +02:00
Domovoy
97285f4811 Preview was not working 2012-08-05 15:35:12 +02:00
Domovoy
786e9064f2 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-04 23:33:06 +02:00
friendica
621e737826 fix angle char storage and transmission, rev update 2012-08-03 18:33:11 -07:00
Domovoy
ea7db7b7a8 Threaded items in every page concerned. Some code cleanup. 2012-08-03 21:55:17 +02:00
Domovoy
8ecf8167db Threaded comments are starting to work.
For now, only on normal view, and not during update
2012-07-27 22:08:57 +02:00
Domovoy
2a1657e361 Revert "Progress on #1. Comments are now threaded, at least in the database, for normal view."
This reverts commit da1b47a029.

Useless, comments are already threaded in the database using parent-uri
2012-07-23 13:58:47 +02:00
Domovoy
da1b47a029 Progress on #1. Comments are now threaded, at least in the database, for normal view. 2012-07-23 12:56:47 +02:00
friendica
8b6942c572 don't use language detection if < php 5.3 2012-07-13 15:38:02 -07:00
friendica
9a299920eb language detection - result is stored in item['postopts'] 2012-07-11 22:45:14 -07:00
Zach Prezkuta
fc6f7daf38 small cleanup 2012-07-10 19:28:38 -06:00
friendica
a3edbf7e5d create third privacy state - public post but not searchable or publicly visible 2012-06-28 17:43:29 -07:00
Zach Prezkuta
28526dbf21 remove possibly unnecessary checks for likes or comments created by Diaspora users 2012-06-25 19:03:03 -06:00
Zach Prezkuta
9e8573507e store signature info for remote users too 2012-06-25 19:03:03 -06:00
Zach Prezkuta
5773241537 add some debug logging 2012-06-25 19:03:03 -06:00
Zach Prezkuta
8bb7ab88fb Clean up the Diaspora connectivity:
- Move Diaspora code into separate functions to make it more modular
- Create more checks for whether Diaspora connectivity has been enabled
2012-06-25 19:03:03 -06:00
Zach Prezkuta
fa7e803f73 fix check for parent of StatusNet API post 2012-06-25 08:26:12 -06:00
Zach Prezkuta
c0af6dbb1a Implement relaying of relayable_retractions
Also: some whitespace cleanup, fix Diaspora parent DB query
2012-06-03 14:53:29 -06:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
friendica
0ef8ccf11b fix wall_uploaded photo permissions on group post by member 2012-05-25 17:42:35 -07:00
friendica
a163825291 redir links for permission controlled attachments 2012-05-21 22:54:39 -07:00
friendica
dd86f40f96 set comment permissions explicitly to parent permissions 2012-05-19 16:42:24 -07:00
friendica
e7ff35f27d Avoid tagging both '@Robert Johnson' and also '@Robert', when '@Robert Johnson' was already matched, and '@Robert' might be somebody different entirely. 2012-05-02 22:33:51 -07:00
friendica
2064d86cb3 separate tag search from body search 2012-04-23 22:41:32 -07:00
friendica
0a3454c841 function name typo 2012-04-15 05:11:52 -07:00
friendica
18e225b051 move all fix_mce to one function so it can easily be undone 2012-04-10 17:14:07 -07:00
friendica
92c20895e0 use local_user for tag completion if available. See bug #368 2012-04-09 04:55:52 -07:00
friendica
977625a53b fix to wall_upload photos default permissions to use cid rather than uid. 2012-04-08 16:19:45 -07:00
friendica
cf2d8ef7a6 tag tests cont. 2012-04-07 02:11:56 -07:00
friendica
3a1c78bd75 some work on tests 2012-04-07 01:04:45 -07:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
Michael Johnston
581b54c974 allow users to set categories on their posts 2012-04-01 21:28:31 -04:00
friendica
b18086097e title not updated when editing post 2012-03-28 03:18:26 -07:00
Michael Johnston
ca1e2254c9 typo datarry -> datarray 2012-03-25 16:00:11 -04:00
friendica
528d795fb6 ability to change tags in edited posts 2012-03-22 16:17:10 -07:00
friendica
f1bbe03df1 work around doubled linefeeds in tinymce3.5b2 2012-03-21 21:42:27 -07:00
friendica
057a142b8c cut/paste error 2012-03-17 00:08:52 -07:00
friendica
28f941193d syntax error from pasted text, remove ^M's 2012-03-16 06:02:26 -07:00
friendica
531201f2a1 Merge pull request #132 from campino/master
Test cases
2012-03-14 15:16:30 -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
509532d168 get_tags tests corrected. They test for the right things now. 2012-03-14 12:30:52 +01:00
Alexander Kampmann
bce3bfff38 get tags test improved 2012-03-12 13:59:00 +01:00
Alexander Kampmann
f8042d0445 splitted test cases. 2012-03-09 12:57:11 +01:00
Abinoam P. Marques Jr
2d5f8b4b48 mod/item.php pass 'parent' to notification 2012-02-25 16:59:44 -08:00
friendica
2c7da5d0de scale external images 2012-02-25 14:22:51 -08:00
friendica
1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica
d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
friendica
7b0a005441 edit post not working after plaintext editor fixes, missing some recent editor template changes 2012-02-09 15:58:26 -08:00
friendica
4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica
e43a3a412c store moderated flag if set 2012-01-29 02:09:39 -08:00
friendica
e2d0eb4a88 redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic 2012-01-24 18:59:55 -08:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
friendica
e12341b716 api post broken with recent change to use REQUEST vars in mod_item 2012-01-15 13:57:00 -08:00
friendica
0856935d75 use $_REQUEST for all post items, move default api permission code block to simplify logic 2012-01-12 14:20:21 -08:00
friendica
87c4d1c3cd bug #251 - privacy settings not working via API 2012-01-12 13:58:17 -08:00
friendica
7011f71e8f post preview 2012-01-09 20:03:00 -08:00
friendica
a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica
291a82c4a4 backend for per-network streams 2012-01-05 18:11:53 -08:00
friendica
b99cb511ca comment preview 2012-01-05 16:38:24 -08:00
friendica
53878625f6 backend support for post preview 2012-01-05 15:02:44 -08:00
friendica
fc7d0360bb add verb and item to notifications to aid in localisation 2012-01-03 20:26:20 -08:00
friendica
0f87f84cfb notification testing 2011-12-27 14:26:44 -08:00
friendica
356c05c6b3 extending notifications to other types 2011-12-26 14:16:25 -08:00
friendica
efb9157490 eliminate dup identical hashtags in posts 2011-12-16 01:42:45 -08:00
friendica
d100944fe6 api post default to default post permissions was broken 2011-12-07 14:04:34 -08:00
friendica
3afa248238 use default post permissions when coming from api - unless permissions are explicitly set. 2011-11-28 20:09:10 -08:00
friendica
d53db63d41 forum split delivery flag 2011-11-18 21:55:00 -08:00
Friendika
cc1c015f20 @ completion is a bit too greedy 2011-11-05 21:43:58 -07:00
Friendika
bd48a016af fix for multiple consecutive @ tags 2011-11-02 21:07:17 -07:00
Friendika
a9ec56ace1 prevent duplicate @ tags 2011-11-02 18:52:55 -07:00
Friendika
05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika
e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Fabio Comuni
a9fb8e4d60 Use oembed for bookmark, audio, video, youtube 2011-10-24 14:30:11 +02:00
Friendika
278433eac7 origin flag handling, and bug #137 - provide timezone conversion for events posted across to Diaspora 2011-10-17 14:52:03 -07:00
Friendika
557a7d0cec stuff
- background the external network notifications (Facebook, Twitter, Statusnet)
 - add vimeo support
 - consolidate editor video options (insert video, regardless of source)
 - add "Connector Settings" page purely for configuring connectors
 - moved mailbox settings to Connectors
 - Move the "Connect/Follow" dialogue out of "find people" and move to top.
 - Add "Find People" dialogue
 - minor theme edits on duepuntozero and testbubble to make all this stuff work
 - A bit of theming on duepunto notifications to eliminate the gigantic Diaspora profile photos.
2011-10-11 18:24:37 -07:00
Friendika
b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Friendika
7091173131 removing another potential way a post could have a zero parent. 2011-10-03 02:39:19 -07:00
Friendika
119cd9c0ce more multiline regex fixes 2011-09-20 04:07:24 -07:00
Friendika
8bf6a29d4e optimise the commented date view 2011-09-18 19:04:11 -07:00
Friendika
9c3503a706 update timestamp on activity change (comment/like) 2011-09-16 06:49:24 -07:00
Friendika
4f24494b0b Dreamhost's unreliable process model is really getting irritating 2011-09-12 19:42:10 -07:00
Friendika
17b081f9f7 allow html post to api 2011-09-11 21:52:50 -07:00
Friendika
82f7f33cf5 bookmarks + bug #140 2011-09-04 19:58:03 -07:00
Friendika
a33edb0042 infrastructure for personalised @ tags (no UI/settings form yet), allow own comments through statusnet connector 2011-09-01 18:02:08 -07:00
Friendika
f0c3a75ff3 youtube redirect fixes 2011-08-30 23:09:39 -07:00
Friendika
f29f228463 bring Diaspora message signing back to the source author - whether they like it or not. 2011-08-28 19:22:27 -07:00
Friendika
0eb06b3e2d cronhooks broken 2011-08-15 22:23:17 -07:00
Friendika
240941237a privacy enforcement on pubmail_enable 2011-08-15 18:29:49 -07:00
Friendika
bbd545b9ca honour "post to xxx network by default" when using API 2011-08-14 04:26:41 -07:00
Friendika
0745c00b16 guids on items 2011-08-07 17:33:13 -07:00
Friendika
8812b7f4ca item guids 2011-08-07 17:29:26 -07:00
Friendika
ad1e827169 several fixes for attachments 2011-08-03 19:18:58 -07:00
Friendika
d0b7723bbc re-parent api post item with parent_id and no parent_uri 2011-08-03 16:29:25 -07:00
Friendika
996425206f api profiles 2011-07-31 20:01:00 -07:00
Friendika
b0a9ec0a73 better handling of api comments/replies 2011-07-31 17:52:36 -07:00
Friendika
55bbe2108a event ownership from remote feeds messed up, this is one step - may require more 2011-07-12 01:24:07 -07:00