Commit graph

135 commits

Author SHA1 Message Date
friendica
6ad9d9f845 sort out some of the bb2d madness 2014-09-03 22:00:18 -07:00
friendica
96a9378fd7 this is turning into a wretched mess. It's going to get worse before it gets better, but I'm trying to do this incrementally so I don't break the whole shebang for a few days. It will get better once all the bbcode translation is done in a single place (cross fingers), and we can just sign the post once when we submit it and be done with it. If Diaspora ever implements editing of existing posts we'll have to go back and do the whole wretched mess over again. 2014-09-03 21:14:24 -07:00
friendica
2c94d59cba use feed title for channel name before checking author, make feed items shareable (they're private to the channel so they won't be shown in searches), try and handle Diaspora mentions a bit more elegantly. (Bug: we don't convert mentions to Diaspora's format on outbound at all!) 2014-09-02 17:21:12 -07:00
friendica
bd75b68a7c shield share meta info from markdown processing. 2014-07-16 17:39:40 -07:00
friendica
c037a5083c optionally allow zrl usage from specific markdown sources 2014-07-01 18:38:44 -07:00
friendica
fc69220b94 easter egg 2014-07-01 18:21:22 -07:00
friendica
6e2208394a add zrl stuff - still a lot of new stuff missing but I'm not going to do it all. 2014-06-04 16:09:34 -07:00
friendica
ea3940c4b0 start formatting for Doxygen 2013-02-25 17:09:40 -08:00
friendica
a7abe24382 more file cleanup 2012-10-22 19:46:18 -07:00
friendica
e80d69d25b merge upstream 2012-08-11 18:54:23 -07:00
friendica
c673c70c25 updates 2012-08-05 21:41:58 -07:00
friendica
d92a4a686d eliminate the obsolete "last-child" indicator 2012-07-18 17:08:03 -07:00
friendica
a20a637727 merge upstream, slider work, refactor ping module, language selection work 2012-07-13 07:09:29 -07:00
Zach Prezkuta
4fb996d9f7 remove check for event description, since it's not required to create an event 2012-07-06 17:11:25 -06:00
Zach Prezkuta
47c7fd89ba my php thinks this is a typo 2012-07-05 20:39:22 -06:00
Zach Prezkuta
041aeaf4a1 fix small bug in lists and revert Diaspora list processing to non-Markdownify version 2012-07-05 12:54:52 -06:00
friendica
360c35e438 recycle symbol woes with multiple html entity encode/decode cycles going on 2012-07-04 23:24:59 -07:00
friendica
0990269555 restore translation of bbcode videos, events, bookmarks, etc. to diaspora 2012-07-04 19:12:09 -07:00
friendica
315784444a try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up to harder stuff 2012-07-02 01:11:19 -07:00
Zach Prezkuta
cd9ce0ecb3 fix logic for nested lists--should be OR, not AND 2012-06-27 21:21:26 -06:00
friendica
b044cd922d typos in bbcode, add service class restrictions to jot uploads 2012-06-25 16:03:46 -07:00
Zach Prezkuta
4293de7554 allow nested [ol] and [ul] lists too 2012-06-25 08:26:00 -06:00
Zach Prezkuta
5d2eed3517 allow bare URLS to make it through to Diaspora 2012-06-23 22:02:08 -06:00
Zach Prezkuta
1f96839674 small optimization 2012-06-23 20:01:29 -06:00
Zach Prezkuta
4ef33ac6eb fix BB-to-Diaspora list formatting 2012-06-23 19:57:59 -06:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Zach Prezkuta
9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06:00
Michael Vogel
cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Michael Vogel
3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica
08941d4285 handle multiple underscores in D* links 2012-05-26 23:46:42 -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
friendica
2c7da5d0de scale external images 2012-02-25 14:22:51 -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
Michael
e2f276881e Some testing stuff 2012-02-20 11:15:22 +01: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
31653aef64 Brand new html2bbcode. Some other changes in diaspora to bbcode handling 2012-02-19 20:36:59 +01:00
friendica
03171fd7de preliminary qcomment support, [nosmile] tag to disable smiley processing 2012-02-14 23:13:18 -08:00
friendica
9fc36d3da4 improvements in d* markdown conversion 2012-02-01 17:09:53 -08:00
friendica
3197a6e8aa fix some changes lost from another branch 2012-01-26 23:03:27 -08:00
friendica
10f768630b D* event formatting 2012-01-25 15:16:43 -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
aa1c28cf39 fine tuning diaspora markdown to bbcode 2012-01-11 22:49:17 -08:00
friendica
c5f41d8b6c fix D* links+text smushed together 2012-01-11 14:03:27 -08:00
friendica
a13156c0f3 bypass D* markdown bug for now 2012-01-09 18:52:49 -08:00
friendica
3bdcb52471 markdown bug is Diaspora's. We can't fix it. 2012-01-08 17:20:03 -08:00
friendica
977a49ad93 fix images with links going to diaspora, the D* markdown processor changed and these are no longer working. 2012-01-08 00:57:36 -08:00
friendica
7fbfbdae07 audio/video bb tags showing up on Diaspora 2011-12-20 17:01:41 -08:00
friendica
8f381e01ae html_entity_decode D* incoming text 2011-11-30 03:22:01 -08:00
friendica
973620a9e6 translate vimeo and youtube bbcode to naked links so D* will oembed them again 2011-11-13 19:32:05 -08:00
friendica
ce7a3615b5 d* - remove dupe bbcode code tags 2011-11-13 19:04:59 -08:00
Friendika
20ca93191f cleanup and loose ends 2011-11-08 16:54:32 -08:00
Friendika
02a1fdacd7 strip duplicate code blocks bb2d* 2011-11-08 15:38:06 -08:00
Friendika
9fabdbf2c9 D* scaled images not containing link to original size 2011-11-07 20:41:12 -08:00
Friendika
05eca449c8 bookmarks not getting translated to D* 2011-11-01 02:17:36 -07:00
Friendika
b025981858 yet more diaspora images to scale 2011-10-28 16:13:54 -07:00
Friendika
2914ffb396 log scale_diaspora_image 2011-10-28 04:35:10 -07:00
Friendika
e5992003e8 better handling of remote urls - especially FB opengraph 2011-10-28 02:50:00 -07:00
Friendika
e5a7b3e24b add contact-id to auto-complete response to resolve duplicates 2011-10-27 19:12:30 -07:00
Friendika
72d74b88be some dspr fixes 2011-10-25 19:59:57 -07:00
Friendika
318f179408 D* formatting updates [code/blockquote] 2011-10-24 21:29:57 -07:00
Friendika
6eea312c21 workaround for transmitting photos to D* 2011-10-23 16:01:04 -07:00
Friendika
9043e704f8 diaspora reshares 2011-10-18 15:56:35 -07: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
11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika
deeae7bdb5 diaspora markdown changes, parse_url format change 2011-09-20 15:23:36 -07:00
Friendika
cdf2fe859f don't escape underscore within links going to diaspora 2011-09-14 21:35:13 -07:00
Friendika
e921b97a7f bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings 2011-09-05 18:34:30 -07:00
Friendika
1d01b3a088 Merge branch 'pull' 2011-09-04 00:51:42 -07:00
Friendika
9ff1a3444e add timezone convert module, several other minor or in progress fixes 2011-09-04 00:48:45 -07:00
Friendika
c0a2cc3e98 diaspora has no timezone - use UTC for events 2011-09-03 07:40:05 -07:00
Friendika
59a6a04e26 format events for diaspora 2011-09-03 07:13:12 -07:00
Friendika
93b9d71377 completely enclose ~f hashtags so they don't get hijacked by D* 2011-09-02 05:13:38 -07:00
Friendika
c60d45752d translate D* images (markdown) before links, they overlap and conflict 2011-08-30 23:24:45 -07:00
Friendika
b11a0efff1 This *might* fix Diaspora @ tags - or it might not. 2011-08-30 20:20:17 -07:00
Friendika
f8da48a880 unsafe chars in admin, add img to diaspora markdown processor 2011-08-30 18:46:34 -07:00
Friendika
21c03fb522 diaspora2bb, salmon fix argument error 2011-08-25 16:37:27 -07:00
Friendika
c1acea330c photo fixes 2011-08-23 18:50:18 -07:00
Friendika
92504b5df7 more testing with images 2011-08-23 01:55:46 -07:00
Friendika
c55d24b451 second try 2011-08-23 01:52:59 -07:00
Friendika
124881903e forget about the image link we have it in the wrapper 2011-08-23 01:51:37 -07:00
Friendika
508f22f859 photos a bit messed up on d* 2011-08-23 01:47:42 -07:00
Friendika
c1a1b2ab60 updates bb2md 2011-08-23 01:33:58 -07:00
Friendika
561051e805 convert bbcode to markdown for diaspora (first try, will need tweaking) 2011-08-23 01:00:29 -07:00