Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-25 13:20:16 +00:00
Code Issues Projects Releases Packages Wiki Activity
7115 commits 3 branches 64 tags 237 MiB
Commit graph

1405 commits

Author SHA1 Message Date
Simon L'nu
2c15bdd99e merge HEAD 
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
 2012-10-15 22:48:25 -04:00
fermionic
2f3d118e77 Merge pull request #508 from fermionic/no-theme-control-of-live-update-location 
allow themes to decide where live updates appear
 2012-10-10 17:34:28 -07:00
Zach Prezkuta
0d56f82efa frost style improvements; various tweaks 2012-10-09 09:44:56 -06:00
Zach Prezkuta
0ea89852d2 allow themes to decide where live updates appear 2012-10-09 09:41:33 -06:00
Thomas Willingham
ffe7209114 Darkzero - make "visible to" legible. 2012-10-06 01:18:03 +01:00
Zach Prezkuta
5f2826f84e update themes for new All Networks option 2012-10-04 19:59:30 -06:00
Thomas Willingham
d33abe2de9 Dispy - selecting any network and then switching back to "all networks" 
didn't work.  Remove nets.tpl to make it use the default one.
 2012-10-04 23:19:50 +01:00
pixelroot
ceb8b8b77f new file: view/theme/smoothly/file.gif 
modified:   view/theme/smoothly/search_item.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
 2012-10-04 16:37:02 +02:00
Christian Vogeley
44acbb25e4 Bring back BB-Code in comments 2012-10-02 21:29:00 +02:00
Zach Prezkuta
e850e0c6d5 frost suport for categories and folder updates 2012-10-01 14:22:32 -06:00
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
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
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
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
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
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
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
Christian Vogeley
c024ed601e Remove and ignore .DS_Store 2012-09-17 23:03:34 +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
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
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
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
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