Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	c8f99a8a66
						 | 
						
							
							
								
								
								Merge remote branch 'upstream/master'
							
							
							
							
							
						 | 
						
							2012-07-18 21:03:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	749ae9b297
						 | 
						
							
							
								
								
								filter the protocol specifier in bbcode links.
							
							
							
							
							
						 | 
						
							2012-07-17 18:33:04 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	4e9086f9b0
						 | 
						
							
							
								
								
								Changes in the bbcode to markdown converter to make it more compatible with Diaspora
							
							
							
							
							
						 | 
						
							2012-07-15 12:47:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8d7d46ae7a
						 | 
						
							
							
								
								
								Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work
							
							
							
							
							
						 | 
						
							2012-07-14 19:54:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	bfca7f47ef
						 | 
						
							
							
								
								
								Merge remote branch 'upstream/master'
							
							
							
							
							
							
							
							Conflicts:
	include/bb2diaspora.php 
							
						 | 
						
							2012-07-13 23:39:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	db2f0f7919
						 | 
						
							
							
								
								
								Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet
							
							
							
							
							
							
							
							Bugfix: BBCode: Fixed charset problems. 
							
						 | 
						
							2012-07-08 18:27:11 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	da2ccebed8
						 | 
						
							
							
								
								
								fix bugs
							
							
							
							
							
						 | 
						
							2012-07-07 18:50:33 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	173b3a1b9a
						 | 
						
							
							
								
								
								allow more than one embedded private photo
							
							
							
							
							
						 | 
						
							2012-07-07 16:24:20 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	dafc84390d
						 | 
						
							
							
								
								
								Improvments of the HTML to make a better bb2markdown conversion (nested lists, youtube, vimeo, ...)
							
							
							
							
							
						 | 
						
							2012-07-05 23:36:00 +02: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
								
							 
						 | 
						
							
							
								
							
							
	5589bca1e0
						 | 
						
							
							
								
								
								fix !@#$ tinymce linebreaks for the thousandth time
							
							
							
							
							
						 | 
						
							2012-07-04 17:15:43 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	ced0a208d8
						 | 
						
							
							
								
								
								fix double lines
							
							
							
							
							
						 | 
						
							2012-07-02 16:34:01 -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
								
							 
						 | 
						
							
							
								
							
							
	a4b407eb54
						 | 
						
							
							
								
								
								stray s
							
							
							
							
							
						 | 
						
							2012-06-25 22:01:32 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	0f0ffce1b6
						 | 
						
							
							
								
								
								change required doco
							
							
							
							
							
						 | 
						
							2012-06-25 21:27:34 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	359a98cd22
						 | 
						
							
							
								
								
								change event behaviour so that title is required but description is not
							
							
							
							
							
						 | 
						
							2012-06-25 21:20:08 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	fbaca4b742
						 | 
						
							
							
								
								
								event summary/title
							
							
							
							
							
						 | 
						
							2012-06-25 20:55:27 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	fad2679c7e
						 | 
						
							
							
								
								
								Merge https://github.com/friendica/friendica into pull
							
							
							
							
							
							
							
							Conflicts:
	include/bbcode.php 
							
						 | 
						
							2012-06-25 16:05:42 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b044cd922d
						 | 
						
							
							
								
								
								typos in bbcode, add service class restrictions to jot uploads
							
							
							
							
							
						 | 
						
							2012-06-25 16:03:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Simon L'nu
								
							 
						 | 
						
							
							
								
							
							
	939ebe16f8
						 | 
						
							
							
								
								
								fix typo and syntax error
							
							
							
							
							
							
							
							Signed-off-by: Simon L'nu <simon.lnu@gmail.com> 
							
						 | 
						
							2012-06-25 18:49:36 -04:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	4293de7554
						 | 
						
							
							
								
								
								allow nested [ol] and [ul] lists too
							
							
							
							
							
						 | 
						
							2012-06-25 08:26:00 -06:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	cc56f33b80
						 | 
						
							
							
								
								
								New option in the bbcode parser to disable oembed.
							
							
							
							
							
						 | 
						
							2012-06-18 01:29:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	4978ee12d1
						 | 
						
							
							
								
								
								webfinger profile linker
							
							
							
							
							
						 | 
						
							2012-06-02 18:05:23 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Thomas Willingham
								
							 
						 | 
						
							
							
								
							
							
	7a5c85f628
						 | 
						
							
							
								
								
								[quote=somebody] was appearing as an extended spoiler tag.
							
							
							
							
							
						 | 
						
							2012-06-01 23:31:07 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	e9e4fb664a
						 | 
						
							
							
								
								
								allow bbcode representation of html symbols such as © by wrapping in bb brackets
							
							
							
							
							
						 | 
						
							2012-04-23 05:42:46 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	59b45f7fc1
						 | 
						
							
							
								
								
								Several improvements
							
							
							
							
							
						 | 
						
							2012-03-31 16:28:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	f5db142d93
						 | 
						
							
							
								
								
								Quotes with author are now having an "open/close" link
							
							
							
							
							
						 | 
						
							2012-03-17 12:15:59 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Michael Vogel
								
							 
						 | 
						
							
							
								
							
							
	8a1f175df0
						 | 
						
							
							
								
								
								New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements
							
							
							
							
							
						 | 
						
							2012-03-17 11:07:49 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	5915325367
						 | 
						
							
							
								
								
								bug #328
							
							
							
							
							
						 | 
						
							2012-03-10 18:52:50 -08: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	3c6b127d40
						 | 
						
							
							
								
								
								nested quote check fails to account for strpos returning position 0
							
							
							
							
							
						 | 
						
							2012-02-22 20:58:04 -08: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	03171fd7de
						 | 
						
							
							
								
								
								preliminary qcomment support, [nosmile] tag to disable smiley processing
							
							
							
							
							
						 | 
						
							2012-02-14 23:13:18 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	dc4420c5ec
						 | 
						
							
							
								
								
								hr bbcode tag
							
							
							
							
							
						 | 
						
							2012-02-13 14:16:51 -08: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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |