Commit Graph

12 Commits

Author SHA1 Message Date
Vasudev Kamath ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Vasudev Kamath 8465ad6e1e Few more files with unnecessary executable permissions 2012-04-21 00:22:48 +05:30
tommy tomson f5f1956e8b diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes 2012-04-20 01:44:21 +02:00
tommy tomson f980b79edc new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator...
profile-picture is now scaled right in firefox...
fixed broken css on introductions-page in firefox...
2012-04-06 11:19:12 +02:00
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
tommy tomson 6dfd55668f diabook-themes: css-fixes 2012-04-02 20:30:27 +02:00
tommy tomson 0b41654935 bug-fixes in diabook-derivates 2012-03-31 11:09:57 +02:00
tommy tomson e52891d8ab fixes in diabook 2012-03-05 03:08:58 +01:00
tommy tomson e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
tommy tomson b3ba2eb4d0 fix editor 2012-03-03 15:01:25 +01:00
tommy tomson 60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00