Commit graph

2707 commits

Author SHA1 Message Date
fabrixxm
9d4fdee65d Merge pull request #500 from fabrixxm/quattro-fontsoptions
Quattro fixes
2012-10-01 07:05:58 -07:00
Fabrixxm
c7a4c08081 quattro: fix jot "video link" tooltip 2012-10-01 09:59:55 -04:00
Fabrixxm
871f182414 quattro: add quattro-lilac to theme Makefile 2012-10-01 09:53:02 -04:00
Fabrixxm
ca34d89482 quattro: fix post tags style, add icons for mentions, folders and categories 2012-10-01 09:38:25 -04:00
Fabrixxm
9d738570ee quattro: options for posts and textareas font size 2012-10-01 08:58:05 -04:00
friendica
a620d5d9f3 Merge pull request #493 from fermionic/toggle-mobile-all-themes
Toggle mobile all themes
2012-09-30 01:58:51 -07:00
friendica
b03edcd8e5 Merge pull request #499 from fermionic/network-remember-filters
Network view updates
2012-09-30 01:54:00 -07:00
Tobias Diekershoff
db81050edd IT: update to the strings 2012-09-30 09:07:14 +02:00
Tobias Diekershoff
cacd28d045 deleted nb_NO folder manually 2012-09-30 09:01:40 +02:00
Tobias Diekershoff
e476a7126c should be nb-no 2012-09-30 08:52:40 +02:00
Tobias Diekershoff
2e8ac578cc RU: update to the strings 2012-09-30 08:49:16 +02:00
Tobias Diekershoff
f547387ada FR: update to the strings 2012-09-30 08:43:15 +02:00
Tobias Diekershoff
f73df7d209 DE: update to the strings 2012-09-30 08:41:43 +02:00
Tobias Diekershoff
4845aa229c nb_NO: added from Transifex 2012-09-30 08:41:03 +02:00
Zach Prezkuta
421c72d10f remember combination of last tab selected, last group selected, and last network selected; update only items seen in selected filters 2012-09-29 17:56:50 -06:00
Zach Prezkuta
4c2dd162a4 add new template file 2012-09-29 17:51:39 -06:00
Zach Prezkuta
cee50502d3 toggle mobile on all themes; Frost updates 2012-09-29 17:47:47 -06:00
Fabrixxm
de076afd6b quattro: update wall_thread.tpl to separate tags/mentions/folder/category display 2012-09-28 10:17:26 -04:00
Fabrixxm
574631c17a Merge remote branch 'friendica/master' into quattro-fontsoptions 2012-09-28 10:06:00 -04:00
Tobias Diekershoff
ce8b6c4285 FR: update to the strings 2012-09-28 06:44:30 +02:00
friendica
9337441491 class not id 2012-09-27 02:54:14 -07:00
friendica
d615f0b563 forumlist changes 2012-09-27 02:47:50 -07:00
Tobias Diekershoff
44469afe86 added IS from transifex, kudos to axelt 2012-09-27 06:42:57 +02:00
Tobias Diekershoff
0209edb25c FR: update to the strings 2012-09-27 06:31:55 +02:00
Tobias Diekershoff
1880ad40d9 CA: update to the strings 2012-09-27 06:30:37 +02:00
Tobias Diekershoff
88642699e7 EO: update to the strings 2012-09-27 06:29:25 +02:00
Tobias Diekershoff
5fb4ca346b CS: update to the strings 2012-09-27 06:27:06 +02:00
Tobias Diekershoff
7b7e3aab1f ES: update to the strings 2012-09-27 06:24:49 +02:00
Tobias Diekershoff
ce38e574a2 DE: update to the strings 2012-09-27 06:21:16 +02:00
friendica
4a8100a409 frost-mobile - everything is walltowall 2012-09-25 21:55:53 -07:00
friendica
2cacbdb9e7 Merge https://github.com/friendica/friendica into pull 2012-09-25 19:11:58 -07:00
friendica
e433f20cd8 sort out the 'delete selected' mess 2012-09-25 19:10:46 -07:00
pixelroot
75d65db785 Merge remote branch 'upstream/master' 2012-09-25 12:00:29 +02:00
pixelroot
0bf9ff5821 modified: view/theme/smoothly/events_reminder.tpl
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2012-09-25 11:59:58 +02:00
friendica
245d9f0aca one template to rule them all 2012-09-25 01:31:48 -07:00
friendica
a798ef1a56 one template to rule them all 2012-09-24 21:43:03 -07:00
pixelroot
0592a9e3ca modified: view/theme/smoothly/login.tpl
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2012-09-24 16:07:41 +02:00
friendica
8df6f249fd Merge https://github.com/friendica/friendica into pull 2012-09-24 01:31:23 -07:00
pixelroot
0834779405 Merge remote branch 'upstream/master' 2012-09-24 10:16:05 +02:00
pixelroot
05223cc325 modified: view/theme/smoothly/search_item.tpl
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-24 10:15:31 +02:00
friendica
94f3aef1ea allow a bit more height 2012-09-24 00:46:00 -07:00
friendica
316014e4ea restore category/file display on dispy/diabook 2012-09-24 00:35:19 -07:00
pixelroot
c44d068adf Merge branch 'master' of http://github.com/friendica/friendica 2012-09-24 08:46:25 +02:00
friendica
054f8edb59 zeros - theming for new categories/folder display 2012-09-23 19:22:48 -07:00
Tobias Diekershoff
930169a8aa DE: update to the strings 2012-09-22 08:42:07 +02:00
pixelroot
57849ff959 modified: view/theme/smoothly/style.css 2012-09-21 08:57:22 +02:00
pixelroot
fa2156a9c1 modified: view/theme/smoothly/style.css 2012-09-20 13:26:53 +02:00
pixelroot
8a8fe725af modified: view/theme/smoothly/style.css 2012-09-20 13:25:12 +02:00
pixelroot
85c0260f33 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2012-09-20 13:15:01 +02:00
pixelroot
12f7c32f9b modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2012-09-20 11:32:55 +02:00
pixelroot
49098ed11d deleted: view/theme/smoothly/match.tpl
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2012-09-20 09:25:53 +02:00
Zach Prezkuta
1aa111387a -- Fix Diaspora profile update avatar bugs
-- Protect BBCode tags inside of [pre] from space re-formatting
-- More information in email poll logging
-- Frost/Frost Mobile bug fixes
2012-09-19 20:35:39 -06:00
friendica
c11aa30ef4 this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted. 2012-09-19 18:24:20 -07:00
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
friendica
82678e7bbf bad html in view/follow.tpl 2012-09-19 03:17:41 -07: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
friendica
863e036b76 Merge pull request #483 from fabrixxm/bug471
admin: Don't allow to block or delete site admin in users admin page.
2012-09-17 17:39:32 -07:00
Thomas Willingham
69182360ef Merge pull request #486 from cvogeley/master
Show notifications in title, ignore OSX .DS_Store files
2012-09-17 14:44:17 -07:00
Christian Vogeley
c024ed601e Remove and ignore .DS_Store 2012-09-17 23:03:34 +02:00
Tobias Diekershoff
808b0f2ed8 ES: bringing the strings to 100% thx to csolisr 2012-09-17 21:52:21 +02:00
Christian Vogeley
318bc23e8a Add notifications in title 2012-09-17 20:39:34 +02:00
Thomas Willingham
e34b8e6d46 Pull request #484 (Smoothly) 2012-09-17 18:37:44 +01:00
tomtom84
68c2316ce3 Corrected titlebar notifications in Diabook 2012-09-17 17:54:07 +02:00
Thomas Willingham
11eebf7091 Add titlebar notifications to Dispy. 2012-09-17 14:54:40 +01:00
Thomas Willingham
9cabcad36c Add title bar notifications to Smoothly 2012-09-17 14:53:17 +01:00
Fabrixxm
6aa45fb9cc admin: Don't allow to block or delete site admin in users admin page. fix bug 471 2012-09-17 08:48:43 -04: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
Fabrixxm
6deb070890 quattro: first work on font size options 2012-09-17 03:29:58 -04:00
Zach Prezkuta
ab10a7b56b missed one 2012-09-16 18:57:04 -06:00
Zach Prezkuta
3c7419ec57 various bug fixes 2012-09-16 18:56:31 -06:00
Tobias Diekershoff
d29da99dbd frost: added some missing baseurls to nav.tpl 2012-09-16 18:33:55 +02:00
Thomas Willingham
f198953790 Merge branch 'master' of https://github.com/friendica/friendica 2012-09-16 16:17:43 +01:00
Thomas Willingham
225c9bb30e Make 'Friendika' 'Friendica' in open search. 2012-09-16 16:16:22 +01:00
Tobias Diekershoff
89981b33bb DE: update to the strings 2012-09-16 10:48:29 +02:00
friendica
2abbd1dc19 permissions selector showing up for guests, testbubble and smoothly 2012-09-15 20:21:17 -07:00
Tobias Diekershoff
21d685b21c DE: update to the strings 2012-09-15 10:38:08 +02: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
Alex
7ae1e4620d Merge pull request #476 from pixelroot/master
new funktion
2012-09-14 10:07:17 -07: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
Alex
5d22b13242 Merge pull request #475 from pixelroot/master
Bugs
2012-09-14 08:53:27 -07:00
Tobias Diekershoff
cb1c9de069 quattro: lilac color schema 2012-09-14 17:01:26 +02:00
Tobias Diekershoff
6c44125fb5 DE: update to the strings 2012-09-14 15:46:14 +02:00
Tobias Diekershoff
882f437149 quattro: mail link to profile page 2012-09-14 15:35:40 +02:00
pixelroot
252e112ad5 modified: view/theme/smoothly/style.css 2012-09-14 12:46:32 +02:00
Alex
98540b630e Merge pull request #474 from pixelroot/master
Bug fix
2012-09-14 03:43:48 -07:00
pixelroot
e78b86f534 modified: view/theme/smoothly/style.css 2012-09-14 11:57:13 +02:00
Alex
9c7d5d42e1 Merge pull request #473 from pixelroot/master
Editor redesign
2012-09-14 02:54:30 -07:00
pixelroot
bdc5a3ab29 deleted: view/theme/smoothly/group_edit.tpl 2012-09-14 10:16:35 +02:00
Alex
ac0ad8fecf Merge pull request #472 from pixelroot/master
Group-Edit bug
2012-09-14 01:14:48 -07:00
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
friendica
ec1abfda46 Merge https://github.com/friendica/friendica into pull 2012-09-11 18:57:40 -07:00
friendica
a8d12061ca rev update + multiple profile photos 2012-09-11 18:56:38 -07: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
Tobias Diekershoff
36bd5286f2 DE: update to the strings 2012-09-11 09:19:11 +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
656604a5ff DE: getting the strings back to 100% 2012-09-09 18:31:15 +02: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
Tobias Diekershoff
a287b34eb3 DE strings (pokes THX @zottel) 2012-09-02 11:59:44 +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
c2b4dc2e60 DE: some translations 2012-08-28 18:14:57 +02: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
Domovoy
3e5c711a72 Sync objects with upstream 2012-08-23 10:54:21 +02:00
friendica
386b6d081b moods 2012-08-22 21:36:55 -07:00
friendica
4f72e656ca Merge https://github.com/friendica/friendica into pull 2012-08-21 19:42:37 -07:00
friendica
ff0e0782a5 restore old comment behaviour when threading turned off 2012-08-21 19:41:50 -07:00
Tobias Diekershoff
07a27d217c DE more updates to the strings 2012-08-21 08:23:47 +02:00
Tobias Diekershoff
d470496ead Quattro: added localtime timestamp title to entries 2012-08-20 11:20:49 +02:00
Tobias Diekershoff
96e6be3c19 DE strings update 2012-08-20 11:12:40 +02:00
friendica
bcec1bddc0 put the real post time into the post 2012-08-19 14:39:43 -07:00
Zach Prezkuta
b4a4ccfb2b include login style when necessary 2012-08-18 14:47:59 -06:00
Zach Prezkuta
045f98cddd another javascript 2012-08-16 21:51:36 -06:00
Thomas Willingham
ee998864e6 Make Vier threaded comments not broken.
These should be inherited from Quattro really, but aren't.
2012-08-16 18:21:33 +01:00
Zach Prezkuta
3531704d08 admin page selector for mobile theme 2012-08-15 08:54:30 -06:00
Tobias Diekershoff
a09c200799 add selector for mobile theme to admin panel 2012-08-15 10:16:42 +02:00
Tobias Diekershoff
52908d5e80 lets mark mobile themes similar to experimental ones 2012-08-15 10:15:21 +02:00
Zach Prezkuta
77626cca74 missed something again 2012-08-14 19:54:22 -06:00
Zach Prezkuta
45b21c1d20 basic updates for Dispy and Diabook to try to make them at least not broken with threading updates 2012-08-14 19:42:07 -06:00
Tobias Diekershoff
a763a064ff DE some updates to the translation 2012-08-14 12:37:32 +02:00
fermionic
8d89a915fc Merge pull request #434 from fermionic/frost-update-for-threaded-comments
sigh I always miss something when copying over
2012-08-11 19:53:08 -07:00
Zach Prezkuta
91aacdbb3d sigh I always miss something when copying over 2012-08-11 20:51:51 -06:00
friendica
6348634a1b Merge https://github.com/friendica/friendica into pull
Conflicts:
	view/wall_thread.tpl
