9002 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
tobiasd	34ac72cffd	Merge pull request #32 from copyninja/master ... Mapped ;) :D and :-O smileys	2012-02-12 01:42:43 -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	4cfb1fe0cf	refresh contact record after setting change	2012-02-11 23:17:55 -08:00
friendica	bb19c8ba4e	kissing smilie may need escaping (thanks - Abinoam)	2012-02-11 21:46:48 -08:00
friendica	d856ae1fa5	bug #279, add network selector widget to contacts page	2012-02-11 21:39:51 -08:00
friendica	0c4606682f	fix link/bookmark reshares	2012-02-11 19:21:41 -08:00
friendica	da946bb9b0	bug #278 show only blocked contacts	2012-02-11 03:07:15 -08:00
friendica	1d5f1723e0	Merge branch 'pull'	2012-02-11 01:25:21 -08:00
friendica	75a62db9c5	show tags (pub_keywords) in advanced profile	2012-02-11 01:24:29 -08:00
Tobias Diekershoff	857f21eb32	fpostit by Devlon Duthied added to utils	2012-02-11 10:03:14 +01:00
Abinoam P. Marques Jr	2984b8d5d2	bug #270 - solved	2012-02-10 14:03:43 -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
Fabio Comuni	8480550144	quattro: add "view in context" link in search results	2012-02-10 17:29:37 +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	e242a391b9	Merge branch 'pull'	2012-02-09 16:03:30 -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	795e02aa14	bug #273 - no $baseurl variable expansion in install template	2012-02-09 15:13:34 -08:00
Keith Fernie	14ba3998ac	Merge pull request #30 from Keith2/master ... Adds a custom YourLS url shortener to slinky.php	2012-02-09 15:08:53 -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
Keith Fernie	2c9cfb1fe9	modified: library/slinky.php Set up tabs in code correctly.	2012-02-09 21:44:52 +00:00
Keith Fernie	955022e7dc	modified: library/slinky.php Added a custom YourLS shortener to the available shorteners	2012-02-09 20:45:38 +00:00
friendica	f73b6ed7a1	Merge branch 'pull'	2012-02-08 23:31:35 -08:00
Abinoam P. Marques Jr	1c8680d9f9	Install note about PHP path.	2012-02-08 22:01:42 -08:00
friendica	11517a027b	if removing a contact after viewing the third page of contacts, go back to page 3	2012-02-08 21:15:26 -08:00
friendica	03435853b3	fix apps sub-menu on quattro and vier	2012-02-08 18:12:26 -08:00
friendica	1f3b608af2	Merge branch 'pull'	2012-02-08 17:56:55 -08:00
friendica	b0ee8dd409	begin cmin, cmax	2012-02-08 17:56:23 -08:00
Tobias Diekershoff	d8157f73ef	quattro: added delete button to mail list overview	2012-02-08 22:29:38 +01:00
Tobias Diekershoff	ca8a25172e	quattro: added delete buttons to groups and contacts	2012-02-08 22:13:36 +01:00
Tobias Diekershoff	72c30deb64	quattro: group member selection styling	2012-02-08 20:47:52 +01:00
Tobias Diekershoff	9436a9d84b	Merge branch 'master' of https://github.com/friendica/friendica	2012-02-08 19:11:11 +01:00