friendica
51bee79b21
Merge https://github.com/friendica/friendica into pull
...
Conflicts:
view/theme/smoothly/follow.tpl
2012-09-19 15:39:19 -07:00
friendica
09a00a9a07
html tag completed early
2012-09-19 15:34:21 -07:00
pixelroot
31064a15ec
modified: view/theme/smoothly/theme.php
2012-09-19 16:16:58 +02:00
pixelroot
a4f25f6eaa
modified: view/theme/smoothly/style.css
2012-09-19 16:14:45 +02:00
pixelroot
05a61b80e2
modified: view/theme/smoothly/follow.tpl
...
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
modified: view/theme/smoothly/wall_item.tpl
modified: view/theme/smoothly/wall_thread.tpl
modified: view/theme/smoothly/wallwall_item.tpl
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-19 15:53:37 +02:00
Thomas Willingham
96d6d6b988
Pull request #487
2012-09-18 16:15:36 +01:00
Alex
61eb884a20
Update view/theme/smoothly/bottom.tpl
2012-09-18 13:13:05 +03:00
Thomas Willingham
e34b8e6d46
Pull request #484 (Smoothly)
2012-09-17 18:37:44 +01:00
Thomas Willingham
9cabcad36c
Add title bar notifications to Smoothly
2012-09-17 14:53:17 +01:00
Alex
f558a1fe8d
Merge pull request #482 from pixelroot/master
...
bug fix
2012-09-17 05:12:53 -07:00
pixelroot
ede6b4ad12
modified: view/theme/smoothly/style.css
2012-09-17 14:16:13 +02:00
pixelroot
176fe0351a
new file: view/theme/smoothly/shiny.png
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-17 13:49:09 +02:00
Alex
01daaafc92
Merge pull request #481 from pixelroot/master
...
Better mark new posts
2012-09-17 04:46:00 -07:00
pixelroot
cd3938dfda
new file: view/theme/smoothly/default.php
...
new file: view/theme/smoothly/footer.tpl
new file: view/theme/smoothly/header.tpl
modified: view/theme/smoothly/nav.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
2012-09-17 11:22:12 +02:00
Alex
06c9330c5e
Merge pull request #480 from pixelroot/master
...
Bug fixes
2012-09-17 02:20:07 -07:00
friendica
2abbd1dc19
permissions selector showing up for guests, testbubble and smoothly
2012-09-15 20:21:17 -07:00
pixelroot
816680ca85
new file: view/theme/smoothly/bottom.tpl
...
new file: view/theme/smoothly/js/jquery.autogrow.textarea.js
new file: view/theme/smoothly/js/modernizr.custom.2.5.3.js
new file: view/theme/smoothly/js/modernizr.custom.2.5.3.min.js
2012-09-14 19:08:39 +02:00
pixelroot
3c846547f7
modified: view/theme/smoothly/style.css
2012-09-14 19:08:21 +02:00
pixelroot
6537a94b1a
new file: view/theme/smoothly/down.png
2012-09-14 17:55:27 +02:00
pixelroot
a300973084
modified: view/theme/smoothly/style.css
2012-09-14 17:55:17 +02:00
pixelroot
252e112ad5
modified: view/theme/smoothly/style.css
2012-09-14 12:46:32 +02:00
pixelroot
e78b86f534
modified: view/theme/smoothly/style.css
2012-09-14 11:57:13 +02:00
pixelroot
bdc5a3ab29
deleted: view/theme/smoothly/group_edit.tpl
2012-09-14 10:16:35 +02:00
pixelroot
d002573543
deleted: view/theme/smoothly/default.php
...
modified: view/theme/smoothly/nav.tpl
2012-09-14 09:55:54 +02:00
pixelroot
1c4bea295f
new file: view/theme/smoothly/default.php
2012-09-14 09:33:47 +02:00
pixelroot
d1984c4c64
modified: view/theme/smoothly/nav.tpl
...
modified: view/theme/smoothly/style.css
2012-09-14 09:33:21 +02:00
pixelroot
bff9c3d460
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
2012-09-14 08:50:10 +02:00
pixelroot
0cc661dd9c
modified: view/theme/smoothly/style.css
2012-09-13 16:50:55 +02:00
pixelroot
664680cdd8
modified: view/theme/smoothly/style.css
2012-09-13 16:30:12 +02:00
pixelroot
a1ed9c72c2
modified: view/theme/smoothly/star.png
...
modified: view/theme/smoothly/theme.php
2012-09-13 11:41:14 +02:00
pixelroot
2b9c2b2d1d
modified: view/theme/smoothly/style.css
2012-09-13 09:54:27 +02:00
pixelroot
931e1c6c66
modified: view/theme/smoothly/style.css
2012-09-13 09:48:02 +02:00
pixelroot
16e35d1787
new file: view/theme/smoothly/message_side.tpl
2012-09-13 09:35:12 +02:00
pixelroot
4ba7ce0308
modified: view/theme/smoothly/peoplefind.tpl
...
modified: view/theme/smoothly/style.css
2012-09-13 09:34:50 +02:00
pixelroot
864e2c03d9
modified: view/theme/smoothly/style.css
2012-09-12 17:25:44 +02:00
pixelroot
e3d20b51c8
modified: view/theme/smoothly/style.css
2012-09-12 16:27:31 +02:00
pixelroot
a3add1d851
modified: view/theme/smoothly/profile_vcard.tpl
...
modified: view/theme/smoothly/style.css
2012-09-12 16:20:44 +02:00
pixelroot
77aee41280
modified: view/theme/smoothly/style.css
2012-09-12 15:49:18 +02:00
pixelroot
a283d6844c
modified: view/theme/smoothly/theme.php
2012-09-12 14:44:42 +02:00
pixelroot
207451d82d
modified: view/theme/smoothly/style.css
2012-09-12 14:42:10 +02:00
pixelroot
5ae445b1ff
new file: view/theme/smoothly/generic_links_widget.tpl
...
modified: view/theme/smoothly/style.css
2012-09-11 15:23:49 +02:00
pixelroot
4cc4404752
new file: view/theme/smoothly/arrow.png
...
new file: view/theme/smoothly/categories_widget.tpl
modified: view/theme/smoothly/style.css
2012-09-11 14:02:36 +02:00
pixelroot
30a9db78f5
modified: view/theme/smoothly/style.css
2012-09-11 11:25:01 +02:00
pixelroot
5f7f1fb7b1
modified: view/theme/smoothly/nav.tpl
...
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
new file: view/theme/smoothly/totop.png
2012-09-11 11:06:55 +02:00
pixelroot
9685ba3fbc
modified: view/theme/smoothly/style.css
2012-09-10 16:31:36 +02:00
pixelroot
ee20708f75
modified: view/theme/smoothly/style.css
2012-09-10 16:21:54 +02:00
pixelroot
b5dee575a8
modified: style.css
2012-09-10 15:38:44 +02:00
pixelroot
e51440ec98
modified: view/theme/smoothly/style.css
2012-09-10 15:19:43 +02:00
pixelroot
264f32db80
modified: view/theme/smoothly/style.css
2012-09-10 14:58:57 +02:00
pixelroot
aef0824cc8
modified: view/theme/smoothly/style.css
2012-09-10 14:52:47 +02:00
pixelroot
c059f92b5a
modified: view/theme/smoothly/style.css
2012-09-10 14:36:51 +02:00
pixelroot
7603e2de75
deleted: view/theme/smoothly/comment_item.tpl
...
deleted: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
2012-09-10 14:18:24 +02:00
pixelroot
e492664325
new file: view/theme/smoothly/follow.tpl
...
new file: view/theme/smoothly/peoplefind.tpl
modified: view/theme/smoothly/style.css
2012-09-10 12:30:34 +02:00
pixelroot
f96b91c254
modified: view/theme/smoothly/style.css
2012-09-10 11:01:43 +02:00
pixelroot
a04d0e6832
deleted: view/theme/smoothly/mobile
2012-09-08 09:26:13 +02:00
pixelroot
b6d310675b
deleted: view/theme/smoothly/icons/dot.png
...
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
2012-09-08 09:25:06 +02:00
pixelroot
393a91ea78
modified: view/theme/smoothly/comment_item.tpl
...
new file: view/theme/smoothly/dot.png
new file: view/theme/smoothly/moderated_comment.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
deleted: view/theme/smoothly/icons/dot.png
deleted: view/theme/smoothly/js/jquery.ae.image.resize.js
deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js
2012-09-08 09:24:37 +02:00
pixelroot
002168ebd9
new file: view/theme/smoothly/js/jquery.ae.image.resize.js
...
new file: view/theme/smoothly/js/jquery.ae.image.resize.min.js
modified: view/theme/smoothly/theme.php
2012-09-08 08:54:18 +02:00
pixelroot
c616b05a33
modified: view/theme/smoothly/jot.tpl
...
modified: view/theme/smoothly/style.css
2012-09-07 17:13:51 +02:00
pixelroot
9f7fbbdee3
modified: view/theme/smoothly/style.css
2012-09-07 16:32:20 +02:00
pixelroot
8685ca5a7f
new file: view/theme/smoothly/mobile
2012-09-07 10:10:25 +02:00
pixelroot
1157b627af
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/theme.php
view/theme/smoothly/mobile
2012-09-07 10:09:24 +02:00
pixelroot
6a46717e1a
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 16:25:16 +02:00
pixelroot
6ac28c97f1
modified: view/theme/smoothly/jot.tpl
...
modified: view/theme/smoothly/style.css
2012-09-06 15:50:02 +02:00
pixelroot
a6f7ff686c
modified: view/theme/smoothly/style.css
...
modified: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 14:15:38 +02:00
pixelroot
a888b59c42
modified: view/theme/smoothly/login.tpl
...
modified: view/theme/smoothly/style.css
2012-09-06 13:25:13 +02:00
pixelroot
5c91ca9687
new file: view/theme/smoothly/icons/dot.png
...
new file: view/theme/smoothly/lang_selector.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/style.css
new file: view/theme/smoothly/wall_thread.tpl
new file: view/theme/smoothly/wallwall_thread.tpl
2012-09-06 12:04:56 +02:00
pixelroot
0d9f6c89cc
modified: view/theme/smoothly/comment_item.tpl
...
modified: view/theme/smoothly/contact_template.tpl
modified: view/theme/smoothly/jot-header.tpl
modified: view/theme/smoothly/jot.tpl
modified: view/theme/smoothly/login.tpl
modified: view/theme/smoothly/photo_top.tpl
modified: view/theme/smoothly/profile_entry.tpl
modified: view/theme/smoothly/profile_vcard.tpl
modified: view/theme/smoothly/style.css
modified: view/theme/smoothly/theme.php
view/theme/smoothly/icons/
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
2012-09-06 11:17:17 +02:00
pixelroot
5e3076b5d2
view/theme/smoothly/icons/
...
view/theme/smoothly/lang_selector.tpl
view/theme/smoothly/wall_thread.tpl
view/theme/smoothly/wallwall_thread.tpl
2012-09-06 09:44:15 +02:00
pixelroot
92a9070e1e
view/theme/smoothly/lang_selector.tpl
2012-09-05 16:04:29 +02:00
pixelroot
e326e3e5d0
modified: view/theme/smoothly/style.css
2012-09-05 13:29:45 +02:00
pixelroot
89adfbeb80
deleted: view/theme/smoothly/back-gradient.jpg
...
modified: view/theme/smoothly/style.css
2012-09-05 10:28:15 +02:00
pixelroot
de9bcb5825
new file: view/theme/smoothly/login.tpl
2012-09-05 09:46:26 +02:00
pixelroot
2d37a18513
view/theme/smoothly/login.tpl
2012-09-05 09:42:52 +02:00
pixelroot
05dda2f226
new file: view/theme/smoothly/back-gradient.jpg
...
new file: view/theme/smoothly/calendar.png
new file: view/theme/smoothly/comment_item.tpl
new file: view/theme/smoothly/connect.png
new file: view/theme/smoothly/contact_template.tpl
new file: view/theme/smoothly/conversation.tpl
new file: view/theme/smoothly/group_drop.tpl
new file: view/theme/smoothly/group_edit.tpl
new file: view/theme/smoothly/group_side.tpl
new file: view/theme/smoothly/groups.png
new file: view/theme/smoothly/icons.png
new file: view/theme/smoothly/icons.svg
new file: view/theme/smoothly/jot-header.tpl
new file: view/theme/smoothly/jot.tpl
new file: view/theme/smoothly/lock.cur
new file: view/theme/smoothly/login-bg.gif
new file: view/theme/smoothly/lrarrow.gif
new file: view/theme/smoothly/mail_head.tpl
new file: view/theme/smoothly/match.tpl
new file: view/theme/smoothly/menu-user-pin.jpg
new file: view/theme/smoothly/menu-user-pin.png
new file: view/theme/smoothly/nav-bg.png
new file: view/theme/smoothly/nav.tpl
new file: view/theme/smoothly/nets.tpl
new file: view/theme/smoothly/next.png
new file: view/theme/smoothly/notifications.png
new file: view/theme/smoothly/photo-menu.jpg
new file: view/theme/smoothly/photo_album.tpl
new file: view/theme/smoothly/photo_top.tpl
new file: view/theme/smoothly/photo_view.tpl
new file: view/theme/smoothly/photography.png
new file: view/theme/smoothly/premium.png
new file: view/theme/smoothly/prev.png
new file: view/theme/smoothly/profile_entry.tpl
new file: view/theme/smoothly/profile_vcard.tpl
new file: view/theme/smoothly/saved_searches_aside.tpl
new file: view/theme/smoothly/screenshot.jpg
new file: view/theme/smoothly/screenshot.png
new file: view/theme/smoothly/search.png
new file: view/theme/smoothly/search_item.tpl
new file: view/theme/smoothly/star.png
new file: view/theme/smoothly/style.css
new file: view/theme/smoothly/theme.php
new file: view/theme/smoothly/user.png
new file: view/theme/smoothly/wall_item.tpl
new file: view/theme/smoothly/wallwall_item.tpl
2012-09-02 13:11:17 +02:00
