Commit graph

1707 commits

Author SHA1 Message Date
Michael Vogel
de4d0765cb Beautifiying export of shared posts to other networks 2014-01-18 21:32:14 +01:00
7c8e2e46d8 Merge pull request #894 from tobiasd/diabook_rememberme
added remember me checkbox to diabook login template
2014-01-12 23:49:43 -08:00
d4d3fa90e7 added remember me checkbox to diabook login template 2014-01-13 08:48:19 +01:00
Oliver
e433dfad71 Quick fix: star and lock position on starred posts 2014-01-12 12:42:56 +01:00
Michael Vogel
aed28a24f1 Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/crepair.php
2014-01-05 16:22:42 +01:00
fabrixxm
7b5018fb76 Merge pull request #872 from annando/master
API: Supporting twidere, better supporting of the network field in the item table
2013-12-27 00:15:44 -08:00
Michael Vogel
4b0e370c4c Better handling of the network field in the item table. 2013-12-27 01:58:21 +01:00
Fabrixxm
06e8f31695 change action container div class to id. fix bug in quattro theme 2013-12-18 06:38:57 -05:00
Fabrixxm
9febcedf93 user contacts: fix #797 , add searching in url and nickname, add batch actions 2013-12-17 05:19:06 -05:00
68e0324c1b Merge pull request #853 from annando/master
Bugfix of the previous bugfix :)
2013-12-11 23:23:30 -08:00
Fabrixxm
9474a0deed Add better support to small screen to duepuntozero theme.
This close #823. It also add some styles for screens less than 960px.
It's not a mobile theme, but should be better to see in case.
2013-12-11 05:25:41 -05:00
Michael Vogel
d487cb2078 vier: Screenshot updated 2013-12-10 20:56:50 +01:00
Michael Vogel
bae844e367 New style for shared links. Preparation for changes in some addons 2013-12-08 16:49:07 +01:00
Michael Vogel
3e5b9e97e7 New "minimal" mode for displaying the network content. Preparation for e.g. a multicolumn layout. 2013-12-04 23:46:51 +01:00
maase2
e010eb480e Update style.css
Add warning-message class
2013-11-08 14:34:12 +01:00
7d1a6cc1d6 Merge pull request #803 from annando/master
SQL performance and reduction of database warnings
2013-11-07 01:03:31 -08:00
d1a0206cdd Merge pull request #806 from maase2/patch-6
Update style.css
2013-11-03 23:37:05 -08:00
maase2
50f69ff23e Update style.css
This is for responsive Webdesign.
2013-11-03 11:27:49 +01:00
maase2
e6a81b47e0 Update style.css
This will fix the profile selector. It will be bring it on the left side.
2013-11-03 10:57:58 +01:00
Michael Vogel
711972a166 Merge remote-tracking branch 'upstream/master' 2013-10-25 23:35:03 +02:00
Michael Vogel
0ffeb4cf92 New field "network" in item table to speed up the system. 2013-10-25 23:33:53 +02:00
Fabrixxm
0ccad6d7d2 quattro theme: version bump 2013-10-22 13:55:36 -04:00
Fabrixxm
900b90ad85 quattro theme update:
icon and notification for introductions
icon and notification for private messages
correct link to edit profile with single profile enabled
2013-10-22 13:53:12 -04:00
Michael Vogel
e70b110984 Switching from "new share" to "old share" 2013-10-15 00:49:49 +02:00
Michael Vogel
8adc1bd703 Vier: Improved scrollbar when the "aside" area is to short. 2013-10-04 11:12:29 +02:00
Oliver
53040c0814 Update style.css
no opacity for remote-link icon
2013-09-24 09:18:29 +02:00
b178317cbb Merge pull request #774 from silke/frost-mobile-share-link
Transferred link link from Neptune theme (by 23n) to frost-mobile
2013-09-23 21:36:47 -07:00
Silke Meyer
5075770654 Transferred link link from Neptune theme (by 23n) to frost-mobile 2013-09-24 00:28:35 +02:00
tomtom84
ca39c2acb4 - diabook update
-- adjust nav-bar, depending to userstatus
2013-09-11 19:14:41 +02:00
tomtom84
9ddca9425d update diabook-theme
-- fixed contact-edit-page
-- some css-fixes
2013-09-08 04:30:55 +02:00
tomtom84
06994b94b2 - update diabook-theme:
-- removed twitter-box from right col, because api is outdated
-- some css-fixes
2013-09-07 03:28:52 +02:00
tomtom84
4747145ca9 add a readme to diabook-folder and update my fork 2013-09-06 20:51:33 +02:00
tomtom84
8c0c807a59 add a readme to diabook-folder 2013-09-06 20:51:33 +02:00
Michael Vogel
9bbf60ac9b Vier: A little rearrangement of the menu order. 2013-06-23 00:26:04 +02:00
Michael Vogel
bd7abe210c Vier: Introductions are now shown. The popup menu when editing a profile is visible again. 2013-06-23 00:07:21 +02:00
Zach Prezkuta
b4aa018d7b forgot to update Frost autocomplete JS location 2013-06-04 20:29:33 -06:00
Zach Prezkuta
cc4d091db0 remove some now-unnecessary templates 2013-06-01 10:45:32 -06:00
Zach Prezkuta
127b7a589e eliminate Cropper conflicts with jQuery 2013-06-01 10:42:51 -06:00
Fabrixxm
2111f750fb quattro: show notification number in favicon 2013-05-31 06:18:59 -04:00
5113885427 fix 540 in vier 2013-05-29 17:10:49 +02:00
c82ab9e1b5 fix bug #540 for quattro themes 2013-05-29 10:44:09 +02:00
Zach Prezkuta
35358baac9 update to v4.0.0; point to local host of SWF 2013-05-11 10:55:09 -06:00
Zach Prezkuta
5d30008ab3 don't set img src in notifications to blank 2013-05-11 09:43:21 -06:00
fermionic
3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support
basic video playback support using VideoJS
2013-05-11 08:33:36 -07:00
pixelroot
b06dab97ba modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
	new file:   view/theme/smoothly/templates/tools.tpl
	modified:   view/theme/smoothly/theme.php
2013-05-08 14:46:42 +02:00
pixelroot
e90c89f3fc new file: view/theme/smoothly/images/power.png
new file:   view/theme/smoothly/images/up.png
2013-05-08 11:09:08 +02:00
pixelroot
523548ff22 modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/images/down.png
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	view/theme/smoothly/images/power.png
	view/theme/smoothly/images/up.png
2013-05-08 11:08:21 +02:00
Zach Prezkuta
bc57d7f64e bug in main.js for VideoJS on initial page load 2013-05-07 22:06:40 -06:00
pixelroot
258604f036 modified: view/theme/smoothly/css/typography.css 2013-05-07 14:30:04 +02:00
pixelroot
8c8d3913cc modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-05-07 14:01:54 +02:00
pixelroot
5ac6e82e7d modified: view/theme/smoothly/default.php
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-05-07 09:39:14 +02:00
Zach Prezkuta
bd20f6ed9a add some styling for the video player 2013-05-03 19:09:12 -06:00
Zach Prezkuta
fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica
61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
pixelroot
f41c5dd1e5 modified: view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/default.php
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/templates/nav.tpl
	modified:   view/theme/smoothly/theme.php
2013-04-24 14:09:24 +02:00
Fabrixxm
4dc72742ae remove unneeded files 2013-04-23 07:52:36 -04:00
Fabrixxm
379c761c3f missing "templates" folders 2013-04-23 07:47:57 -04:00
Fabrixxm
6fddd1cbbf template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir 2013-04-23 03:35:31 -04:00
Zach Prezkuta
78e747016f update mobile theme settings pages 2013-04-18 19:47:27 -06:00
Zach Prezkuta
2316e0d731 update admin options for frost, frost mobile, and decaf mobile 2013-04-04 16:42:39 -06:00
pixelroot
ee07251d38 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-04-01 19:36:22 +02:00
cda327a368 Merge pull request #658 from annando/master
Mail importing problems, a small "vier" change
2013-03-30 01:46:13 -07:00
Michael Vogel
eabefb2f04 vier: The background color of the right area is now white. 2013-03-29 11:18:20 +01:00
pixelroot
d685181101 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-27 20:08:06 +01:00
pixelroot
2b7dd2f72b modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-26 17:10:58 +01:00
pixelroot
296c49f4a1 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-26 15:47:17 +01:00
pixelroot
0a446da659 modified: view/theme/smoothly/css/typography.css
modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-03-26 11:28:22 +01:00
Michael Vogel
111495423c Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated. 2013-03-14 23:15:15 +01:00
pixelroot
bb3e8ad785 modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-03-12 10:06:19 +01:00
pixelroot
a65ae04bcc modified: view/theme/smoothly/style.css 2013-03-11 19:59:49 +01:00
pixelroot
a2adc03636 deleted: view/theme/smoothly/login.tpl
deleted:    view/theme/smoothly/smarty3/login.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
2013-03-11 19:19:33 +01:00
Michael Vogel
5d3613c8bc Vier: The change from blue to black in links is now faded as well. 2013-03-07 19:34:54 +01:00
Michael Vogel
c40c61c106 OStatus conversations: Fixed a bug when a message hadn't got an id.
vier: Some more changes to make the side menu static.
In the index.php I did a small change to make friendica compatible with the android client for diaspora.
2013-03-06 23:23:04 +01:00
Michael Vogel
86e19dda22 Vier: Some more changes to the theme.
Added a switch to suppress displaying of the tags.
2013-03-05 00:46:11 +01:00
Michael Vogel
8bb6b51967 Vier: Some more transition effects 2013-03-04 21:11:31 +01:00
Michael Vogel
421d484839 Merge remote-tracking branch 'upstream/master' 2013-03-04 00:05:17 +01:00
Michael Vogel
478a079665 Vier: Further changes: profile border is rounded. 2013-03-04 00:04:06 +01:00
Michael Vogel
8e1d253568 OStatus conversation: now the creation date of the item is store with the conversation
vier: The link color and the color of the top bar is changed.
2013-03-03 23:44:50 +01:00
friendica
1c55b0b359 Merge pull request #639 from annando/master
Community/Open Graph
2013-03-03 12:07:52 -08:00
Zach Prezkuta
0187283709 allow admin to prevent private image embedding on hub 2013-03-03 09:44:41 -07:00
Michael Vogel
05597b564d Merge remote-tracking branch 'upstream/master' 2013-03-03 16:30:18 +01:00
friendica
f07df4f667 merge 2013-03-02 15:46:54 -08:00
Michael Vogel
2866f62c88 Suppoorting Open Graph and Dublin Core when displaying single item
Following link shorteners in parse_url
2013-03-02 14:46:06 +01:00
69776fc54e Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates
some smarty templates needed updating
2013-02-23 23:26:48 -08:00
Zach Prezkuta
047cf0d342 some smarty templates needed updating 2013-02-23 09:36:00 -07:00
Zach Prezkuta
4db50a3ecb admin option to disable post content in email notifications for the site 2013-02-23 09:31:34 -07:00
Fabrixxm
7a6d63a1b3 quattro: autocomplete private message To field 2013-02-22 11:02:01 -05:00
Fabrixxm
cc210bae3d quattro: fix item max-width, fix contact serarch autocomplete popup style 2013-02-22 10:45:40 -05:00
fermionic
dbf51229d9 Merge pull request #621 from annando/master
Using "term" table to improve performance, OStatus autocomplete, some more performance stuff
2013-02-21 10:16:50 -08:00
pixelroot
5c6562a996 modified: view/theme/smoothly/style.css 2013-02-21 08:46:30 +01:00
Michael Vogel
0d4d15c73d Merge remote-tracking branch 'upstream/master'
Conflicts:
	mod/admin.php
2013-02-20 21:57:26 +01:00
pixelroot
7a1947b88a modified: view/theme/smoothly/style.css
modified:   view/theme/smoothly/theme.php
2013-02-20 21:03:02 +01:00
Michael Vogel
93143702ed Merge remote-tracking branch 'upstream/master'
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
2013-02-17 12:35:40 +01:00
Michael Vogel
3e58060b30 API: beautify the output of repeated items
Vier: Birthday reminder looks better
2013-02-15 20:14:45 +01:00
fermionic
8e80755a47 Merge pull request #615 from fermionic/20130210-update-frost-mobile
add new Smarty3 templates
2013-02-10 16:12:50 -08:00
Zach Prezkuta
e377fd9d22 add new Smarty3 templates 2013-02-10 17:11:55 -07:00
fermionic
6b6f00c702 Merge pull request #613 from fermionic/20130210-update-frost
update to Frost v0.4
2013-02-10 14:02:53 -08:00
Zach Prezkuta
646c161506 added files for Frost Mobile v0.3 2013-02-10 15:00:20 -07:00
Zach Prezkuta
4d8678e523 update to Frost v0.4 2013-02-10 14:57:44 -07:00
Zach Prezkuta
c1c83115ad Update Frost-mobile to v0.3 2013-02-10 10:21:52 -07:00