Commit graph

1207 commits

Author SHA1 Message Date
Friendika
473786d3a0 Merge branch 'chriscase-master' 2011-02-15 03:45:40 -08:00
Chris Case
0d853433eb fixed error which was causing multiple line breaks, added comments to better document what is occuring, cleaned up code, removed unnecessary parameters from templating step 2011-02-15 03:31:20 -08:00
Friendika
69be5b64e0 Merge branch 'tobiasd-master' 2011-02-15 03:17:18 -08:00
Friendika
f856493555 add permalink field to item table 2011-02-15 03:13:38 -08:00
Friendika
1b14f67a86 bug #0000006, local sparkle links visible in "like" items when remote viewing 2011-02-15 02:30:01 -08:00
Tobias Diekershoff
7a6174298b deleted the translated file of comment_item.tpl 2011-02-15 10:56:07 +01:00
Tobias Diekershoff
397643a066 masked the / in the config strings to fix problems with the strings.php 2011-02-15 10:03:05 +01:00
Tobias Diekershoff
afdfc725b8 some translations into German 2011-02-15 09:49:38 +01:00
Friendika
0e7b09b41c bug #0000002, strip HTML from pasted text in prv messages 2011-02-14 21:33:17 -08:00
Friendika
1dea6a2d71 wrong return url for ajax comments on display and photos pages 2011-02-14 20:21:28 -08:00
Chris Case
7b26500510 Merge remote branch 'upstream/master' 2011-02-14 11:50:08 -08:00
Chris Case
42eb6dd723 fixed a bbcode issue with rich text html messages, fixed some issues with plain text. 2011-02-14 05:44:27 -08:00
Friendika
fe1a37074a Merge branch 'chriscase-master' 2011-02-14 05:06:16 -08:00
Chris Case
94e0c3c970 fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag 2011-02-14 04:54:44 -08:00
Friendika
b87ddbd58a Merge branch 'ajaxcomms'
Conflicts:
	view/comment_item.tpl
2011-02-14 04:46:49 -08:00
Friendika
df20990753 ajax comments 2011-02-14 04:43:49 -08:00
Friendika
39dd36176b ajax comments 2011-02-14 04:43:19 -08:00
Chris Case
5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Friendika
f37caa0999 try this again 2011-02-14 02:59:22 -08:00
Friendika
ce8c6dfaf7 just in time for valentines day - heart smiley <3 2011-02-13 17:24:42 -08:00
Chris Case
f98ba371cf updated private message notification to use HTML, still need the foreign language message notifications updated 2011-02-13 14:55:48 -08:00
Friendika
e32cda6542 app not defined 2011-02-13 13:35:08 -08:00
Friendika
2d542e0f98 receiving comment notifications for conversations we aren't "involved" in 2011-02-12 22:29:32 -08:00
Friendika
91190de0f0 fb addon only working from one site - more debug + simplify permission toggle 2011-02-12 19:24:19 -08:00
Friendika
89cbd17c72 more fb debug msgs 2011-02-12 05:07:24 -08:00
Friendika
ee46a028d6 more test ajax comments 2011-02-12 03:42:57 -08:00
Friendika
3d9845f4a4 preliminary ajax comment setups 2011-02-12 03:14:59 -08:00
Friendika
4081ebe6c5 correct color and indent on wall-wall comments 2011-02-12 02:07:16 -08:00
Friendika
7d0de6dfb7 trim excessive space around message body (though we still need 20px padding to accomodate scrollbars) 2011-02-12 01:51:29 -08:00
Friendika
f79c215293 give all comment input form elements id's 2011-02-12 01:37:21 -08:00
Chris Case
8937ba86a2 set default size for profile photo to improve render appearance/speed 2011-02-11 18:52:30 -08:00
Chris Case
b98b5645e6 fixed a typo in the profile photo wrapper div id 2011-02-11 18:46:54 -08:00
Chris Case
6745f07817 set size of contact images to improve rendering 2011-02-11 18:26:07 -08:00
Friendika
5e02519a13 disable network toggles when ACL's are entered 2011-02-11 04:32:38 -08:00
Friendika
0bfe63e7d8 reinstate send slaps but only at the top level (and followup) 2011-02-11 03:17:16 -08:00
Friendika
c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika
40574589e2 fb connecter - document installation 2011-02-10 23:10:50 -08:00
Friendika
fc5a3cac14 post to FB is working 2011-02-10 21:25:24 -08:00
Friendika
bd4e7249a3 more work on facebook addon 2011-02-10 18:01:38 -08:00
Friendika
f217a557b8 allow plugins to become cmd modules 2011-02-10 16:17:21 -08:00
Friendika
6da603fbb5 typo in schema 2011-02-10 13:21:17 -08:00
Friendika
a18bb816cd entirely possible media/links were the only thing posted - don't forward empty message to twitter/SN 2011-02-10 03:51:42 -08:00
Friendika
2e78ed00f6 general purpose callback landing page - e.g. for facebook plugin 2011-02-10 00:32:09 -08:00
Friendika
40777b132b log ignored pubsub deliveries 2011-02-09 19:56:40 -08:00
Friendika
de2c9531db post permission hooks 2011-02-09 19:39:49 -08:00
Friendika
05c52ae81d preserve newlines inside <pre> tags when importing feeds 2011-02-09 17:51:05 -08:00
Friendika
971b16ea4a Accept pretty much bloody anything inside a [url] tag as a legal URL. 2011-02-09 16:55:31 -08:00
Friendika
1d12a2be69 string update 2011-02-09 00:53:51 -08:00
Friendika
9afbb74bf4 Merge branch 'tobiasd-master' 2011-02-09 00:48:07 -08:00
Tobias Diekershoff
89da23c30e spaces for the string extractor, check no parent 2011-02-09 09:40:56 +01:00