Commit Graph

18 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
Fabio Comuni 51d419e159 themes: use duepuntozero tpls as default 2012-03-26 09:09:14 +02:00
Fabio Comuni a26ce7c56b show relation in contact_template 2012-03-01 11:31:16 +01:00
Fabio Comuni 42d591d257 revert 01a2791e3a to avoid random preg internal errors. fix contact_template 2012-02-27 18:48:59 +01:00
Fabio Comuni cbc60d525e quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside.
remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts
2012-02-23 11:22:32 +01: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 0828ab353f fix git horkage 2012-01-08 05:16:55 -08:00
Fabio Comuni 2ef2d0b79f quattro: contacts and first photo page 2011-12-22 16:33:14 +01: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
Friendika 71fc694c67 contact photo menu 2011-08-24 23:20:04 -07:00
Friendika 74d61ed00b contact menu beginnings 2011-08-24 22:40:26 -07:00
fabrixxm daa7dc983b Icons as CSS classes, hide net/home/mail/notify-update divs with no value 2011-04-28 19:01:35 +02:00
Mike Macgirvin 01d36785b0 fixed photo comments, msg typo, and changed cursor when hovering
over "special friends" where SSO is allowed
2010-09-27 19:48:45 -07:00
Mike Macgirvin 8aeb1976b8 contact-edit cleanup 2010-07-28 20:16:45 -07:00
Mike Macgirvin a42c9616f9 contact editor 2010-07-10 23:03:54 -07:00
Mike Macgirvin 1ea69ae275 bizzy 2010-07-06 05:07:28 -07:00
Mike Macgirvin 9bd8ee1aae more work on contact page and added new site directory 2010-07-02 18:37:43 -07:00
Mike Macgirvin 6348e70daa Initial checkin 2010-07-01 16:48:07 -07:00