Commit graph

29 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
tommy tomson
aa26517cdc add a searchbox to "find friends" for global search 2012-03-28 23:07:34 +02:00
tommy tomson
211d00a1f5 fixes in diabook 2012-03-27 23:27:43 +02:00
tommy tomson
31fbc3fde3 provide a close-option for boxes in right_aside and store info via js and cookies 2012-03-27 19:02:07 +02:00
tommy tomson
e7bc3f2bd0 add "find friends" to right_aside to diabook, fixes in css in diabook 2012-03-27 08:28:47 +02:00
tommy tomson
876aa0c752 small fix in diabook :: add local friendica to right_aside 2012-03-26 10:33:28 +02:00
tommy tomson
378762fed2 add connectable services to right_aside 2012-03-24 06:17:14 +01:00
tommy tomson
e37c4f69b4 add file_as-option to diabook-derivates 2012-03-22 06:54:18 +01:00
tommy tomson
72d0756fa6 add icons to aside diabook, fixes in css 2012-03-22 04:33:21 +01:00
tommy tomson
6dbee45d92 add links to wall, photos, events, etc to aside on networkpage, fixes in css 2012-03-15 08:29:39 +01:00
tommy tomson
9436175746 add lightbox, fixex in css 2012-03-12 21:09:16 +01:00
tommy tomson
0f3255467e fixed login-fields, fixed. notofication.png, changed locations 2012-03-10 13:22:41 +01:00
tommy tomson
8fe4645a5d add js to hide nav-menus, when clicked outside 2012-03-09 18:15:27 +01:00
tommy tomson
feda3cfc96 fixed star-bug 2012-03-09 02:59:13 +01:00
tommy tomson
1fcbc7aa5a add links to /profiles, add some icons to diabook/icons, fixes in css 2012-03-08 14:49:07 +01:00
tommy tomson
ec3ce05357 fix in navbar 2012-03-07 08:42:19 +01:00
tommy tomson
6a5c4bab9c messages-menu translation, add scroll-to-top and theme-bug-report in theme 2012-03-07 00:07:27 +01:00
tommy tomson
b64b1d13a4 fixes in diabook 2012-03-06 08:27:20 +01:00
tommy tomson
a406c16581 fixes 2012-03-05 22:31:03 +01:00
tommy tomson
fe614b4e7c like dislike button 2012-03-05 05:14:08 +01:00
tommy tomson
e0e0224fa6 some fixes in diabook 2012-03-04 05:48:06 +01:00
tommy tomson
173fb983c5 navbar fix 2012-03-03 23:12:03 +01:00
tommy tomson
d4ac1f2a9c fixed star/unstar 2012-03-03 19:07:55 +01:00
tommy tomson
83e9f57459 fixed admin
fixed editor
2012-03-03 16:49:48 +01:00
tommy tomson
60adef2463 fix text-editor in theme 2012-03-03 13:27:39 +01:00
tommy tomson
89f667ff76 fix star/unstar 2012-03-03 04:45:34 +01:00
tommy tomson
d138d07c05 fixes in wall_item.tpl and style.css in theme diabook 2012-03-03 04:27:06 +01:00
tommy tomson
8f72d95b0e fix in wall_item.tpl
new icon link.png
2012-03-03 01:52:53 +01:00
tommy tomson
c26787ab94 adjust2 2012-03-02 17:18:11 +01:00