This repository has been archived on 2024-08-19. You can view files and clone it. You cannot open issues or pull requests or push a commit.

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

..

fpostit

Merge branch 'master' of https://github.com/friendica/friendica

2012-04-05 13:39:15 +02:00

comment_item.tpl

theme fixes; fix qcomment (finally)

2012-03-31 03:56:06 -04:00

communityhome.tpl

latest fixes for dispys. tweaking/repairing

2012-04-01 03:57:05 -04:00

connect.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

contact_template.tpl

commit latest to dispy-dark. fixes in html css and js

2012-03-15 15:07:17 -04:00

conversation.tpl

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

default.php

add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)

2012-03-28 05:52:28 -04:00

group_side.tpl

commit latest to dispy-dark. fixes in html css and js

2012-03-15 15:07:17 -04:00

head.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

icons.png

implement filer/file-as

2012-03-25 01:01:59 -04:00

icons.svg

implement filer/file-as

2012-03-25 01:01:59 -04:00

jot-header.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

jot.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

login-bg.gif

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

mail_head.tpl

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

menu-user-pin.jpg

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

nav.tpl

add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push)

2012-03-28 05:52:28 -04:00

nets.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

next.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

notifications.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

notifications.svg

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

photo_view.tpl

[fix] whitespace in photo_view and like_noshare. dispy-dark clean up

2012-03-17 01:55:40 -04:00

photo-menu.jpg

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

premium.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

prev.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

profile_vcard.tpl

latest fixes for dispys. tweaking/repairing

2012-04-01 03:57:05 -04:00

saved_searches_aside.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

screenshot.jpg

more fixes for dispys

2012-03-27 04:40:31 -04:00

search_item.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

star.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

style.css

finish styling category tags and category input

2012-04-05 00:04:23 -04:00

tag.png

preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP!

2012-03-11 01:32:11 -05:00

theme.php

latest fixes for dispys. tweaking/repairing

2012-04-01 03:57:05 -04:00

wall_item.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00

wallwall_item.tpl

update the dispy* templates

2012-04-04 23:35:07 -04:00