Commit Graph

6965 Commits

Author SHA1 Message Date
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 16eec24a21 Tabs trouble? What happened? I sure aven't changed anything to my editor... 2012-09-10 10:36:30 +02:00
Domovoy 51bcd862d7 Port friendica/friendica#1478229abc6c5adc265559b5489cc2eb23358994 2012-09-10 10:14:30 +02:00
Domovoy 7bef3023a8 Port friendica/friendica#4cd8233f61647d805383f5786052ef034cebf4e1 2012-09-10 09:57:34 +02:00
Domovoy 1b82df60db Port friendica/friendica#79012bf8882baa6843726bcffbcafe959028c1bd 2012-09-10 09:50:30 +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
friendica ee9ba384b1 Merge https://github.com/friendica/friendica into pull 2012-09-09 15:36:49 -07:00
friendica 0790af15fa rev update + bug 477 'Romania' misspelled 2012-09-09 15:35:33 -07:00
Tobias Diekershoff 656604a5ff DE: getting the strings back to 100% 2012-09-09 18:31:15 +02:00
Thomas Willingham 1b70cdbdc7 Romania typo. 2012-09-09 15:08:09 +01:00
Tobias Diekershoff 63ab82d3dd frost-mobile: was missing infront of the nav-images 2012-09-09 13:26:15 +02:00
friendica 624fd44502 Merge https://github.com/friendica/friendica into pull 2012-09-08 18:34:32 -07:00
friendica 7bec5778ba provide option to view photo albums in posted order (rather than blog order) 2012-09-08 18:33:28 -07:00
friendica 032507bd6d rev update 2012-09-08 18:11:08 -07: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
fermionic 6fd2414564 Merge pull request #460 from fermionic/frost-mobile-settings-and-add-contact
add settings sections and "add contacts"; other tweaks and fixes
2012-09-07 11:20:37 -07: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
friendica 5c0f0df59a provide local_block - block_public as far as content but can connect with the grid. 2012-09-06 20:17:50 -07:00
friendica 40cfcdad2d Merge https://github.com/friendica/friendica into pull 2012-09-06 17:21:28 -07:00
friendica cc9a1a6474 rev update 2012-09-06 17:20:31 -07:00
Thomas Willingham d0994fc882 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-07 00:44:01 +01:00
Thomas Willingham 5f970aea72 Typo in notifier. 2012-09-07 00:43:05 +01:00
fermionic 9bf8efc45f Merge pull request #459 from fermionic/individual-choice-of-mobile-theme
Individual choice of mobile theme
2012-09-06 16:35:04 -07:00
fermionic b80a225fc0 Merge pull request #458 from fermionic/twitter-profile-picture-too-small
small twitter improvements
2012-09-06 16:34:40 -07:00
Zach Prezkuta a089a89478 small twitter improvements 2012-09-06 17:31:05 -06: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