tobias/friendica
1
0
Fork 0
Code Pull requests Activity
6832 commits 2 branches 61 tags 203 MiB
Commit graph

1327 commits

Author SHA1 Message Date
pixelroot
d002573543 deleted: view/theme/smoothly/default.php 
modified:   view/theme/smoothly/nav.tpl
 2012-09-14 09:55:54 +02:00
Alex
2a404ae6dd Merge pull request #471 from pixelroot/master 
Theme Smoothly
 2012-09-14 00:54:54 -07: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
friendica
32d4a359f1 reverse the default newuser privacy setting to public. Sites can over-ride. 2012-09-13 19:11:07 -07:00
Thomas Willingham
290da6c845 Merge pull request #469 from pixelroot/master 
Theme Smoothly
 2012-09-13 07:59:16 -07: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
friendica
d3699498ac Merge pull request #468 from pixelroot/master 
Theme Smoothly
 2012-09-13 03:50:55 -07: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
Zach Prezkuta
e8acdb31bc add mobile toggle to frost mobile 2012-09-12 21:35:51 -06: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
tobiasd
250c615058 Merge pull request #466 from pixelroot/master 
Theme Smoothly
 2012-09-12 07:02:40 -07: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
fermionic
984274659d Merge pull request #464 from pixelroot/master 
theme smoothly
 2012-09-11 07:27:19 -07: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
friendica
fa65db9aa1 bring back comment edit buttons 2012-09-10 18:06:18 -07:00
friendica
4b7c6329e9 Merge pull request #462 from CyberDomovoy/threaded_items 
Threaded items, objects
 2012-09-10 16:19:13 -07:00
fermionic
9e9765a89f Merge pull request #463 from pixelroot/master 
Version 0.5
 2012-09-10 08:08:24 -07: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
Domovoy
bb68461c6d Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 
Conflicts:
	include/conversation.php
 2012-09-10 09:19:08 +02:00
friendica
0d9ffd07c2 remove mobile file 2012-09-10 00:15:01 -07:00
Tobias Diekershoff
63ab82d3dd frost-mobile: was missing infront of the nav-images 2012-09-09 13:26:15 +02:00
fermionic
1088257aad Merge pull request #461 from pixelroot/master 
Version 0.4
 2012-09-08 07:33:26 -07: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
Zach Prezkuta
63d02d98c5 add settings sections and add contacts; other tweaks and fixes 2012-09-07 12:17:03 -06: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
Zach Prezkuta
af3e36f665 mark all mobile themes 2012-09-06 17:30:24 -06:00
Zach Prezkuta
77529ccdf1 allow individual choice of mobile themes 2012-09-06 17:24:34 -06:00
fermionic
41439804f4 Merge pull request #456 from pixelroot/master 
New Theme "Smoothly"
 2012-09-06 11:08:48 -07: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
Zach Prezkuta
c6f4404914 conversation.tpl doesnt appear to be necessary 2012-09-05 11:12:08 -06:00
Zach Prezkuta
0d45fec969 add threading files to make testbubble not broken with threading 2012-09-05 11:11:03 -06: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
Zach Prezkuta
79012bf888 conversation needs preview parameter 2012-09-04 18:47:49 -06: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
pixelroot
0aebf15f03 deleted: view/theme/softy/back-gradient.jpg 
deleted:    view/theme/softy/calendar.png
	deleted:    view/theme/softy/comment_item.tpl
	deleted:    view/theme/softy/connect.png
	deleted:    view/theme/softy/contact_template.tpl
	deleted:    view/theme/softy/conversation.tpl
	deleted:    view/theme/softy/group_drop.tpl
	deleted:    view/theme/softy/group_edit.tpl
	deleted:    view/theme/softy/group_side.tpl
	deleted:    view/theme/softy/groups.png
	deleted:    view/theme/softy/icons.png
	deleted:    view/theme/softy/icons.svg
	deleted:    view/theme/softy/jot-header.tpl
	deleted:    view/theme/softy/jot.tpl
	deleted:    view/theme/softy/lock.cur
	deleted:    view/theme/softy/login-bg.gif
	deleted:    view/theme/softy/lrarrow.gif
	deleted:    view/theme/softy/mail_head.tpl
	deleted:    view/theme/softy/match.tpl
	deleted:    view/theme/softy/menu-user-pin.jpg
	deleted:    view/theme/softy/menu-user-pin.png
	deleted:    view/theme/softy/nav-bg.png
	deleted:    view/theme/softy/nav.tpl
	deleted:    view/theme/softy/nets.tpl
	deleted:    view/theme/softy/next.png
	deleted:    view/theme/softy/notifications.png
	deleted:    view/theme/softy/photo-menu.jpg
	deleted:    view/theme/softy/photo_album.tpl
	deleted:    view/theme/softy/photo_top.tpl
	deleted:    view/theme/softy/photo_view.tpl
	deleted:    view/theme/softy/photography.png
	deleted:    view/theme/softy/premium.png
	deleted:    view/theme/softy/prev.png
	deleted:    view/theme/softy/profile_entry.tpl
	deleted:    view/theme/softy/profile_vcard.tpl
	deleted:    view/theme/softy/saved_searches_aside.tpl
	deleted:    view/theme/softy/screenshot.jpg
	deleted:    view/theme/softy/screenshot.png
	deleted:    view/theme/softy/search.png
	deleted:    view/theme/softy/search_item.tpl
	deleted:    view/theme/softy/star.png
	deleted:    view/theme/softy/style.css
	deleted:    view/theme/softy/theme.php
	deleted:    view/theme/softy/user.png
	deleted:    view/theme/softy/wall_item.tpl
	deleted:    view/theme/softy/wallwall_item.tpl
	view/theme/smoothly/
 2012-09-02 13:09:16 +02:00