2012-08-11 15:42:48 -07:00
friendica
1cd23860cb rev update 2012-08-11 15:39:45 -07:00
Zach Prezkuta
5890e3fa3a update frost mobile TODO 2012-08-11 14:43:13 -06:00
Zach Prezkuta
5e09fc31f5 Threading updates
- Add rudimentary thread handling to Frost
- Fix possible CSS bug in several themes from threading update
- Add ability for themes to prevent threading
2012-08-11 14:36:58 -06:00
friendica
20be1778db bring likes back - comment ordering is still a bit funky 2012-08-10 16:36:44 -07:00
Zach Prezkuta
bcf214debb readability in TODO 2012-08-10 08:37:31 -06:00
Zach Prezkuta
d9279da369 - Frost Mobile: redo CSS to adjust automatically to the screen width
- Frost Mobile: various tweaks and fixes
- Allow themes to limit number of items on the Network page
2012-08-10 08:34:00 -06:00
Fabrixxm
ec3d8a80cd quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread 2012-08-10 06:27:01 -04:00
Fabrixxm
0f15c117ee quattro: move comment box for top-level item at the end of comments list 2012-08-10 04:53:39 -04:00
Fabrixxm
c4bff3d393 quattro: add comment tools icons, fix hide/show comment tools 2012-08-10 04:29:22 -04:00
Fabrixxm
64a6e8693c quattro: remove unused parameter 'comment' from function cmtBbClose 2012-08-10 04:27:50 -04:00
Fabrixxm
2b7d08508d head.tpl: commentOpen() and commentClose() return true/false
usefull to concatenate other actions: "commentClose(this, $id) && cmtBbClose($id)"
2012-08-10 04:25:08 -04:00
Domovoy
9c920fd7b9 Merge pull request #5 from fabrixxm/threaded_items
Threaded items support for Quattro theme
2012-08-09 02:14:22 -07:00
Domovoy
afaa5f2038 Removed useless comment box (from old non-threaded template, to comment box where displayed) 2012-08-07 12:13:42 +02:00
Domovoy
5ca71d04b2 Wall to wall items should now be threaded too. 2012-08-07 12:08:36 +02:00
Domovoy
c0024daff7 Added view/wallwall_thread.tpl 2012-08-07 12:02:06 +02:00
Domovoy
f3b1391501 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-08-07 09:40:21 +02:00
friendica
3032d663f6 Merge pull request #427 from fermionic/frost-embedded-videos
allow themes to change the size of embedded videos
2012-08-06 15:58:17 -07:00
Simon L'nu
7ceb213859 add a 'manage' icon to clarify things
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-08-06 17:05:25 -04:00
Simon L'nu
76e1e07571 Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
2012-08-06 13:18:00 -04:00
Zach Prezkuta
d8a13d6e8d allow themes to change the size of embedded videos 2012-08-06 09:59:57 -06:00
Fabrixxm
4062312e9c quattro: collaps threaded items 2012-08-06 04:48:24 -04:00
Fabrixxm
fd7ea5cc91 quattro: support threaded comments 2012-08-05 16:55:20 -04:00
Christian Vogeley
e6067e6694 Frost-mobile: media query in css for tablets
Use space more efficiently on tablets in frost-mobile theme. Tested with
iPad 1.
2012-08-05 16:08:07 +02:00
Domovoy
e247915f48 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	include/conversation.php
2012-08-05 13:43:53 +02:00
Simon L'nu
3d0fc813dc Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  missed an instance of $mobileapp in switch to generic app label
  ImageMagick rotates CW while imagerotate() rotates CCW
  update main frost version
  update version and todo
  -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks
  put back notags
  fix angle char storage and transmission, rev update
  Darkzero/NS .contact-photo-menu
  rev update
