summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4735 from owncloud/multiple_mimetypes_rawlistThomas Tanghus2013-09-111-1/+8
|\ | | | | Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
| * Use shorter array-conversionkondou2013-09-061-3/+1
| |
| * Only use mimetype_list and clean up a bitkondou2013-09-051-10/+12
| |
| * Make it possible to pass rawlist.php an JSON array, to filter by more than ↵kondou2013-09-051-4/+11
| | | | | | | | one mimetype
* | Merge pull request #4784 from owncloud/ocdialog_option_setterThomas Tanghus2013-09-111-6/+10
|\ \ | | | | | | Fix setting ocdialog options after initialization.
| * | Fix double destroy on escape.Thomas Tanghus2013-09-111-1/+2
| | |
| * | Remove console loggingThomas Tanghus2013-09-101-1/+0
| | |
| * | Fix setting ocdialog options after initialization.Thomas Tanghus2013-09-101-5/+9
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-112-4/+14
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-103-12/+36
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-4/+20
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-073-0/+24
| |
* | Merge pull request #4704 from owncloud/rename-lostpassword-controllerBart Visscher2013-09-052-26/+26
|\ \ | |/ |/| Use the namespaced variation of the classname.
| * Merge branch 'master' into rename-lostpassword-controllerThomas Müller2013-09-0412-51/+116
| |\ | | | | | | | | | | | | Conflicts: core/lostpassword/controller.php
| * | Use the namespaced variation of the classname.Bart Visscher2013-09-022-26/+26
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-054-20/+46
| |/ |/|
* | Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-033-5/+5
|\ \ | | | | | | Clean up \OC\Util
| * \ Merge branch 'master' into clean_up_utilkondou2013-09-02177-619/+3800
| |\ \ | | | | | | | | | | | | | | | | Conflicts: lib/base.php
| * \ \ Merge branch 'master' into clean_up_utilkondou2013-08-20107-649/+557
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/util.php
| * | | | Fix some naming and spacing in lib/util.phpkondou2013-08-181-1/+1
| | | | |
| * | | | Clean up \OC\Utilkondou2013-08-153-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing
* | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
|\ \ \ \ \ | | | | | | | | | | | | Add previews to OC.dialogs.filepicker()
| * | | | | Add previews to OC.dialogs.filepicker(); Fix #4697kondou2013-09-031-1/+5
| | | | | |
* | | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bindChristopher2013-09-031-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use on to add event listener instead of deprecated jquery bind
| * | | | | | use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
| | | | | | |
* | | | | | | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-031-20/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Texteditor polishing
| * | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering ↵Jörn Friedrich Dreyer2013-08-161-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crumbs into full screen editor
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-032-4/+27
| | | | | | | |
* | | | | | | | Merge pull request #4702 from owncloud/center-utilsMorris Jobke2013-09-031-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | center utils
| * | | | | | | | center utilsBernhard Posselt2013-09-021-0/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #4695 from owncloud/placeholder-hslMorris Jobke2013-09-031-8/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | RGB -> HSL
| * | | | | | | | placeholder.js: fix typoJan-Christoph Borchardt2013-09-021-1/+1
| | | | | | | | |
| * | | | | | | | placeholder.js: adjust saturation and lightness valuesJan-Christoph Borchardt2013-09-021-2/+2
| | | | | | | | |
| * | | | | | | | RGB -> HSLMorris Jobke2013-09-021-7/+4
| | |_|/ / / / / | |/| | | | | |
* / | | | | | | Use provided mimetype on open. Fix #4696Thomas Tanghus2013-09-021-2/+2
|/ / / / / / /
* | | | | | | Merge pull request #4657 from owncloud/files-controls-fixesMorris Jobke2013-09-011-7/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Files controls fixes
| * | | | | | | adjust right padding of controls bar, fix #4650Jan-Christoph Borchardt2013-08-301-2/+2
| | | | | | | |
| * | | | | | | fix coding style for controls barJan-Christoph Borchardt2013-08-301-7/+13
| | | | | | | |
* | | | | | | | Merge pull request #4674 from owncloud/fit-filepicker-new-iconsMorris Jobke2013-09-012-2/+19
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | Fit filesummary for \OC\Preview's new mimetype-icons
| * | | | | | | IE8 fixesMorris Jobke2013-09-021-0/+4
| | | | | | | |
| * | | | | | | Fit filesummary for \OC\Preview's ne mimetype-iconskondou2013-08-311-2/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-011-1/+8
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | centers text message in empty-content page (files and files_trashbin apps)
| * | | | | | rename emptyfolder to emptycontentAlessandro Cosentino2013-08-311-5/+5
| | | | | | |
| * | | | | | text centered horizontally and vertically in emptycontent divAlessandro Cosentino2013-08-311-1/+8
| |/ / / / /
* / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-0151-15/+78
|/ / / / /
* | | | | Merge master into oc_previewGeorg Ehrke2013-08-3031-317/+489
|\ \ \ \ \
| * \ \ \ \ Merge pull request #4661 from owncloud/separate-app-stylesJan-Christoph Borchardt2013-08-303-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.cssJan-Christoph Borchardt2013-08-302-44/+46
| | | | | | |
| | * | | | | move CSS for apps out of styles.css into new apps.cssJan-Christoph Borchardt2013-08-302-239/+236
| | | | | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-3026-26/+177
| | | | | | |