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 |
|
kondou
|
65413a95dc
|
Merge branch 'master' into oc_avatars
Conflicts:
config/config.sample.php
|
2013-09-03 04:43:11 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|