summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1816 from nextcloud/settings_nopngMorris Jobke2016-10-206-0/+0
|\ | | | | Get rid of settings/img/*.png
| * Get rid of settings/img/*.pngRoeland Jago Douma2016-10-206-0/+0
| | | | | | | | | | | | We only use SVG icons so no need to ship them! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #1768 from nextcloud/more-filepickerJan-Christoph Borchardt2016-10-207-76/+114
|\ \ | |/ |/| More filepicker improvements
| * Improve the stylingMorris Jobke2016-10-202-2/+6
| | | | | | | | | | | | | | * remove the scrollbar (content did an overflow due to a min-width) * have proper padding on the right too - padding is 15px on all sides for .oc-dialog Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * add proper left margin for filepicker titleJan-Christoph Borchardt2016-10-191-0/+1
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * fix filepicker with no mimetype filterRobin Appelman2016-10-191-3/+6
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * fix file exist dialog stylingRobin Appelman2016-10-191-0/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * filepicker: improve layout and styleJan-Christoph Borchardt2016-10-193-22/+26
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Use a table for the filepicker list and add size columnRobin Appelman2016-10-194-41/+57
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * use fileclient to get the filelist for the filepickerRobin Appelman2016-10-191-12/+17
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Allow selecting a folder after using the breadcrumbRobin Appelman2016-10-191-1/+1
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * Allow selecting the root folderRobin Appelman2016-10-191-1/+5
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #1813 from nextcloud/remove-unused-jsRoeland Jago Douma2016-10-201-193/+0
|\ \ | | | | | | Remove unused js
| * | Remove deprecated breadcrumbs implementationMorris Jobke2016-10-201-117/+0
| | | | | | | | | | | | | | | | | | * was replaced by the version in files/ Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Remove OC.localStorage and object methodMorris Jobke2016-10-201-76/+0
|/ / | | | | | | | | | | | | * use the localstorage APIs of the browser instead * use new Object() instead Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #1809 from nextcloud/drop-compatibility.jsMorris Jobke2016-10-204-158/+1
|\ \ | | | | | | Remove unneeded compatibility polyfills
| * | Remove unneeded compatibility polyfillsMorris Jobke2016-10-204-158/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | - `Object.create` supported with IE9+: https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Object/create#Browser_compatibility - `Object.keys` supported with IE9+: https://developer.mozilla.org/de/docs/Web/JavaScript/Reference/Global_Objects/Object/keys#Browser_compatibility - `Array.prototype.filter` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter#Browser_compatibility - `Array.prototype.indexOf` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf#Browser_compatibility - `Array.prototype.map` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map#Browser_compatibility - `Function.prototype.bind` supported in IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Browser_compatibility - `String.prototype.trim` supported with IE9+: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim#Browser_compatibility - `outerHTML` supported with Firefox 11+: https://developer.mozilla.org/en-US/docs/Web/API/Element/outerHTML#Browser_compatibility - `window.devicePixelRatio` supported in IE11+: http://caniuse.com/#feat=devicepixelratio Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #1810 from nextcloud/drop-placeholders.jsMarius Blüm2016-10-202-460/+0
|\ \ | | | | | | Remove unneeded placeholder polyfill
| * | Remove unneeded placeholder polyfillMorris Jobke2016-10-202-460/+0
| | | | | | | | | | | | | | | | | | | | | * placeholders are supported in IE11+ * http://caniuse.com/#feat=input-placeholder Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #1797 from ↵Morris Jobke2016-10-202-2/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/issue-1791-show-path-on-filename-conflict Show the path, when the filename conflicts
| * | | Show the path, when the filename conflictsJoas Schilling2016-10-192-2/+26
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #1803 from nextcloud/fullscreen-iconMorris Jobke2016-10-203-0/+15
|\ \ \ \ | |_|/ / |/| | | add fullscreen icon
| * | | add fullscreen iconJan-Christoph Borchardt2016-10-193-0/+15
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1773 from nextcloud/testing-characters-in-dbLukas Reschke2016-10-1920-33/+263
|\ \ \ | | | | | | | | MySQL 4byte support
| * | | Do not skip when mysql uses utf8mb4Joas Schilling2016-10-191-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix test of repair stepJoas Schilling2016-10-191-6/+10
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | test alternative drone syntax for command optionsMorris Jobke2016-10-192-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix like queries in the QueryBuilderJoas Schilling2016-10-192-5/+29
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Fix the testJoas Schilling2016-10-191-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Ignore failures of collation change in the pre update stepJoas Schilling2016-10-192-11/+30
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | add 4 byte mysql test runMorris Jobke2016-10-192-9/+45
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Correctly save and pass on the charsetJoas Schilling2016-10-191-2/+4
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | fix dockerThomas Müller2016-10-191-1/+1
| | | |
| * | | Adding docker based unit test execution for mysql utf8mb4Thomas Müller2016-10-193-1/+36
| | | |
| * | | Fixing ctor callThomas Müller2016-10-194-6/+6
| | | |
| * | | only disable unicode test on mysqlMorris Jobke2016-10-191-7/+11
| | | |
| * | | Add config option to update charset of mysql to utf8mb4Morris Jobke2016-10-199-9/+66
| | | | | | | | | | | | | | | | | | | | * fully optional * requires additional options set in the database
| * | | Adding tests for 4 byte unicode charactersMorris Jobke2016-10-192-0/+46
| | | | | | | | | | | | | | | | | | | | * success on SQLite and Postgres * failure on MySQL due to the limited charset that only supports up to 3 bytes
* | | | Merge pull request #1807 from nextcloud/button-colorMarius Blüm2016-10-191-1/+1
|\ \ \ \ | |_|/ / |/| | | change primary button text color to white
| * | | change primary button text color to whiteJan-Christoph Borchardt2016-10-191-1/+1
|/ / / | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1795 from nextcloud/systemtags-activity-wordingRoeland Jago Douma2016-10-191-8/+8
|\ \ \ | | | | | | | | change wording of system tags from un/assigned to more human added/removed
| * | | change wording of system tags from un/assigned to more human added/removedJan-Christoph Borchardt2016-10-191-8/+8
| | |/ | |/| | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bitsMorris Jobke2016-10-192-2/+9
|\ \ \ | |/ / |/| | Make sure we only use numbers as length
| * | Make sure we only use numbers as lengthJoas Schilling2016-10-192-2/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1784 from nextcloud/fix-activity-filter-namesJoas Schilling2016-10-192-2/+2
|\ \ \ | |/ / |/| | Adjust wording to make the separation between sharing and files more clear
| * | Adjust wording to make the separation between sharing and files clearerJoas Schilling2016-10-182-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #1790 from nextcloud/3rdparty-masterRoeland Jago Douma2016-10-191-0/+0
|\ \ \ | |_|/ |/| | [3rdparty] Point to master again
| * | [3rdparty] Point to master againRoeland Jago Douma2016-10-181-0/+0
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #1789 from nextcloud/select2-fixesMorris Jobke2016-10-183-78/+113
|\ \ \ | |/ / |/| | move select2 styles to core so it's universal, not only for tags
| * | fix select2 sizing issueJan-Christoph Borchardt2016-10-181-1/+4
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>