2012-08-04 23:41:51 -04:00
Zach Prezkuta
ed9811762d missed an instance of $mobileapp in switch to generic app label 2012-08-04 21:05:25 -06:00
Zach Prezkuta
1f8182a453 update main frost version 2012-08-04 14:05:56 -06:00
Zach Prezkuta
849720f160 update version and todo 2012-08-04 14:04:18 -06:00
Zach Prezkuta
63628910b2 -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter)
-- More HTML cleanup in TPL files
-- Various Frost bug fixes and tweaks
2012-08-04 14:02:39 -06:00
Domovoy
8742beb772 Flatten children when threads are disabled 2012-08-03 22:28:21 +02:00
Domovoy
75700a725e Comment box is inside the item 2012-08-03 19:18:56 +02:00
Domovoy
66848b0471 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items
Conflicts:
	update.php
2012-08-03 18:57:37 +02:00
Thomas Willingham
208019ea9c Darkzero/NS .contact-photo-menu 2012-08-03 03:07:29 +01:00
Simon L'nu
9433d229ed Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content.
  rev update
  Changed markdown to enable diaspora postings with images that contain links
  bbcode: two new bbcode elements (style, class) for CSS
  Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow.
  network: Caching of images
  scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY]
  Further performance improvements
  Speed improvements in the database
