Commit graph

1353 commits

Author SHA1 Message Date
Michael f6320f3319 Encoding for incoming mails. Fixed invalid message id (with side effect at the moment). Sending mail as text mail. Encoding name when importing mail contact. 2012-02-24 07:11:26 +01:00
Michael 484a442f2b GIT problems ... 2012-02-23 20:59:34 +01:00
Michael 0409b5cdba Merge remote branch 'upstream/master'
Conflicts:
	include/bbcode.php
2012-02-23 20:53:22 +01:00
Michael 311e35731c bbcode.php: A list or quote at the beginning wasn't detected 2012-02-23 20:51:44 +01:00
Tobias Diekershoff 85d09f48d0 fix img tag with size attribute 2012-02-23 11:12:36 +01:00
friendica d9e9fd0359 Merge branch 'master' into notify 2012-02-23 00:30:17 -08:00
friendica fd43e2c563 more theme notify fixes 2012-02-23 00:28:26 -08:00
friendica 41636a50aa new notify sort of working in testbubble 2012-02-22 23:34:30 -08:00
Michael Vogel 9f92bbb04c Removed the export of markdown articles. That was for testing purposes only. 2012-02-23 07:53:45 +01:00
friendica 808b886a3e Merge branch 'master' into notify 2012-02-22 22:36:07 -08:00
friendica 3c6b127d40 nested quote check fails to account for strpos returning position 0 2012-02-22 20:58:04 -08:00
friendica d75d49a4c1 restore poller normal operation 2012-02-22 20:31:33 -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
Michael e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
friendica 390eb15e7d never enough documentation 2012-02-22 01:50:06 -08:00
friendica a19ddb48ee waitman gobble media upload via api patch 2012-02-21 23:35:50 -08:00
friendica 91c3349025 escape smiley conversion in code and pre blocks 2012-02-21 23:13:03 -08:00
friendica 3f2497ad20 add full email link to notification 2012-02-21 18:10:15 -08:00
friendica f03aaf554e mark all notifications read 2012-02-21 16:59:57 -08:00
Fabio Comuni 01a2791e3a template: add support for variable filters 2012-02-21 11:25:22 +01:00
friendica 5910fbf420 fill in notify msg with redirect link after we get the id 2012-02-21 00:02:42 -08:00
friendica 32d9008dd4 more cleanup of community followup detection. Remote worked well but local didn't. 2012-02-20 21:07:40 -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 6edd6d8ae1 Merge branch 'pull' 2012-02-20 18:07:16 -08:00
friendica 11871195be fix twitter title showing up occasionally 2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr 3ef6344d41 include/nav.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr fed6330ea6 include/api.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 19fea9c2ce poller.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 7ed1e3f177 acl_selectors.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 03834b2433 text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future) 2012-02-20 19:38:42 -03:00
Abinoam P. Marques Jr 0bca36109a Scrape.php - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
Michael e2f276881e Some testing stuff 2012-02-20 11:15:22 +01:00
friendica 15e9933ddf include item links in web notification messages 2012-02-19 20:27:32 -08:00
Michael 0fb22e1284 API is now working on my nginx server. 2012-02-20 01:53:22 +01:00
root b6d7777226 New version of markdown. Playing with stylesheet. Testing line breaks. 2012-02-19 22:47:32 +01:00
Michael 064c843119 Handling nested bbcodes. Some small design changes in html2bbcode. Change in poller.php is just for testing purposes. 2012-02-19 21:07:45 +01:00
Michael 31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
Simon L'nu 49179f9033 add :headdesk and fix doc/Pages.md to remove the absolute URL to /
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-02-19 05:17:26 -05:00
friendica 5734d5f357 change notify messages for web 2012-02-18 03:18:20 -08:00
friendica 1b9c03f6fc new notifications - implement storage 2012-02-18 02:57:42 -08:00
friendica 4222f506a8 deprecating two-char smilies 2012-02-17 23:44:25 -08:00
Fabio Comuni 7bd43613fa oembed: revert changes from 48f5bd492d 2012-02-17 15:34:05 +01:00
friendica 48f5bd492d naked link with no protocol being passed from Diaspora 2012-02-16 23:14:36 -08:00
friendica 2abbd81ce1 a few fixes for offsite community members 2012-02-16 18:29:09 -08:00
friendica 7dcef67492 facepalm smiley 2012-02-16 15:15:28 -08:00
friendica 1b445d511b another sql typo 2012-02-16 00:08:38 -08:00
friendica ada2a555dc sql typo in auto-friend with D* 2012-02-15 23:58:28 -08:00
friendica b1d31aca51 quick comments 2012-02-15 18:13:41 -08:00
friendica d054426101 encode email headers on message deliveries 2012-02-15 15:28:32 -08:00
fabrixxm 16f00cb73b Merge pull request #36 from fabrixxm/master
Missing icons in 'quattro' and ajax events calendar
2012-02-15 03:51:44 -08:00
Fabio Comuni fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +01:00
friendica 03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica f865939653 localise links to private photos inside messages 2012-02-14 18:07:13 -08:00
friendica 134fdda75f refactor smilie code to allow for extensions and generation of a table of the entire list 2012-02-14 15:31:08 -08:00
Vasudev Kamath e4b1c07727 cry, foot in mouth, cool, undecided and embarassed smiley's are mapped 2012-02-14 23:10:11 +05:30
friendica 803a7425ea make hr bbtag shareable, stray quote in duepuntozero wall_item 2012-02-13 18:40:28 -08:00
friendica 23f5abfa1f Merge branch 'pull' 2012-02-13 14:17:20 -08:00
friendica dc4420c5ec hr bbcode tag 2012-02-13 14:16:51 -08:00
Fabio Comuni 850560519a Merge remote-tracking branch 'friendica/master' into mobile 2012-02-13 09:46:42 +01:00
friendica 85c831bcbf finish translation of 'xxxxx wrote:' 2012-02-12 20:56:44 -08:00
Abinoam P. Marques Jr 9697e82331 Merge branch 'master' into bbcode 2012-02-12 18:56:53 -08:00
Abinoam P. Marques Jr 135005571f Added [th] bbcode tag support. 2012-02-12 17:27:08 -08:00
friendica 3e85c1d330 make 'x minutes ago' fully translateable with argument ordering. string update. 2012-02-12 17:15:09 -08:00
Abinoam P. Marques Jr e575a3a02c Fixed bbcode [li] and [*] handling. 2012-02-12 17:10:06 -08:00
Abinoam P. Marques Jr 10e66d293d Added [quote=Name] bbcode support. 2012-02-12 16:18:58 -08:00
Abinoam P. Marques Jr 3a07973ffa Added [center] bbcode support. 2012-02-12 15:51:17 -08:00
Abinoam P. Marques Jr 74b529bda2 BBCode [size=50] --> font-size: 50px (with the unit px).
This [size=number] without unit is kind of a standard.
It was being rendered like "font-size: 50" and that's not valid CSS style.
2012-02-12 14:59:07 -08:00
Abinoam P. Marques Jr 92a585ed23 Added support to [noparse], [nobb] and [pre] as bbcode escape tags. 2012-02-12 14:35:29 -08:00
friendica 330a876d81 bug #281 2012-02-12 14:18:32 -08:00
Abinoam P. Marques Jr 6a17a3a8e2 Added support for [ol] standard ordered list bbcode. 2012-02-12 12:00:23 -08:00
Abinoam P. Marques Jr 5479142efc Added support for [ul] standard unordered list bbcode. 2012-02-12 11:59:51 -08:00
Abinoam P. Marques Jr 5107ee52d3 Regexp fix for [LIST=i], [list=i], [LIST=I] and [LIST=i] bbcodes 2012-02-12 06:13:49 -08:00
Vasudev Kamath 495d0fb80f Merge branch 'master' of git://github.com/friendica/friendica 2012-02-12 15:06:41 +05:30
Vasudev Kamath cbf53beec1 ;) :D and :-O are also enabled for wink laugh and surprised smiley's 2012-02-12 15:06:12 +05:30
friendica 8b101c6cb8 do not display contact_block if config for num shown is 0 2012-02-11 23:49:05 -08:00
friendica bb19c8ba4e kissing smilie may need escaping (thanks - Abinoam) 2012-02-11 21:46:48 -08:00
friendica 75a62db9c5 show tags (pub_keywords) in advanced profile 2012-02-11 01:24:29 -08:00
friendica d79c3351ea db installation sync 2012-02-10 13:43:35 -08:00
Fabio Comuni ed38808aae hidden jot in "display" to allow reshare 2012-02-10 17:30:22 +01:00
friendica b346f4464c send notify emails to community pages as well as people 2012-02-10 00:08:23 -08:00
friendica 2f2e331c33 bug #274 2012-02-09 22:44:59 -08:00
friendica ffe7d8b1e9 item tag notifications 2012-02-09 21:18:50 -08:00
friendica 5859f9dcf6 add render_location hook to both sets of conversations 2012-02-09 18:09:28 -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 ec26f88be9 render_location hook 2012-02-09 15:02:59 -08:00
friendica 171249966e add tag notifications to enotify 2012-02-09 14:06:17 -08:00
friendica c506bb42a9 :coffee extended smilie 2012-02-07 17:03:09 -08:00
friendica 8a3c1f7930 beer smilie 2012-02-07 15:41:06 -08:00
friendica a869bd2fe5 don't link tags enclosed inside Diaspora links 2012-02-07 02:16:28 -08:00
friendica 2b77002471 basic support for plaintext editor configuration (disable tinymce), currently only zero themes - and not all the post tools currently work (as some of them emit html). 2012-02-06 20:28:50 -08:00
friendica 3d099bd99a beer 2012-02-06 01:08:00 -08:00
friendica 4cf6bd5469 do an optimise after an expunge 2012-02-02 18:02:08 -08:00
friendica 9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica 86c0eac27d transport for email contacts phase II 2012-01-31 20:03:46 -08:00
friendica 4993f4f1d6 allow plugin to abort message posting, fix half-duplex D* relationship 2012-01-30 20:49:54 -08:00
friendica c76b224d8a prune old expired and deleted items 2012-01-30 15:13:24 -08:00
friendica d54042dd38 mime_content_type requires access to the file, not just the name 2012-01-28 12:09:17 -08:00
friendica 5161be67e9 logging of manage identities 2012-01-27 12:56:36 -08:00
friendica 94b9e9ce6d for people whose DB's are not updating 2012-01-26 23:08:51 -08:00