summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4339 from owncloud/mimetype-defaultsThomas Müller2013-08-171-0/+9
|\ | | | | Add the option to provide templates for newly created files
| * Merge branch 'master' into mimetype-defaultsThomas Müller2013-08-1687-509/+865
| |\ | | | | | | | | | | | | Conflicts: apps/files/ajax/newfile.php
| * | add template for html filesRobin Appelman2013-08-071-0/+9
| | |
* | | Merge pull request #4482 from owncloud/remove_cancel_button_filepickerKondou2013-08-171-4/+0
|\ \ \ | | | | | | | | Remove cancel button from filepicker
| * | | Remove cancel button from filepickerkondou2013-08-171-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-colorMorris Jobke2013-08-172-5/+31
|\ \ \ \ | | | | | | | | | | change font on login/install page from black to white
| * | | | fixes for IE8Morris Jobke2013-08-171-3/+3
| | | | |
| * | | | change font on login/install page from black to whiteMorris Jobke2013-08-172-5/+31
| |/ / /
* | | | Merge pull request #4471 from owncloud/password-iconThomas Müller2013-08-174-4/+7
|\ \ \ \ | | | | | | | | | | use proper password icon, three dots are 'more'
| * | | | use proper password icon, three dots are 'more'Jan-Christoph Borchardt2013-08-164-4/+7
| |/ / /
* | | | Merge pull request #4476 from owncloud/doc-on-masterThomas Müller2013-08-172-0/+0
|\ \ \ \ | | | | | | | | | | fix difference between packaged version and master
| * | | | fix difference between packaged version and masterMorris Jobke2013-08-172-0/+0
| |/ / /
* / / / remove ru_RU - fixes #3135Thomas Müller2013-08-171-9/+0
|/ / /
* | | Merge pull request #4314 from owncloud/css-fixesJan-Christoph Borchardt2013-08-163-27/+14
|\ \ \ | | | | | | | | Design fixes
| * | | tixing width and position of wider error messagesThomas Müller2013-08-162-1/+6
| | | |
| * | | merge master into css-fixesJan-Christoph Borchardt2013-08-1688-534/+970
| |\ \ \ | | | |/ | | |/|
| * | | wrap code output in error messages, fix #4231Jan-Christoph Borchardt2013-07-311-0/+4
| | | |
| * | | remove unused and never to be used paginationJan-Christoph Borchardt2013-07-311-22/+0
| | | |
| * | | remove ugly inset shadow from headerJan-Christoph Borchardt2013-07-301-1/+4
| | | |
| * | | reduce z-index of settings popup, fix #4212Jan-Christoph Borchardt2013-07-301-1/+1
| | | |
* | | | Merge pull request #4032 from owncloud/more-whitespaceMorris Jobke2013-08-161-47/+82
|\ \ \ \ | | | | | | | | | | More whitespace
| * \ \ \ merge master into more-whitespaceJan-Christoph Borchardt2013-08-15100-809/+1439
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | prevent ugly selection effect on accidental selection, fix #3713Jan-Christoph Borchardt2013-07-091-0/+4
| | | | |
| * | | | more whitespace for user menuJan-Christoph Borchardt2013-07-091-4/+19
| | | | |
| * | | | more small whitespace fixes for the app listJan-Christoph Borchardt2013-07-091-5/+5
| | | | |
| * | | | more whitespace WIP 2Jan-Christoph Borchardt2013-07-091-3/+23
| | | | |
| * | | | more whitespace WIPJan-Christoph Borchardt2013-07-091-25/+38
| | | | |
| * | | | app styles: remove bottom padding. Settings should be last in list instead ↵Jan-Christoph Borchardt2013-07-091-1/+0
| | | | | | | | | | | | | | | | | | | | of permanent
| * | | | Removes Borders from the left navigation.raghunayyar2013-07-091-11/+0
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-169-30/+41
| | | | |
* | | | | Merge pull request #4113 from owncloud/delete-fixJan-Christoph Borchardt2013-08-156-11/+36
|\ \ \ \ \ | |_|/ / / |/| | | | Delete icon fix
| * | | | force show loading icon also for IEJan-Christoph Borchardt2013-08-161-0/+2
| | | | |
| * | | | fix loading.gif size for both upload and deletion, force visiblityJan-Christoph Borchardt2013-07-301-1/+7
| | | | |
| * | | | Replace delete icon with spinnerVictor Dubiniuk2013-07-291-2/+2
| | | | |
| * | | | Merge branch 'master' into delete-fixThomas Müller2013-07-237-12/+36
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/css/styles.css
| * | | | | Explicit ie8 fallbackVictor Dubiniuk2013-07-231-0/+4
| | | | | |
| * | | | | remove unnecessary tipsy for Files deleteJan-Christoph Borchardt2013-07-181-1/+0
| | | | | |
| * | | | | use background image instead of img for Files delete iconJan-Christoph Borchardt2013-07-181-0/+4
| | | | | |
| * | | | | make delete icon less intrusive again, only on hoverJan-Christoph Borchardt2013-07-185-10/+20
| | | | | |
* | | | | | Merge pull request #4354 from ↵Thomas Müller2013-08-151-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 filterAttrJörn Friedrich Dreyer2013-08-081-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | remove jPlayer css rules from core css fileMorris Jobke2013-08-152-6/+3
| | | | | |
* | | | | | fixing all broken translation filesThomas Müller2013-08-1578-312/+312
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1578-389/+347
| | | | | |
* | | | | | Merge pull request #4304 from tripflex/lostpw-themedThomas Müller2013-08-141-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use theme name and title for password reset
| * | | | | | use getName instead of getTitleMyles McNamara2013-08-081-1/+1
| | | | | | |
| * | | | | | fix syntax errorMyles McNamara2013-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | accidentally had ; included, and changed concatenating
| * | | | | | use theme name and title for password resetMyles McNamara2013-08-031-1/+2
| | | | | | | | | | | | | | | | | | | | | password reset email uses owncloud, updated to use theme settings
* | | | | | | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-6/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use plural translations
| * | | | | | | Use plural translationskondou2013-08-091-6/+4
| | | | | | | |