2012-08-02 12:46:36 -04:00
Michael Vogel
b904a21134 Merge remote branch 'upstream/master' 2012-08-02 10:27:11 +02:00
Simon L'nu
31eff37693 Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  ugly fix to make editplain work
  quattro: readd sparkle cursor
  quattro: style for "show more" addon
  tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat.
  logic was reversed - should work now
  fix almost all errant divs in view/ and frost folders
  Provide backend ability to poke as a comment rather than top-level post
  rev update
2012-08-01 22:59:54 -04:00
Zach Prezkuta
3e8e1ab830 ugly fix to make editplain work 2012-08-01 19:09:28 -06:00
Michael Vogel
04c31d194f Merge remote branch 'upstream/master'
Conflicts:
	update.php
2012-08-02 00:21:14 +02:00
Michael Vogel
bed99674d2 bbcode: two new bbcode elements (style, class) for CSS 2012-08-02 00:13:37 +02:00
Fabrixxm
fde3edaa21 quattro: readd sparkle cursor 2012-08-01 04:45:27 -04:00
Fabrixxm
bf04fb450a quattro: style for "show more" addon 2012-08-01 04:41:21 -04:00
friendica
14282a40bb Merge pull request #419 from fermionic/more-div-problems
fix almost all errant divs in view/ and frost folders
2012-07-31 21:58:08 -07:00
Zach Prezkuta
fc22c356ff fix almost all errant divs in view/ and frost folders 2012-07-31 22:43:18 -06:00
friendica
764ee653ba Provide backend ability to poke as a comment rather than top-level post 2012-07-31 20:59:51 -07:00
Simon L'nu
0e7f6d1417 Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  fix /display bug; oembed audio bug; other tweaks
  Frost: reduce DOM elements by about 20%; other tweaks and fixes
  rev update
  errant div in events_reminder.tpl
  pass deleted flag to display
  rev update
  fix filer bug; some interface tweaks
  Update view/theme/frost/nav.tpl
  Update view/theme/frost-mobile/nav.tpl
  don't show birthday/event details on mobile devices
  rev update
  remove server-specific change
  update version of frost and frost-mobile
  Modify Javascript to improve page loading times
  rev update
  Friendicaland got bigger.
