Commit graph

12 commits

Author SHA1 Message Date
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 965e657c20 $name appearing on testbubble items 2012-03-05 03:10:45 -08:00
Simon L'nu 81de5f7802 apply changes to templates to testbubble
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 13:59:28 -05:00
friendica bcad629633 more stray quotes 2012-02-13 18:40:56 -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
Fabio Comuni 962467ee68 item tags as array to templates 2011-11-15 17:41:38 +01:00
Friendika c66b886d7e shared tags for testbubble, prevent tag hijacking of shared tag activities 2011-11-10 17:11:55 -08:00
Devlon Duthie 0881c04cea classes added to core + testbubble theme
some fixes to testbubble theme related to tab styling
2011-09-29 01:20:39 -05:00
Fabio Comuni 68a6bfdee5 Items lock icon 2011-09-28 09:43:31 +02:00
Fabio Comuni e986fc3e30 quattro: actions in wall_item
less html in conversation.php
removed unused tpls
fixed old themes
2011-09-27 16:54:33 +02:00
Fabio Comuni 968e7bb3b1 Fixes for testbubble 2011-09-26 11:48:02 +02:00
Devlon Duthie 634e52a671 added testbubble mai, and modified some core fle to add classes 2011-09-24 23:54:23 -05:00