Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5182 from owncloud/fix-sharring-with-password-screen | Morris Jobke | 2013-10-10 | 1 | -0/+1 |
|\ | | | | | Fix password screen for public shares | ||||
| * | Fix password screen for public shares | Morris Jobke | 2013-10-07 | 1 | -0/+1 |
| | | | | | | | | | | * Works in IE8, 9, 10, Firefox 24 and Chromium 30 * Credits to Julian Müller @Julian1998 | ||||
* | | Merge pull request #5244 from owncloud/more-css-fixes | Morris Jobke | 2013-10-10 | 2 | -2/+4 |
|\ \ | | | | | | | More css fixes | ||||
| * | | properly indent contents of folders for app styles, to line up with text | Jan-Christoph Borchardt | 2013-10-06 | 1 | -2/+2 |
| | | | |||||
| * | | improve clickability of footer link | Jan-Christoph Borchardt | 2013-10-06 | 1 | -0/+2 |
| |/ | |||||
* / | Fixed login warning style #5065 | Vincent Petry | 2013-10-09 | 1 | -2/+1 |
|/ | | | | Removed bold so it takes less space and set alignment to left. | ||||
* | more elegant style for Personal and Admin settings | Jan-Christoph Borchardt | 2013-10-05 | 1 | -5/+11 |
| | |||||
* | Merge pull request #5136 from owncloud/design-fixes | Morris Jobke | 2013-10-04 | 2 | -2/+7 |
|\ | | | | | Design fixes | ||||
| * | prevent hover effect when settings are open | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+6 |
| | | |||||
| * | fix disabled buttons not showing icons | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+1 |
| | | |||||
* | | remove specific border-radius for .primary button as it should be specific ↵ | Jan-Christoph Borchardt | 2013-10-04 | 1 | -1/+3 |
| | | | | | | | | to log in instead | ||||
* | | merge master into input-simplify | Jan-Christoph Borchardt | 2013-10-04 | 2 | -11/+53 |
|\| | |||||
| * | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-04 | 1 | -10/+52 |
| |\ | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php apps/files/templates/index.php | ||||
| | * | Merge pull request #5109 from owncloud/controls-bar-height | Morris Jobke | 2013-10-04 | 1 | -10/+48 |
| | |\ | | | | | | | | | Controls bar height | ||||
| | | * | increase height of controls bar and elements to more clickable 44px | Jan-Christoph Borchardt | 2013-10-04 | 1 | -10/+48 |
| | | | | |||||
| | * | | Hide defaultavatar in #header and don't darken proper avatars in #header | kondou | 2013-10-04 | 1 | -0/+4 |
| | |/ | |||||
| * | | Merge branch 'master' into sharing_mail_notification_master | Thomas Müller | 2013-10-02 | 2 | -72/+69 |
| |\| | | | | | | | | | | | | | Conflicts: core/css/share.css | ||||
| * | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 1 | -1/+2 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: lib/private/util.php | ||||
| * \ \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 2 | -4/+20 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/index.php | ||||
| * \ \ \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-05 | 1 | -0/+1 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php | ||||
| * \ \ \ \ | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-02 | 3 | -294/+342 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php | ||||
| * | | | | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | better style and color for warning and success feedback on inputs | Jan-Christoph Borchardt | 2013-10-03 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | simplify input elements for less cognitive load. No box-shadow, no ↵ | Jan-Christoph Borchardt | 2013-10-03 | 2 | -60/+56 |
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | text-shadow, smaller border-radius | ||||
* | | | | | | just fix whitespace stuff | Morris Jobke | 2013-10-02 | 1 | -64/+66 |
| | | | | | | |||||
* | | | | | | remove box-shadows for header, navigation and controls bar - looks sharper ↵ | Jan-Christoph Borchardt | 2013-10-02 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | and less washed out | ||||
* | | | | | | reduce rounded corners of Share and Versions dropdown | Jan-Christoph Borchardt | 2013-10-02 | 1 | -3/+3 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | followup of #4032 - makes the settings-button bigger and adds again padding ↵ | Alessandro Cosentino | 2013-09-29 | 1 | -1/+2 |
| |_|_|/ |/| | | | | | | | | | | | at bottom of app-navigation | ||||
* | | | | Merge pull request #4835 from owncloud/fix-apps-height | Morris Jobke | 2013-09-15 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | use lineheight instead of padding and height | ||||
| * | | | | use lineheight instead of padding and height | Bernhard Posselt | 2013-09-13 | 1 | -2/+2 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-04 | 1 | -0/+1 |
|\| | | | |||||
| * | | | Merge pull request #4702 from owncloud/center-utils | Morris Jobke | 2013-09-03 | 1 | -0/+1 |
| |\ \ \ | | |_|/ | |/| | | center utils | ||||
| | * | | center utils | Bernhard Posselt | 2013-09-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Have the header avatar to the left of the user name | kondou | 2013-09-03 | 1 | -5/+15 |
| | | | | |||||
* | | | | Don't use HTML5 <header> to support avatars in IE8 | kondou | 2013-09-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into oc_avatars | kondou | 2013-09-03 | 2 | -10/+40 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php | ||||
| * | | | Merge pull request #4657 from owncloud/files-controls-fixes | Morris Jobke | 2013-09-01 | 1 | -7/+13 |
| |\ \ \ | | | | | | | | | | | Files controls fixes | ||||
| | * | | | adjust right padding of controls bar, fix #4650 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | fix coding style for controls bar | Jan-Christoph Borchardt | 2013-08-30 | 1 | -7/+13 |
| | | | | | |||||
| * | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-icons | Morris Jobke | 2013-09-01 | 2 | -2/+19 |
| |\ \ \ \ | | | | | | | | | | | | | Fit filesummary for \OC\Preview's new mimetype-icons | ||||
| | * | | | | IE8 fixes | Morris Jobke | 2013-09-02 | 1 | -0/+4 |
| | | | | | | |||||
| | * | | | | Fit filesummary for \OC\Preview's ne mimetype-icons | kondou | 2013-08-31 | 1 | -2/+15 |
| | | |/ / | | |/| | | |||||
| * | | | | rename emptyfolder to emptycontent | Alessandro Cosentino | 2013-08-31 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | text centered horizontally and vertically in emptycontent div | Alessandro Cosentino | 2013-08-31 | 1 | -1/+8 |
| |/ / / | |||||
* | | | | Merge branch 'master' into oc_avatars | kondou | 2013-08-31 | 3 | -284/+302 |
|\| | | | |||||
| * | | | Merge master into oc_preview | Georg Ehrke | 2013-08-30 | 3 | -283/+300 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #4661 from owncloud/separate-app-styles | Jan-Christoph Borchardt | 2013-08-30 | 3 | -283/+282 |
| | |\ \ \ | | | | | | | | | | | | | Move CSS for apps and browser-specific fixes out of main styles.css | ||||
| | | * | | | move CSS for browser-specific fixes out of styles.css into new fixes.css | Jan-Christoph Borchardt | 2013-08-30 | 2 | -44/+46 |
| | | | | | | |||||
| | | * | | | move CSS for apps out of styles.css into new apps.css | Jan-Christoph Borchardt | 2013-08-30 | 2 | -239/+236 |
| | | | |/ | | | |/| | |||||
| | * / | | Apps management as sticky footer and rename to 'Apps', fix #4622 | Jan-Christoph Borchardt | 2013-08-30 | 1 | -0/+18 |
| | |/ / |