2012-07-31 23:16:56 -04:00
Zach Prezkuta
885bb50f0d fix /display bug; oembed audio bug; other tweaks 2012-07-31 18:53:18 -06:00
Zach Prezkuta
b522ffeea5 Frost: reduce DOM elements by about 20%; other tweaks and fixes 2012-07-31 08:00:50 -06:00
Zach Prezkuta
72df6ff664 errant div in events_reminder.tpl 2012-07-30 07:59:08 -06:00
Domovoy
07f87848b4 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-30 13:36:33 +02:00
Zach Prezkuta
067865db9e fix filer bug; some interface tweaks 2012-07-29 14:49:12 -06:00
Domovoy
30d7db5e42 Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 22:43:49 +02:00
fermionic
4f13618b18 Merge pull request #414 from 23n/patch-1
Update view/theme/frost-mobile/nav.tpl
2012-07-29 12:36:22 -07:00
Domovoy
2fc0fcdc18 Unlimited level threading is now a site option. 2012-07-29 19:53:04 +02:00
Domovoy
25015d3ab9 Update now handles threaded items. 2012-07-29 18:39:38 +02:00
Domovoy
8ea3087342 Collapsing is back for threaded comments.
Comment box is displayed at the end of the thread.
Comments on comments are all collapsed
2012-07-29 17:13:21 +02:00
23n
5b5e4b6cb7 Update view/theme/frost/nav.tpl
moved identity/page management-link to system-menu
2012-07-29 15:28:59 +03:00
23n
0f1b33a278 Update view/theme/frost-mobile/nav.tpl
move identity management link to menu
2012-07-29 15:07:52 +03:00
Domovoy
10eb873f7c Merge branch 'master' of https://github.com/friendica/friendica into threaded_items 2012-07-29 10:03:17 +02:00
Zach Prezkuta
38d4df77c6 remove server-specific change 2012-07-28 10:14:28 -06:00
Zach Prezkuta
231b37217b update version of frost and frost-mobile 2012-07-28 10:03:56 -06:00
Zach Prezkuta
1f09e7ad23 Modify Javascript to improve page loading times
1. Add template category 'end' that places content right before final </body> tag
	2. Move most Javascript from tpl files into one cacheable file, theme.js
	3. Load scripts at end of the HTML document instead of in the header
	4. Minify several Javascript files

Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.
2012-07-28 09:57:16 -06:00
Domovoy
eaf0d04bfb Comment box is now inside the item. Makes it easier to know what we are commenting on. 2012-07-27 22:58:51 +02:00
Domovoy
d558d25540 CommentBox is now hidden by default, this can be toggled with a fake link 2012-07-27 22:47:18 +02:00
Domovoy
8ecf8167db Threaded comments are starting to work.
For now, only on normal view, and not during update
2012-07-27 22:08:57 +02:00
Simon L'nu
c5603cf756 fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet.
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:35:50 -04:00
Simon L'nu
794ae669ce fixes to cursor
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-25 22:28:09 -04:00
Fabrixxm
727c93cb8c quattro: add id to items container div
needed to make commit 4c6a4321 work
2012-07-25 08:12:21 -04:00
Zach Prezkuta
2e080f594e update head.tpl for dispy 2012-07-24 18:29:23 -06:00
friendica
57a75d240b Merge pull request #406 from fermionic/frost-theme
Introducing Frost
2012-07-24 15:28:16 -07:00
Zach Prezkuta
9378bc1375 disable tos and privacy links 2012-07-24 09:27:27 -06:00
Zach Prezkuta
178329b6dc disable tos and privacy links 2012-07-24 09:26:12 -06:00
Zach Prezkuta
f9809102a2 Introducing Frost Mobile 2012-07-24 09:16:51 -06:00
Zach Prezkuta
8126e8ea47 Introducing Frost 2012-07-24 09:15:57 -06:00
friendica
aa5e60248a Merge pull request #405 from fermionic/support-for-mobile-themes
changes to support a mobile theme
2012-07-23 20:18:23 -07:00
Zach Prezkuta
5cb979f5e4 changes to support a mobile theme 2012-07-23 20:37:00 -06:00
friendica
b20a80bf39 rev update 2012-07-23 15:27:25 -07:00
friendica
0ff93edeee poke privacy 2012-07-20 04:03:32 -07:00
friendica
d1243c9ad7 allow to prefill - url/poke?f=&c=nn - nn is contact id 2012-07-19 20:54:23 -07:00
friendica
a54278649f poke notifications 2012-07-19 20:13:40 -07:00
friendica
b78bd8cc94 duplicate input names 2012-07-19 19:48:33 -07:00
friendica
d442bbc482 have fun... 2012-07-19 18:17:16 -07:00
Martin Schmitt
eae6e665c0 Esperanto -> 100% 2012-07-16 22:33:23 +02:00
Simon L'nu
021f0829e6 re-add the sparkle stuff
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-15 12:03:53 -04:00
friendica
15cae001d9 move plink sparkles to the right html element in dispy 2012-07-13 04:22:42 -07:00
Simon L'nu
10ce535cac add doctitle thingy, and update cursor
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 04:35:16 -04:00
Simon L'nu
d08a97bb9f add some sparkle ;)
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-13 02:37:45 -04:00
Thomas Willingham
bd08a6b565 Add sparkle cursor to Quattro/Vier/TestBubble 2012-07-12 19:21:21 +01:00
friendica
085b589468 add some sparkle to plinks 2012-07-11 21:04:08 -07:00
tomtom84
f475850739 diabook: add notification in website-title, whenever new notifications arrive 2012-07-08 21:50:17 +02:00
Vasudev Kamath
ba4db236ec Merge branch 'master' of git://github.com/friendica/friendica 2012-07-06 22:47:27 +05:30
friendica
8b19168999 a bit more colour 2012-07-05 22:20:27 -07:00
friendica
f40b056e3b some initial code and benchmarking for "red" content rendering engine 2012-07-04 20:37:15 -07:00
friendica
fd626022ec add smarty engine, remove some obsolete zot1 stuff 2012-07-03 22:23:08 -07:00
Thomas Willingham
badaa68340 Diabook directory wide variants. 2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc)
424797138f Limiting .directory-photo-wrapper styles to <section> so as not to
interfere with .directory-photo-wrapper in <aside>
2012-07-03 21:49:02 +03:00
friendica
f7144e671c fix diabook directory pages (only the normal style - any volunteers for the wide?) 2012-07-02 16:56:37 -07:00
Thomas Willingham
74a819980f Various theme stuff.
Profile group list for testbubble
Screenshot for facepark
Various niggles in darkzero/NS
2012-07-02 03:40:12 +01:00
friendica
696d78d658 Merge pull request #369 from rdc/master
Added more profile data and CSS styling to the /directory page
2012-07-01 16:44:21 -07:00
Martin Schmitt
85c078f862 Esperanto -> 100% 2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)
2214cd74e5 Added more profile data and CSS styling to the /directory page 2012-07-01 14:46:03 +03:00
friendica
31718968c6 advanced profile theming 2012-06-30 01:29:29 -07:00
Fabrixxm
a03e6b96ea quattro: fix Forum widget, hide edit profile link 2012-06-29 05:47:53 -04:00
Fabrixxm
8b18ee49ff quattro: some updates
- add makefile to rebuild both css with single command
- fix icons in Forums widget
- style photos pages
2012-06-29 05:29:58 -04:00
friendica
be658788de maintain page position when hovering on pop-outs 2012-06-28 22:19:12 -07:00
Simon L'nu
ecf9ad9a08 fix item-delete-selected* css
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-28 12:15:32 -04:00
friendica
eb3bbd9081 insidious little parsing bug 2012-06-26 22:32:07 -07:00
friendica
f995a11641 have no idea why the if/endif macro block was getting printed and not processed. 2012-06-26 21:35:03 -07:00
friendica
fa2a8fa9bd highlight js events-reminder on birthday events 2012-06-27 13:49:35 +10:00
friendica
359a98cd22 change event behaviour so that title is required but description is not 2012-06-25 21:20:08 -07:00
friendica
fbaca4b742 event summary/title 2012-06-25 20:55:27 -07:00
Simon L'nu
eb6bf7e7fa fix margin of wall-item-body
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 18:42:18 -04:00
Simon
d944ff7833 Merge pull request #361 from simonlnu/master
cleaned up the css a bit
2012-06-25 14:25:33 -07:00
Simon L'nu
2ed3af55a8 fix delete thingy, and minor clean up
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc)
51ef8fb7ff Added App::get_cached_avatar_image usage for displaying "Last users"
avatar thumbs in right sidebar
2012-06-25 14:01:16 +03:00
friendica
35a098e0dc service limits for photo uploads 2012-06-25 01:37:44 -07:00
friendica
ad6c82bdea implement "follow" service limits 2012-06-24 22:23:17 -07:00
friendica
c464bc494c add like/dislike to profiles 2012-06-24 21:16:55 -07:00
Simon L'nu
3b1d9d9695 update jquery to 1.7.2; fix some dispy templates to be more in sync with view/
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-23 13:33:58 -04:00
friendica
7614d35cad liking comments backend 2012-06-23 04:44:48 -07:00
Vasudev Kamath
6e4760dd9c Merge branch 'master' of git://github.com/friendica/friendica 2012-06-23 08:11:35 +05:30
Simon L'nu
5cfa7dd041 minor tweaks to some tpl files
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-22 13:07:42 -04:00
Zach Prezkuta
54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
Simon L'nu
0be715d271 icon change; tweak button in toolbar; move site-location
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-20 05:04:04 -04:00