| 
							
							
								 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 |  |