Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4339 from owncloud/mimetype-defaults | Thomas Müller | 2013-08-17 | 1 | -0/+9 |
|\ | | | | | Add the option to provide templates for newly created files | ||||
| * | Merge branch 'master' into mimetype-defaults | Thomas Müller | 2013-08-16 | 87 | -509/+865 |
| |\ | | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php | ||||
| * | | add template for html files | Robin Appelman | 2013-08-07 | 1 | -0/+9 |
| | | | |||||
* | | | Merge pull request #4482 from owncloud/remove_cancel_button_filepicker | Kondou | 2013-08-17 | 1 | -4/+0 |
|\ \ \ | | | | | | | | | Remove cancel button from filepicker | ||||
| * | | | Remove cancel button from filepicker | kondou | 2013-08-17 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | Having the cancel button in the bottom right corner was a bit confusing. It's useless anyways, since there's a X in the top right. | ||||
* | | | | Merge pull request #4475 from owncloud/brighter-font-color | Morris Jobke | 2013-08-17 | 2 | -5/+31 |
|\ \ \ \ | | | | | | | | | | | change font on login/install page from black to white | ||||
| * | | | | fixes for IE8 | Morris Jobke | 2013-08-17 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | change font on login/install page from black to white | Morris Jobke | 2013-08-17 | 2 | -5/+31 |
| |/ / / | |||||
* | | | | Merge pull request #4471 from owncloud/password-icon | Thomas Müller | 2013-08-17 | 4 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | use proper password icon, three dots are 'more' | ||||
| * | | | | use proper password icon, three dots are 'more' | Jan-Christoph Borchardt | 2013-08-16 | 4 | -4/+7 |
| |/ / / | |||||
* | | | | Merge pull request #4476 from owncloud/doc-on-master | Thomas Müller | 2013-08-17 | 2 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | fix difference between packaged version and master | ||||
| * | | | | fix difference between packaged version and master | Morris Jobke | 2013-08-17 | 2 | -0/+0 |
| |/ / / | |||||
* / / / | remove ru_RU - fixes #3135 | Thomas Müller | 2013-08-17 | 1 | -9/+0 |
|/ / / | |||||
* | | | Merge pull request #4314 from owncloud/css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 3 | -27/+14 |
|\ \ \ | | | | | | | | | Design fixes | ||||
| * | | | tixing width and position of wider error messages | Thomas Müller | 2013-08-16 | 2 | -1/+6 |
| | | | | |||||
| * | | | merge master into css-fixes | Jan-Christoph Borchardt | 2013-08-16 | 88 | -534/+970 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | wrap code output in error messages, fix #4231 | Jan-Christoph Borchardt | 2013-07-31 | 1 | -0/+4 |
| | | | | |||||
| * | | | remove unused and never to be used pagination | Jan-Christoph Borchardt | 2013-07-31 | 1 | -22/+0 |
| | | | | |||||
| * | | | remove ugly inset shadow from header | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+4 |
| | | | | |||||
| * | | | reduce z-index of settings popup, fix #4212 | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #4032 from owncloud/more-whitespace | Morris Jobke | 2013-08-16 | 1 | -47/+82 |
|\ \ \ \ | | | | | | | | | | | More whitespace | ||||
| * \ \ \ | merge master into more-whitespace | Jan-Christoph Borchardt | 2013-08-15 | 100 | -809/+1439 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| * | | | | prevent ugly selection effect on accidental selection, fix #3713 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | more whitespace for user menu | Jan-Christoph Borchardt | 2013-07-09 | 1 | -4/+19 |
| | | | | | |||||
| * | | | | more small whitespace fixes for the app list | Jan-Christoph Borchardt | 2013-07-09 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | more whitespace WIP 2 | Jan-Christoph Borchardt | 2013-07-09 | 1 | -3/+23 |
| | | | | | |||||
| * | | | | more whitespace WIP | Jan-Christoph Borchardt | 2013-07-09 | 1 | -25/+38 |
| | | | | | |||||
| * | | | | app styles: remove bottom padding. Settings should be last in list instead ↵ | Jan-Christoph Borchardt | 2013-07-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | of permanent | ||||
| * | | | | Removes Borders from the left navigation. | raghunayyar | 2013-07-09 | 1 | -11/+0 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-16 | 9 | -30/+41 |
| | | | | | |||||
* | | | | | Merge pull request #4113 from owncloud/delete-fix | Jan-Christoph Borchardt | 2013-08-15 | 6 | -11/+36 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Delete icon fix | ||||
| * | | | | force show loading icon also for IE | Jan-Christoph Borchardt | 2013-08-16 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | fix loading.gif size for both upload and deletion, force visiblity | Jan-Christoph Borchardt | 2013-07-30 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Replace delete icon with spinner | Victor Dubiniuk | 2013-07-29 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge branch 'master' into delete-fix | Thomas Müller | 2013-07-23 | 7 | -12/+36 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css | ||||
| * | | | | | Explicit ie8 fallback | Victor Dubiniuk | 2013-07-23 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | remove unnecessary tipsy for Files delete | Jan-Christoph Borchardt | 2013-07-18 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | use background image instead of img for Files delete icon | Jan-Christoph Borchardt | 2013-07-18 | 1 | -0/+4 |
| | | | | | | |||||
| * | | | | | make delete icon less intrusive again, only on hover | Jan-Christoph Borchardt | 2013-07-18 | 5 | -10/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #4354 from ↵ | Thomas Müller | 2013-08-15 | 1 | -3/+3 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_2711_shared_icon_disappears_on_firefox fix #2711 using a custom event, also use css selectors over filterAttr | ||||
| * | | | | | | fix #2711 using a custom event, also use css selectors over filterAttr | Jörn Friedrich Dreyer | 2013-08-08 | 1 | -3/+3 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | remove jPlayer css rules from core css file | Morris Jobke | 2013-08-15 | 2 | -6/+3 |
| | | | | | | |||||
* | | | | | | fixing all broken translation files | Thomas Müller | 2013-08-15 | 78 | -312/+312 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-08-15 | 78 | -389/+347 |
| | | | | | | |||||
* | | | | | | Merge pull request #4304 from tripflex/lostpw-themed | Thomas Müller | 2013-08-14 | 1 | -1/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | use theme name and title for password reset | ||||
| * | | | | | | use getName instead of getTitle | Myles McNamara | 2013-08-08 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | fix syntax error | Myles McNamara | 2013-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | accidentally had ; included, and changed concatenating | ||||
| * | | | | | | use theme name and title for password reset | Myles McNamara | 2013-08-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | password reset email uses owncloud, updated to use theme settings | ||||
* | | | | | | | Merge pull request #4376 from owncloud/use_plurals | Jörn Friedrich Dreyer | 2013-08-14 | 1 | -6/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use plural translations | ||||
| * | | | | | | | Use plural translations | kondou | 2013-08-09 | 1 | -6/+4 |
| | | | | | | | |