| 
								
								
									 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 |  | 
				
					
						| 
								
								
									 friendica | 3197a6e8aa | fix some changes lost from another branch | 2012-01-26 23:03:27 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 8fe5168259 | restore diaspora test mode | 2012-01-26 20:46:42 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 167ab537b5 | backend for delegating forums | 2012-01-26 16:52:12 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 10f768630b | D* event formatting | 2012-01-25 15:16:43 -08:00 |  | 
				
					
						| 
								
								
									 friendica | e2d0eb4a88 | redirect to a useful location after deleting or ignoring a friend request, begin comment moderation logic | 2012-01-24 18:59:55 -08:00 |  | 
				
					
						| 
								
								
									 friendica | dae0c1ded2 | more robust cache api handling (was throwing errors on occasion) | 2012-01-24 17:04:49 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 8ff2bb4cd3 | backtrace errant input to base64url_decode | 2012-01-24 16:45:58 -08:00 |  | 
				
					
						| 
								
								
									 friendica | 3a1a4d62d9 | bug #254 | 2012-01-24 16:23:30 -08:00 |  | 
				
					
						| 
								
								
									 friendica | a76a497d92 | implement "moderate" flag on items | 2012-01-23 20:56:11 -08:00 |  |