Commit Graph

13 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
Simon L'nu 9c698b1a60 fix for comment-wwedit-wrapper CSS class in tpl had a stray $
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-03-02 12:00:16 -05:00
Fabio Comuni fe3e8ee854 quattro: icons for attachments 2012-02-15 11:10:02 +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
Fabio Comuni 84bbf5d3bd icons: lock and unlock 2011-12-19 18:00:52 +01:00
Fabio Comuni 00c342e13d Merge branch 'oauthapi' 2011-11-07 17:41:23 +01:00
Fabio Comuni 967f8b575e New icon 'plugin' 2011-11-07 17:34:47 +01:00
Fabio Comuni 718a9009be new icon "play" 2011-10-24 17:27:38 +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 80af4f3fe6 new icons 2011-09-16 12:50:15 +02:00
Fabio Comuni abd65e00ab Load infos and notices via ping and show them with js popup 2011-09-05 14:01:21 +02:00
Fabio Comuni c308ac49af More icons 2011-09-05 11:13:42 +02:00
Fabio Comuni 93eda9d9c1 Initial work on new UI 2011-07-22 17:37:51 +02:00