Fabrixxm
02037e345d quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas 2012-09-01 04:52:01 -04:00
friendica
2ace7d6646 Merge pull request #451 from fabrixxm/master 
fixes and tweaks
 2012-08-31 01:26:03 -07:00
Fabrixxm
51686cce01 quattro: remove 'experimental' 2012-08-31 03:32:10 -04:00
Fabrixxm
ad45d9a78a quattro: fix live update 2012-08-31 03:31:33 -04:00
pixelroot
9346de5686 deleted: view/theme/softy/style.alex 
deleted:    view/theme/softy/style.alt
 2012-08-30 16:50:22 +02:00
pixelroot
d96e3d95c1 new file: view/theme/softy/back-gradient.jpg 
new file:   view/theme/softy/calendar.png
	new file:   view/theme/softy/comment_item.tpl
	new file:   view/theme/softy/connect.png
	new file:   view/theme/softy/contact_template.tpl
	new file:   view/theme/softy/conversation.tpl
	new file:   view/theme/softy/group_drop.tpl
	new file:   view/theme/softy/group_edit.tpl
	new file:   view/theme/softy/group_side.tpl
	new file:   view/theme/softy/groups.png
	new file:   view/theme/softy/icons.png
	new file:   view/theme/softy/icons.svg
	new file:   view/theme/softy/jot-header.tpl
	new file:   view/theme/softy/jot.tpl
	new file:   view/theme/softy/lock.cur
	new file:   view/theme/softy/login-bg.gif
	new file:   view/theme/softy/lrarrow.gif
	new file:   view/theme/softy/mail_head.tpl
	new file:   view/theme/softy/match.tpl
	new file:   view/theme/softy/menu-user-pin.jpg
	new file:   view/theme/softy/menu-user-pin.png
	new file:   view/theme/softy/nav-bg.png
	new file:   view/theme/softy/nav.tpl
	new file:   view/theme/softy/nets.tpl
	new file:   view/theme/softy/next.png
	new file:   view/theme/softy/notifications.png
	new file:   view/theme/softy/photo-menu.jpg
	new file:   view/theme/softy/photo_album.tpl
	new file:   view/theme/softy/photo_top.tpl
	new file:   view/theme/softy/photo_view.tpl
	new file:   view/theme/softy/photography.png
	new file:   view/theme/softy/premium.png
	new file:   view/theme/softy/prev.png
	new file:   view/theme/softy/profile_entry.tpl
	new file:   view/theme/softy/profile_vcard.tpl
	new file:   view/theme/softy/saved_searches_aside.tpl
	new file:   view/theme/softy/screenshot.jpg
	new file:   view/theme/softy/screenshot.png
	new file:   view/theme/softy/search.png
	new file:   view/theme/softy/search_item.tpl
	new file:   view/theme/softy/star.png
	new file:   view/theme/softy/style.alex
	new file:   view/theme/softy/style.alt
	new file:   view/theme/softy/style.css
	new file:   view/theme/softy/theme.php
	new file:   view/theme/softy/user.png
	new file:   view/theme/softy/wall_item.tpl
	new file:   view/theme/softy/wallwall_item.tpl
 2012-08-30 16:42:50 +02:00
Domovoy
ef52ff6b01 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-30 07:47:21 +02:00
Zach Prezkuta
2ef1081c68 make the show more line look nicer 2012-08-28 20:19:47 -06:00
fermionic
9ae5ae6df5 Merge pull request #448 from fermionic/limit-items-on-all-pages 
limit number of items on profile page too
 2012-08-28 19:03:15 -07:00
fermionic
8c064069d9 Merge pull request #443 from fermionic/new-users-privacy-settings 
automatically make posts private for new users
 2012-08-28 19:02:51 -07:00
Tobias Diekershoff
d9ffb0578c quattro: display date info as "ago" with mouse over date stamp 2012-08-27 19:47:04 +02:00
Tobias Diekershoff
cf91a7f79a quattro: mail_display has no ago information so don't display it 2012-08-27 19:39:31 +02:00
Tobias Diekershoff
036d5db0c0 quattro: use "ago" for date information and on mouse the date stamp 2012-08-27 19:32:23 +02:00
Tobias Diekershoff
37a0504f96 quattro: expanded the new prvmessage field a bit 2012-08-27 08:13:07 +02:00
Zach Prezkuta
c681e69794 limit number of items on profile page too; add show more back to Frost mobile; some show more fixes 2012-08-26 15:21:26 -06:00
Zach Prezkuta
a77081f659 remove show more/less from frost mobile--it is too great a load 2012-08-26 09:31:37 -06:00
Zach Prezkuta
0fe1727d74 remove show more/less animation on mobile 2012-08-26 09:22:49 -06:00
Zach Prezkuta
7c9c92e542 update version 2012-08-25 22:43:32 -06:00
Zach Prezkuta
193cc2c537 try to get rid of scrollbars in Frost 2012-08-25 22:42:12 -06:00
Zach Prezkuta
f062ccbb66 add documentation; add to admin panel; some tweaks and interface stuff 2012-08-25 15:03:16 -06:00
fermionic
5cb618bcf1 Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show 
restore nav element to login pages, since system messages are sent in it
 2012-08-25 09:10:01 -07:00
Zach Prezkuta
3413cc1006 restore nav element to login pages, since system messages are sent in it 2012-08-25 10:08:25 -06:00
Zach Prezkuta
54d4fc73c4 fix image and file upload on frost moble; add support to frost for local post time 2012-08-24 21:25:39 -06:00
Domovoy
5dd3e8a990 One click comments on threaded items. 
comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.
 2012-08-23 13:09:35 +02:00
friendica
ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
Tobias Diekershoff
d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00