Bjoern Schiessle
|
f8563ec583
|
Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update
Conflicts:
lib/util.php
|
2013-09-05 13:39:45 +02:00 |
kondou
|
820fd42161
|
Merge branch 'master' into oc_avatars
|
2013-09-04 12:56:40 +02:00 |
kondou
|
b1d20e0470
|
Have the header avatar to the left of the user name
|
2013-09-03 21:44:32 +02:00 |
kondou
|
ce263df4c7
|
Don't use HTML5 <header> to support avatars in IE8
|
2013-09-03 16:52:15 +02:00 |
Morris Jobke
|
84aba4542d
|
Merge pull request #4702 from owncloud/center-utils
center utils
|
2013-09-03 02:27:52 -07:00 |
kondou
|
65413a95dc
|
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
|
2013-09-03 04:43:11 +02:00 |
Bernhard Posselt
|
87035fc478
|
center utils
|
2013-09-02 19:38:47 +02:00 |
Bjoern Schiessle
|
b918c06be6
|
Merge branch 'master' into sharing_mail_notification_master
Conflicts:
lib/util.php
|
2013-09-02 14:41:46 +02:00 |
Morris Jobke
|
a2f18eabb1
|
Merge pull request #4657 from owncloud/files-controls-fixes
Files controls fixes
|
2013-09-01 23:08:23 -07:00 |
Morris Jobke
|
8a4acf263e
|
Merge pull request #4674 from owncloud/fit-filepicker-new-icons
Fit filesummary for \OC\Preview's new mimetype-icons
|
2013-09-01 23:06:59 -07:00 |
Morris Jobke
|
1e501a8521
|
IE8 fixes
|
2013-09-02 08:05:47 +02:00 |
kondou
|
ebcd2a6b4d
|
Fit filesummary for \OC\Preview's ne mimetype-icons
|
2013-08-31 19:21:51 +02:00 |
Alessandro Cosentino
|
b10a646bc8
|
rename emptyfolder to emptycontent
|
2013-08-31 11:25:11 -04:00 |
Alessandro Cosentino
|
4b32d84314
|
text centered horizontally and vertically in emptycontent div
|
2013-08-31 11:12:07 -04:00 |
kondou
|
5d653753bd
|
Merge branch 'master' into oc_avatars
|
2013-08-31 12:56:36 +02:00 |
Georg Ehrke
|
8ef40277b2
|
Merge master into oc_preview
|
2013-08-30 18:11:18 +02:00 |
Jan-Christoph Borchardt
|
0f5df181a3
|
Merge pull request #4661 from owncloud/separate-app-styles
Move CSS for apps and browser-specific fixes out of main styles.css
|
2013-08-30 09:08:25 -07:00 |
Bjoern Schiessle
|
77adaee645
|
enable user to inform recipients about a shared file by mail
|
2013-08-30 13:53:49 +02:00 |
Jan-Christoph Borchardt
|
9c23ed580a
|
move CSS for browser-specific fixes out of styles.css into new fixes.css
|
2013-08-30 11:42:32 +02:00 |
Jan-Christoph Borchardt
|
cc8e19ad11
|
move CSS for apps out of styles.css into new apps.css
|
2013-08-30 11:38:49 +02:00 |
Jan-Christoph Borchardt
|
c9c4ab22a4
|
Apps management as sticky footer and rename to 'Apps', fix #4622
|
2013-08-30 11:17:31 +02:00 |
Jan-Christoph Borchardt
|
a6c7b210db
|
adjust right padding of controls bar, fix #4650
|
2013-08-30 10:26:41 +02:00 |
Jan-Christoph Borchardt
|
3a2534d3bd
|
fix coding style for controls bar
|
2013-08-30 10:20:39 +02:00 |
kondou
|
0c708be76b
|
Use defaultavatars
|
2013-08-29 14:26:11 +02:00 |
Georg Ehrke
|
b7758d0f8d
|
Merge master into oc_preview
|
2013-08-29 10:50:55 +02:00 |
kondou
|
67c5be9f19
|
Merge branch 'master' into oc_avatars
Conflicts:
3rdparty
|
2013-08-28 16:44:11 +02:00 |
Jan-Christoph Borchardt
|
0c8ac241df
|
fix shadow style of username input box
|
2013-08-28 13:59:23 +02:00 |
Georg Ehrke
|
6f0c1e8d45
|
Merge master into oc_preview
|
2013-08-26 12:24:33 +02:00 |
Morris Jobke
|
653bc9a477
|
Merge pull request #4281 from owncloud/ie8-multiselect
Better ie8 multiselect
|
2013-08-26 02:59:31 -07:00 |
Morris Jobke
|
438e816941
|
Merge pull request #4519 from owncloud/style-fixes
fix minor style issue in the app navigation
|
2013-08-26 00:47:34 -07:00 |
Morris Jobke
|
ec0808ce75
|
fix reviewers concerns
|
2013-08-26 09:44:21 +02:00 |
kondou
|
252548c62c
|
Improve styling & enable avatar-upload at personal page
|
2013-08-25 21:04:45 +02:00 |
kondou
|
fac671b14e
|
Modularize get(), async getAvatar, avatars @ usermgmt
And other small improvements
|
2013-08-25 21:04:04 +02:00 |
kondou
|
0ce35af02a
|
Merge branch 'master' into improve_app-management
Conflicts:
settings/js/apps.js
|
2013-08-21 19:20:25 +02:00 |
Morris Jobke
|
9e5b721a0d
|
fix minor style issue in the app navigation
|
2013-08-19 15:42:51 +02:00 |
Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
kondou
|
7c296a6cf9
|
Move .errormsg from settings-css to .warning in core. Reusable!
|
2013-08-18 17:37:22 +02:00 |
Kondou
|
c7af26ec84
|
Merge pull request #4497 from owncloud/newlines_at_eof_kondou
Add newlines at the end of files
|
2013-08-18 07:16:15 -07:00 |
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
Thomas Müller
|
3d760222d4
|
fixing error page layout
|
2013-08-18 10:30:21 +02:00 |
Morris Jobke
|
60efd93d5d
|
fixes for IE8
|
2013-08-17 11:56:52 +02:00 |
Morris Jobke
|
18769e1348
|
change font on login/install page from black to white
|
2013-08-17 10:26:30 +02:00 |
Jan-Christoph Borchardt
|
1e8849b04e
|
Merge pull request #4314 from owncloud/css-fixes
Design fixes
|
2013-08-16 01:05:29 -07:00 |
Morris Jobke
|
c196985ea3
|
Merge pull request #4032 from owncloud/more-whitespace
More whitespace
|
2013-08-16 01:02:03 -07:00 |
Thomas Müller
|
0aa7dc9b89
|
tixing width and position of wider error messages
|
2013-08-16 00:56:09 +02:00 |
Jan-Christoph Borchardt
|
d2767faf61
|
Merge pull request #4113 from owncloud/delete-fix
Delete icon fix
|
2013-08-15 15:31:42 -07:00 |
Jan-Christoph Borchardt
|
399adf67b0
|
merge master into css-fixes
|
2013-08-16 00:29:43 +02:00 |
Jan-Christoph Borchardt
|
b632b8f4e4
|
force show loading icon also for IE
|
2013-08-16 00:02:11 +02:00 |
Jan-Christoph Borchardt
|
3563eecfff
|
merge master into more-whitespace
|
2013-08-15 23:25:20 +02:00 |
Morris Jobke
|
5fb7aab7a0
|
remove jPlayer css rules from core css file
|
2013-08-15 16:08:49 +02:00 |
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
Jan-Christoph Borchardt
|
cba0f69622
|
increase row height to 50px, properly position everything, checkboxes, actions etc
|
2013-08-14 20:41:20 +02:00 |
Jan-Christoph Borchardt
|
4c0ec974b9
|
Merge pull request #4344 from owncloud/appmgmt-in-navigation
show 'More apps' link to app administration directly in app navigation
|
2013-08-09 08:49:41 -07:00 |
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
Jan-Christoph Borchardt
|
367b248bc0
|
show 'More apps' link to app administration directly in app navigation
|
2013-08-07 18:18:09 +02:00 |
Victor Dubiniuk
|
85f1de884f
|
Better ie8 multiselect
|
2013-08-01 19:59:32 +03:00 |
Jan-Christoph Borchardt
|
ded02e771e
|
wrap code output in error messages, fix #4231
|
2013-07-31 18:08:29 +02:00 |
Jan-Christoph Borchardt
|
31afbb3434
|
remove ugly inset shadow from header
|
2013-07-30 14:47:05 +02:00 |
Jan-Christoph Borchardt
|
f9d1d79929
|
reduce z-index of settings popup, fix #4212
|
2013-07-30 14:43:48 +02:00 |
Jan-Christoph Borchardt
|
1a1c100719
|
fix loading.gif size for both upload and deletion, force visiblity
|
2013-07-30 10:44:01 +02:00 |
Victor Dubiniuk
|
33fe24dc3d
|
Replace delete icon with spinner
|
2013-07-29 19:27:11 +03:00 |
Jörn Friedrich Dreyer
|
a0f574ccd7
|
IE8 login/install screen cleartype fixes and input box borders
|
2013-07-26 10:00:07 +02:00 |
kondou
|
92af840a51
|
Merge branch 'master' into css_cleanup_kondou
Conflicts:
core/css/styles.css
settings/templates/personal.php
|
2013-07-24 20:35:00 +02:00 |
Jörn Friedrich Dreyer
|
5c00804c61
|
force dbs to stay in one line
|
2013-07-24 17:06:52 +02:00 |
Jan-Christoph Borchardt
|
aae26ef5e5
|
slight dark inset text shadow for warnings to increase legibility
|
2013-07-24 12:41:09 +02:00 |
Jan-Christoph Borchardt
|
315613a8f3
|
Bring the Noise
|
2013-07-23 21:33:15 +02:00 |
Jan-Christoph Borchardt
|
c92e0eab97
|
remove superfluous important
|
2013-07-23 21:25:07 +02:00 |
Jan-Christoph Borchardt
|
84fa84d182
|
fix browser rendering issues
|
2013-07-23 18:42:35 +02:00 |
Jan-Christoph Borchardt
|
d1a5dfc397
|
larger log in and installation buttons
|
2013-07-23 18:41:02 +02:00 |
Jan-Christoph Borchardt
|
12990543bc
|
better whitespace for footer
|
2013-07-23 18:41:02 +02:00 |
Jan-Christoph Borchardt
|
837b158914
|
cleaner look and code for primary button
|
2013-07-23 18:41:01 +02:00 |
Jan-Christoph Borchardt
|
6dfbe21446
|
input fields work on any background now
|
2013-07-23 18:41:01 +02:00 |
Jan-Christoph Borchardt
|
c524c04808
|
add some padding to footer
|
2013-07-23 18:41:01 +02:00 |
Jan-Christoph Borchardt
|
dc82e29949
|
adjust labels and input field groups
|
2013-07-23 18:41:00 +02:00 |
Jan-Christoph Borchardt
|
31bf24a116
|
more beautiful warnings
|
2013-07-23 18:36:46 +02:00 |
Jan-Christoph Borchardt
|
74edfd79f5
|
fix and checkstyle for show password toggle
|
2013-07-23 18:36:46 +02:00 |
Jan-Christoph Borchardt
|
acb26c3a52
|
increase button size, adjust remember checkbox
|
2013-07-23 18:36:46 +02:00 |
Jan-Christoph Borchardt
|
9568fefb80
|
move log in button CSS to appropriate place
|
2013-07-23 18:36:46 +02:00 |
Jan-Christoph Borchardt
|
89d0d7f58b
|
adjust text colors for remember and footer
|
2013-07-23 18:36:45 +02:00 |
Jan-Christoph Borchardt
|
622c567c1f
|
larger clickable area for remember log in
|
2013-07-23 18:36:45 +02:00 |
Jan-Christoph Borchardt
|
38bfae57fe
|
sticky footer
|
2013-07-23 18:36:45 +02:00 |
Jan-Christoph Borchardt
|
fd4638c229
|
primary button adjustments
|
2013-07-23 18:36:45 +02:00 |
Jan-Christoph Borchardt
|
14edfa52ea
|
input field adjustments for new full-color background on log in
|
2013-07-23 18:36:44 +02:00 |
Jan-Christoph Borchardt
|
c478234f6a
|
fix general reset CSS issue which caused gradient background to cut off
|
2013-07-23 18:36:44 +02:00 |
Jan-Christoph Borchardt
|
107ace42b8
|
rip out unneeded #login div, replace with existing body-login
|
2013-07-23 18:36:44 +02:00 |
Jan-Christoph Borchardt
|
9982f47ab5
|
initial WIP for cleaner log in page
|
2013-07-23 18:36:44 +02:00 |
Thomas Müller
|
2a42021815
|
Merge branch 'master' into delete-fix
Conflicts:
core/css/styles.css
|
2013-07-23 16:24:34 +02:00 |
Victor Dubiniuk
|
cdb993ad69
|
Explicit ie8 fallback
|
2013-07-23 17:13:12 +03:00 |
Jan-Christoph Borchardt
|
35fc149ef0
|
deactivate show password toggle for IE
|
2013-07-19 15:17:28 +02:00 |
Jan-Christoph Borchardt
|
197c979d26
|
use background image instead of img for Files delete icon
|
2013-07-18 18:40:09 +02:00 |
Jan-Christoph Borchardt
|
cab792323d
|
make delete icon less intrusive again, only on hover
|
2013-07-18 18:31:56 +02:00 |
kondou
|
4cd87549e1
|
Close.png instead of delete.png for close dialogs
|
2013-07-10 04:39:22 +02:00 |
Jan-Christoph Borchardt
|
b44cab5acc
|
prevent ugly selection effect on accidental selection, fix #3713
|
2013-07-09 22:04:22 +02:00 |
Jan-Christoph Borchardt
|
bbad1ad21e
|
more whitespace for user menu
|
2013-07-09 22:04:21 +02:00 |
Jan-Christoph Borchardt
|
583d068590
|
more small whitespace fixes for the app list
|
2013-07-09 22:04:21 +02:00 |
Jan-Christoph Borchardt
|
a5c84768f1
|
more whitespace WIP 2
|
2013-07-09 22:04:21 +02:00 |
Jan-Christoph Borchardt
|
87d1e72f9c
|
more whitespace WIP
|
2013-07-09 22:04:21 +02:00 |
Jan-Christoph Borchardt
|
7eb6e8d5b5
|
app styles: remove bottom padding. Settings should be last in list instead of permanent
|
2013-07-09 22:04:20 +02:00 |
raghunayyar
|
aca2c93839
|
Removes Borders from the left navigation.
|
2013-07-09 22:04:20 +02:00 |
kondou
|
4818e0062e
|
General CSS cleanup
|
2013-07-09 16:08:32 +02:00 |
Jan-Christoph Borchardt
|
8d8f99fbc4
|
Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
|
2013-07-08 06:56:29 -07:00 |
Thomas Tanghus
|
be22d28eb9
|
Merge pull request #3576 from owncloud/jquery.multiselect-1.13
Update to jquery.multiselect 1.13
|
2013-06-27 07:50:47 -07:00 |
Jan-Christoph Borchardt
|
1f518025a3
|
standardize on 32px loading spinner, decrease size in CSS where needed
|
2013-06-17 13:20:02 +02:00 |
Jan-Christoph Borchardt
|
9e78e6b2e5
|
differentiate delete from close icon
|
2013-06-17 12:14:36 +02:00 |
Jan-Christoph Borchardt
|
06fd7e0d21
|
remove dotted outlines in Firefox, fix #3712
|
2013-06-14 14:08:04 +02:00 |
Thomas Tanghus
|
3584d48d65
|
Merge pull request #3679 from owncloud/multiselect-fixes
Multiselect fixes
|
2013-06-12 09:52:15 -07:00 |
Jan-Christoph Borchardt
|
cdedfb6f37
|
multiselect: up min-width of group multiselect to 150px
|
2013-06-11 18:23:29 +02:00 |
Jan-Christoph Borchardt
|
0bcb04398d
|
multiselect: fixed 'add group' interface a bit
|
2013-06-11 18:21:13 +02:00 |
Jan-Christoph Borchardt
|
686797eb6d
|
multiselect: more breathing space for entries
|
2013-06-11 18:08:47 +02:00 |
Jan-Christoph Borchardt
|
27996d1c64
|
multiselect: drop shadow for better focus
|
2013-06-11 18:04:33 +02:00 |
Jan-Christoph Borchardt
|
35e7b64cc2
|
multiselect: do not cut off group names
|
2013-06-11 18:04:11 +02:00 |
Jan-Christoph Borchardt
|
e6a4721f64
|
checkstyle: add space after colon
|
2013-06-11 18:02:52 +02:00 |
Jan-Christoph Borchardt
|
09ff9b2a2c
|
remove leading spaces
|
2013-06-11 18:01:50 +02:00 |
Jan-Christoph Borchardt
|
abfbd9b136
|
feedback for hover/tap on breadcrumbs
|
2013-06-11 14:51:29 +02:00 |
Jan-Christoph Borchardt
|
651f1b0995
|
better contrast and grouping for blocks in personal settings through darker background color
|
2013-06-11 14:51:06 +02:00 |
Jan-Christoph Borchardt
|
2a936670ce
|
better contrast for controls bar
|
2013-06-11 14:50:23 +02:00 |
opensaucesystems
|
d987bea635
|
Added input[type="url"] to styles.css
|
2013-06-04 16:04:29 +02:00 |
Thomas Tanghus
|
861fe54f2b
|
Forgot the css.
|
2013-06-04 00:19:42 +02:00 |
Thomas Tanghus
|
afd723fdcd
|
Let the content determine overflow.
|
2013-06-03 02:11:01 +02:00 |
Thomas Tanghus
|
901b1150ff
|
Replacement for jquery.dialog to fit better with ownCloud design.
|
2013-06-02 21:52:59 +02:00 |
Jörn Friedrich Dreyer
|
da55c76168
|
Merge pull request #2778 from Kondou-ger/optimize_pictures
Optimize pictures with optipng.
|
2013-05-28 04:48:38 -07:00 |
Thomas Tanghus
|
c3779555aa
|
Dialogs: Home folder icon instead of '/'.
|
2013-05-17 16:18:40 +02:00 |
Thomas Tanghus
|
a0b79f5649
|
Dialogs: Loose up-button.
|
2013-05-17 06:48:24 +02:00 |
Thomas Tanghus
|
e60d86bdd1
|
Dialogs: Make slug show last dir emphasized.
|
2013-05-17 06:16:51 +02:00 |
Thomas Tanghus
|
152e275c8a
|
Various cleanups in OC.dialogs
|
2013-05-17 04:54:08 +02:00 |
Thomas Tanghus
|
c8bbf90feb
|
Port OC.dialogs to use octemplate except for prompt() and form().
Also load octemplate per default.
|
2013-05-16 13:41:04 +02:00 |
Raghu Nayyar
|
2bcb64e781
|
Merge pull request #3114 from owncloud/update-notification
Add an update notification
|
2013-04-26 21:12:38 -07:00 |
Bart Visscher
|
67b6ee661d
|
Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen
Improve the password reset screen.
|
2013-04-26 05:33:09 -07:00 |
raghunayyar
|
175fc0c737
|
Clubbing Exact styles together.
|
2013-04-24 23:47:39 +05:30 |
Lukas Reschke
|
d41b600725
|
Add an update notification on every page for admin users
|
2013-04-24 18:47:38 +02:00 |
kondou
|
e15afcb011
|
Add space around checkboxes.
|
2013-04-24 11:58:12 +02:00 |
kondou
|
e8bb998ecc
|
Fix #3095.
|
2013-04-24 11:13:12 +02:00 |
kondou
|
f1bcf6ef02
|
Improve the password reset screen.
Fixing #2752
|
2013-04-23 12:31:13 +02:00 |
Jan-Christoph Borchardt
|
c7a17efc01
|
Merge pull request #2983 from owncloud/style-details
Style details
|
2013-04-22 07:12:19 -07:00 |
Raghu Nayyar
|
a3e5da834b
|
Merge pull request #2925 from owncloud/navigation-icon-fix
fix navigation hover effect, documentation
|
2013-04-17 10:20:36 -07:00 |
Jan-Christoph Borchardt
|
d83adb8b84
|
remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px
|
2013-04-17 17:36:30 +02:00 |
Jan-Christoph Borchardt
|
3d47c62a20
|
apply navigation hover effect directly to img and span, cleaner code
|
2013-04-17 17:23:12 +02:00 |
Jan-Christoph Borchardt
|
21bcb95e2a
|
move warning and error states together in CSS, to be cleaned up
|
2013-04-17 17:15:34 +02:00 |
Jan-Christoph Borchardt
|
9f58166339
|
make textarea inherit ownCloud font instead of using monospace
|
2013-04-17 16:30:42 +02:00 |
Jan-Christoph Borchardt
|
ca323e56c2
|
correct primary color to #1d2d44 where slightly wrong
|
2013-04-17 11:55:27 +02:00 |
kondou
|
0f86ed3ad5
|
Shorten CSS colorcodes
Only need to be three digits.
|
2013-04-15 21:07:45 +02:00 |
Bernhard Posselt
|
19526c9cf6
|
also show black background on links that are active, fixes the news app that doesnt show the bg for folders correctly
|
2013-04-15 20:29:45 +02:00 |
Jan-Christoph Borchardt
|
846f77ed92
|
additional comments
|
2013-04-14 19:30:16 +02:00 |
Jan-Christoph Borchardt
|
694c080dd2
|
fix navigation hover effect, documentation
|
2013-04-14 19:25:46 +02:00 |
Bernhard Posselt
|
210bec0d31
|
Merge pull request #2910 from owncloud/password-toggle-db-2
Implements Toggle for Database Password.
|
2013-04-13 06:10:41 -07:00 |
raghunayyar
|
59be6a910c
|
Implements Toggle for Database Password.
|
2013-04-13 09:45:30 +05:30 |
Jan-Christoph Borchardt
|
c9c83c6185
|
add .disabled class so it can be used for simple a buttons as well
|
2013-04-12 19:18:11 +02:00 |
Bernhard Posselt
|
a56dc4bc94
|
dont overwrite background image when hovering over button
|
2013-04-12 14:30:16 +02:00 |
Jan-Christoph Borchardt
|
2e04a35277
|
use proper sans-serif font-stack
|
2013-04-11 17:20:24 +02:00 |
Bernhard Posselt
|
a028ba930a
|
Merge pull request #2853 from owncloud/long-file-names
Application Names Ellipsise when the name length exceeds the width of the navigation.
|
2013-04-10 15:02:37 -07:00 |