]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agofix .gitignore and include zxcvbn.js 1841/head
Morris Jobke [Fri, 21 Oct 2016 08:19:18 +0000 (10:19 +0200)]
fix .gitignore and include zxcvbn.js

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoFix personal page
Roeland Jago Douma [Fri, 21 Oct 2016 07:11:52 +0000 (09:11 +0200)]
Fix personal page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoFix zxcvbn path in setup page (#26359)
Philipp Eichhorn [Thu, 13 Oct 2016 08:29:10 +0000 (10:29 +0200)]
Fix zxcvbn path in setup page (#26359)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoBump bower dep to proper v4.4.0
Roeland Jago Douma [Fri, 21 Oct 2016 07:05:35 +0000 (09:05 +0200)]
Bump bower dep to proper v4.4.0

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1834 from nextcloud/downstream-26186
Morris Jobke [Fri, 21 Oct 2016 07:44:15 +0000 (09:44 +0200)]
Merge pull request #1834 from nextcloud/downstream-26186

Add more files plugins to new DAV endpoint

8 years agoMerge pull request #1806 from nextcloud/karakayasemi_1767
Roeland Jago Douma [Fri, 21 Oct 2016 06:45:51 +0000 (08:45 +0200)]
Merge pull request #1806 from nextcloud/karakayasemi_1767

Update file.php put function posthook calls

8 years agoMerge pull request #1835 from nextcloud/downstream-24948
Morris Jobke [Thu, 20 Oct 2016 21:48:15 +0000 (23:48 +0200)]
Merge pull request #1835 from nextcloud/downstream-24948

Move OC\Files\Storage\Shared to the right namespace

8 years agoMerge pull request #1827 from nextcloud/downstream-26381
Morris Jobke [Thu, 20 Oct 2016 21:44:42 +0000 (23:44 +0200)]
Merge pull request #1827 from nextcloud/downstream-26381

Get rid of very old oc:// stream wrapper (#26381)

8 years agoAdd more files plugins to new DAV endpoint (#26186) 1834/head
Vincent Petry [Tue, 4 Oct 2016 14:08:22 +0000 (16:08 +0200)]
Add more files plugins to new DAV endpoint (#26186)

* Add more files plugins to new DAV endpoint

Also fix report plugin to properly retrieve the path from the
prolongated URL

* In case the report is not for this plugin -> simply return to allow other plugins to get executed

* Adjust onReport tests to match new behavior

8 years agoUpdate file.php put function posthook calls 1806/head
Semih Serhat Karakaya [Mon, 17 Oct 2016 10:20:41 +0000 (13:20 +0300)]
Update file.php put function posthook calls

Logicaly, postHooks should emit after touch. For chunking file it is already emitting after touch.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoGet rid of very old oc:// stream wrapper (#26381) 1827/head
Vincent Petry [Sat, 15 Oct 2016 20:50:38 +0000 (22:50 +0200)]
Get rid of very old oc:// stream wrapper (#26381)

8 years agoMerge pull request #1826 from nextcloud/downstream-26391
Morris Jobke [Thu, 20 Oct 2016 18:44:05 +0000 (20:44 +0200)]
Merge pull request #1826 from nextcloud/downstream-26391

Fix post_unshareFromSelf hook parameter format

8 years agoMerge pull request #1824 from nextcloud/downstream-26423
Morris Jobke [Thu, 20 Oct 2016 18:43:26 +0000 (20:43 +0200)]
Merge pull request #1824 from nextcloud/downstream-26423

Ensure $commands being an array

8 years agoFix shared storage namespace in DecryptAll class 1835/head
Vincent Petry [Wed, 5 Oct 2016 13:52:56 +0000 (15:52 +0200)]
Fix shared storage namespace in DecryptAll class

8 years agoMove OC\Files\Storage\Shared to the right namespace
Joas Schilling [Wed, 1 Jun 2016 12:29:31 +0000 (14:29 +0200)]
Move OC\Files\Storage\Shared to the right namespace

8 years agoMerge pull request #1821 from nextcloud/downstream-26366
Morris Jobke [Thu, 20 Oct 2016 18:18:47 +0000 (20:18 +0200)]
Merge pull request #1821 from nextcloud/downstream-26366

Code style changes from downstream

8 years agoMerge pull request #1817 from nextcloud/oc_nus
Lukas Reschke [Thu, 20 Oct 2016 17:38:41 +0000 (19:38 +0200)]
Merge pull request #1817 from nextcloud/oc_nus

Expose the needupgrade status (#26209)

8 years agoMerge pull request #1822 from nextcloud/restore-overwritten-services-after-errors
Roeland Jago Douma [Thu, 20 Oct 2016 17:35:23 +0000 (19:35 +0200)]
Merge pull request #1822 from nextcloud/restore-overwritten-services-after-errors

Restore overwritten services after errors

8 years agoMerge pull request #1812 from nextcloud/allow-to-dismiss-the-code-integrity-warning
Jakob Sack [Thu, 20 Oct 2016 17:23:39 +0000 (19:23 +0200)]
Merge pull request #1812 from nextcloud/allow-to-dismiss-the-code-integrity-warning

Allow to dismiss the code integrity warning

8 years agoMerge pull request #1796 from nextcloud/oc_fav-report
Lukas Reschke [Thu, 20 Oct 2016 16:32:51 +0000 (18:32 +0200)]
Merge pull request #1796 from nextcloud/oc_fav-report

Make it possible to filter by tags with REPORT method

8 years agoFix post_unshareFromSelf hook parameter format 1826/head
Vincent Petry [Thu, 13 Oct 2016 08:53:04 +0000 (10:53 +0200)]
Fix post_unshareFromSelf hook parameter format

When unsharing from self in a group share situation, the share items
passed to the post_unshareFromSelf hook were using the wrong format in
which the attribute names (ex: "share_type") have non camel-case format.

This fix makes sure that in group sharing case we use the correct
format. It looks like the code was already producing it but in
array_merge it was not using it and adding the unprocessed one.

8 years agoEnsure $commands being an array - fixes #26073 1824/head
Thomas Müller [Wed, 19 Oct 2016 21:17:39 +0000 (23:17 +0200)]
Ensure $commands being an array - fixes #26073

8 years agouse short array syntax
Morris Jobke [Thu, 20 Oct 2016 13:40:22 +0000 (15:40 +0200)]
use short array syntax

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoRestore all services when a tests failed/finished for better testcase isolation 1822/head
Joas Schilling [Thu, 20 Oct 2016 13:15:54 +0000 (15:15 +0200)]
Restore all services when a tests failed/finished for better testcase isolation

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMake sure all tests use the TestCase method to overwrite services
Joas Schilling [Thu, 20 Oct 2016 13:11:01 +0000 (15:11 +0200)]
Make sure all tests use the TestCase method to overwrite services

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoSanitize length headers when validating quota 1821/head
Thomas Müller [Thu, 13 Oct 2016 10:59:10 +0000 (12:59 +0200)]
Sanitize length headers when validating quota

8 years agoMerge pull request #1816 from nextcloud/settings_nopng
Morris Jobke [Thu, 20 Oct 2016 13:04:07 +0000 (15:04 +0200)]
Merge pull request #1816 from nextcloud/settings_nopng

Get rid of settings/img/*.png

8 years agoMerge pull request #1768 from nextcloud/more-filepicker
Jan-Christoph Borchardt [Thu, 20 Oct 2016 12:46:57 +0000 (14:46 +0200)]
Merge pull request #1768 from nextcloud/more-filepicker

More filepicker improvements

8 years agoExpose the needupgrade status (#26209) 1817/head
Kristof Provost [Thu, 29 Sep 2016 15:14:00 +0000 (17:14 +0200)]
Expose the needupgrade status (#26209)

During upgrades, before the DB migration is complete, the system is not
usable, but there's no way for monitoring systems to detect this.
Add the 'needupgrade' field to the status json so monitoring systems can
detect this.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoGet rid of settings/img/*.png 1816/head
Roeland Jago Douma [Thu, 20 Oct 2016 12:19:59 +0000 (14:19 +0200)]
Get rid of settings/img/*.png

We only use SVG icons so no need to ship them!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1813 from nextcloud/remove-unused-js
Roeland Jago Douma [Thu, 20 Oct 2016 12:06:29 +0000 (14:06 +0200)]
Merge pull request #1813 from nextcloud/remove-unused-js

Remove unused js

8 years agoImprove the styling 1768/head
Morris Jobke [Thu, 20 Oct 2016 11:10:26 +0000 (13:10 +0200)]
Improve the styling

* 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>
8 years agoRemove deprecated breadcrumbs implementation 1813/head
Morris Jobke [Thu, 20 Oct 2016 10:18:33 +0000 (12:18 +0200)]
Remove deprecated breadcrumbs implementation

* was replaced by the version in files/

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoRemove OC.localStorage and object method
Morris Jobke [Thu, 20 Oct 2016 10:16:44 +0000 (12:16 +0200)]
Remove OC.localStorage and object method

* use the localstorage APIs of the browser instead
* use new Object() instead

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoAllow to dismiss the code integrity warning 1812/head
Joas Schilling [Thu, 20 Oct 2016 09:33:29 +0000 (11:33 +0200)]
Allow to dismiss the code integrity warning

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1809 from nextcloud/drop-compatibility.js
Morris Jobke [Thu, 20 Oct 2016 08:57:43 +0000 (10:57 +0200)]
Merge pull request #1809 from nextcloud/drop-compatibility.js

Remove unneeded compatibility polyfills

8 years agoRemove unneeded compatibility polyfills 1809/head
Morris Jobke [Wed, 19 Oct 2016 21:08:11 +0000 (23:08 +0200)]
Remove unneeded compatibility polyfills

- `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>
8 years agoMerge pull request #1810 from nextcloud/drop-placeholders.js
Marius Blüm [Thu, 20 Oct 2016 05:27:18 +0000 (07:27 +0200)]
Merge pull request #1810 from nextcloud/drop-placeholders.js

Remove unneeded placeholder polyfill

8 years agoMerge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict
Morris Jobke [Wed, 19 Oct 2016 22:27:54 +0000 (00:27 +0200)]
Merge pull request #1797 from nextcloud/issue-1791-show-path-on-filename-conflict

Show the path, when the filename conflicts

8 years agoMerge pull request #1803 from nextcloud/fullscreen-icon
Morris Jobke [Wed, 19 Oct 2016 22:03:42 +0000 (00:03 +0200)]
Merge pull request #1803 from nextcloud/fullscreen-icon

add fullscreen icon

8 years agoRemove unneeded placeholder polyfill 1810/head
Morris Jobke [Wed, 19 Oct 2016 22:00:25 +0000 (00:00 +0200)]
Remove unneeded placeholder polyfill

* placeholders are supported in IE11+
* http://caniuse.com/#feat=input-placeholder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoMerge pull request #1773 from nextcloud/testing-characters-in-db
Lukas Reschke [Wed, 19 Oct 2016 20:09:14 +0000 (22:09 +0200)]
Merge pull request #1773 from nextcloud/testing-characters-in-db

MySQL 4byte support

8 years agoadd fullscreen icon 1803/head
Jan-Christoph Borchardt [Wed, 19 Oct 2016 13:31:02 +0000 (15:31 +0200)]
add fullscreen icon

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1807 from nextcloud/button-color
Marius Blüm [Wed, 19 Oct 2016 19:07:56 +0000 (21:07 +0200)]
Merge pull request #1807 from nextcloud/button-color

change primary button text color to white

8 years agochange primary button text color to white 1807/head
Jan-Christoph Borchardt [Wed, 19 Oct 2016 18:27:00 +0000 (20:27 +0200)]
change primary button text color to white

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoadd proper left margin for filepicker title
Jan-Christoph Borchardt [Wed, 19 Oct 2016 12:43:04 +0000 (14:43 +0200)]
add proper left margin for filepicker title

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agofix filepicker with no mimetype filter
Robin Appelman [Wed, 19 Oct 2016 12:22:33 +0000 (14:22 +0200)]
fix filepicker with no mimetype filter

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agofix file exist dialog styling
Robin Appelman [Tue, 18 Oct 2016 12:01:27 +0000 (14:01 +0200)]
fix file exist dialog styling

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agofilepicker: improve layout and style
Jan-Christoph Borchardt [Tue, 18 Oct 2016 09:42:13 +0000 (11:42 +0200)]
filepicker: improve layout and style

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoUse a table for the filepicker list and add size column
Robin Appelman [Mon, 17 Oct 2016 12:26:25 +0000 (14:26 +0200)]
Use a table for the filepicker list and add size column

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agouse fileclient to get the filelist for the filepicker
Robin Appelman [Mon, 17 Oct 2016 11:35:59 +0000 (13:35 +0200)]
use fileclient to get the filelist for the filepicker

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoAllow selecting a folder after using the breadcrumb
Robin Appelman [Mon, 17 Oct 2016 11:09:21 +0000 (13:09 +0200)]
Allow selecting a folder after using the breadcrumb

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoAllow selecting the root folder
Robin Appelman [Mon, 17 Oct 2016 11:08:55 +0000 (13:08 +0200)]
Allow selecting the root folder

Signed-off-by: Robin Appelman <robin@icewind.nl>
8 years agoMerge pull request #1795 from nextcloud/systemtags-activity-wording
Roeland Jago Douma [Wed, 19 Oct 2016 10:16:46 +0000 (12:16 +0200)]
Merge pull request #1795 from nextcloud/systemtags-activity-wording

change wording of system tags from un/assigned to more human added/removed

8 years agoShow the path, when the filename conflicts 1797/head
Joas Schilling [Wed, 19 Oct 2016 09:33:25 +0000 (11:33 +0200)]
Show the path, when the filename conflicts

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMake it possible to filter by tags with REPORT method 1796/head
Vincent Petry [Mon, 12 Sep 2016 15:09:46 +0000 (17:09 +0200)]
Make it possible to filter by tags with REPORT method

Enhanced the REPORT method on the Webdav endpoint and added a
"oc:favorite" filter rule. When set, it will return a flat list of
results filtered with only favorite files.

The web UI was also adjusted to use this REPORT method instead of the
private API endpoint.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits
Morris Jobke [Wed, 19 Oct 2016 09:01:19 +0000 (11:01 +0200)]
Merge pull request #1740 from nextcloud/issue-1707-big-files-on-32-bits

Make sure we only use numbers as length

8 years agochange wording of system tags from un/assigned to more human added/removed 1795/head
Jan-Christoph Borchardt [Wed, 19 Oct 2016 08:50:10 +0000 (10:50 +0200)]
change wording of system tags from un/assigned to more human added/removed

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1784 from nextcloud/fix-activity-filter-names
Joas Schilling [Wed, 19 Oct 2016 07:45:30 +0000 (09:45 +0200)]
Merge pull request #1784 from nextcloud/fix-activity-filter-names

Adjust wording to make the separation between sharing and files more clear

8 years agoMake sure we only use numbers as length 1740/head
Joas Schilling [Fri, 14 Oct 2016 07:09:21 +0000 (09:09 +0200)]
Make sure we only use numbers as length

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1790 from nextcloud/3rdparty-master
Roeland Jago Douma [Wed, 19 Oct 2016 06:23:32 +0000 (08:23 +0200)]
Merge pull request #1790 from nextcloud/3rdparty-master

[3rdparty] Point to master again

8 years agoDo not skip when mysql uses utf8mb4 1773/head
Joas Schilling [Tue, 18 Oct 2016 14:50:25 +0000 (16:50 +0200)]
Do not skip when mysql uses utf8mb4

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix test of repair step
Joas Schilling [Tue, 18 Oct 2016 14:09:48 +0000 (16:09 +0200)]
Fix test of repair step

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agotest alternative drone syntax for command options
Morris Jobke [Tue, 18 Oct 2016 10:40:17 +0000 (12:40 +0200)]
test alternative drone syntax for command options

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoFix like queries in the QueryBuilder
Joas Schilling [Tue, 18 Oct 2016 09:37:49 +0000 (11:37 +0200)]
Fix like queries in the QueryBuilder

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoFix the test
Joas Schilling [Tue, 18 Oct 2016 09:17:13 +0000 (11:17 +0200)]
Fix the test

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoIgnore failures of collation change in the pre update step
Joas Schilling [Tue, 18 Oct 2016 09:10:55 +0000 (11:10 +0200)]
Ignore failures of collation change in the pre update step

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoadd 4 byte mysql test run
Morris Jobke [Tue, 18 Oct 2016 08:31:05 +0000 (10:31 +0200)]
add 4 byte mysql test run

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
8 years agoCorrectly save and pass on the charset
Joas Schilling [Tue, 18 Oct 2016 08:22:02 +0000 (10:22 +0200)]
Correctly save and pass on the charset

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agofix docker
Thomas Müller [Wed, 20 Apr 2016 10:14:13 +0000 (12:14 +0200)]
fix docker

8 years agoAdding docker based unit test execution for mysql utf8mb4
Thomas Müller [Tue, 9 Feb 2016 16:38:12 +0000 (17:38 +0100)]
Adding docker based unit test execution for mysql utf8mb4

8 years agoFixing ctor call
Thomas Müller [Tue, 9 Feb 2016 16:25:12 +0000 (17:25 +0100)]
Fixing ctor call

8 years agoonly disable unicode test on mysql
Morris Jobke [Thu, 30 Jul 2015 12:57:17 +0000 (14:57 +0200)]
only disable unicode test on mysql

8 years agoAdd config option to update charset of mysql to utf8mb4
Morris Jobke [Thu, 30 Jul 2015 11:57:04 +0000 (13:57 +0200)]
Add config option to update charset of mysql to utf8mb4

* fully optional
* requires additional options set in the database

8 years agoAdding tests for 4 byte unicode characters
Morris Jobke [Thu, 30 Jul 2015 08:57:16 +0000 (10:57 +0200)]
Adding tests for 4 byte unicode characters

* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes

8 years agoMerge pull request #1789 from nextcloud/select2-fixes
Morris Jobke [Tue, 18 Oct 2016 20:05:15 +0000 (22:05 +0200)]
Merge pull request #1789 from nextcloud/select2-fixes

move select2 styles to core so it's universal, not only for tags

8 years ago[3rdparty] Point to master again 1790/head
Roeland Jago Douma [Tue, 18 Oct 2016 19:44:35 +0000 (21:44 +0200)]
[3rdparty] Point to master again

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
8 years agoMerge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes
Morris Jobke [Tue, 18 Oct 2016 18:26:53 +0000 (20:26 +0200)]
Merge pull request #1164 from nextcloud/avatar-files-accesscontrol-fixes

Avatar/file-picker fixes for access-control app

8 years agofix select2 sizing issue 1789/head
Jan-Christoph Borchardt [Tue, 18 Oct 2016 18:26:31 +0000 (20:26 +0200)]
fix select2 sizing issue

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1788 from nextcloud/share-link-whitespace
Morris Jobke [Tue, 18 Oct 2016 18:19:58 +0000 (20:19 +0200)]
Merge pull request #1788 from nextcloud/share-link-whitespace

add whitespace above share link so it's visually distinguished more

8 years agomove select2 styles to core so it's universal, not only for tags
Jan-Christoph Borchardt [Tue, 18 Oct 2016 17:42:39 +0000 (19:42 +0200)]
move select2 styles to core so it's universal, not only for tags

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoadd whitespace above share link so it's visually distinguished more 1788/head
Jan-Christoph Borchardt [Tue, 18 Oct 2016 17:43:18 +0000 (19:43 +0200)]
add whitespace above share link so it's visually distinguished more

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1729 from nextcloud/downstream-ldap-3 1785/head
Lukas Reschke [Tue, 18 Oct 2016 15:20:15 +0000 (17:20 +0200)]
Merge pull request #1729 from nextcloud/downstream-ldap-3

[downstream] LDAP empty hardening

8 years agoMerge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache
Lukas Reschke [Tue, 18 Oct 2016 15:18:33 +0000 (17:18 +0200)]
Merge pull request #1771 from nextcloud/fix-issue-loading-checks-from-cache

Do not reset the list after adding cached entries

8 years agoAdjust wording to make the separation between sharing and files clearer 1784/head
Joas Schilling [Tue, 18 Oct 2016 15:18:14 +0000 (17:18 +0200)]
Adjust wording to make the separation between sharing and files clearer

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1734 from nextcloud/setvalue_opt
Lukas Reschke [Tue, 18 Oct 2016 15:16:25 +0000 (17:16 +0200)]
Merge pull request #1734 from nextcloud/setvalue_opt

AllConfig setUserValue opt

8 years agoMerge pull request #1742 from nextcloud/us_sync-date-of-death
Lukas Reschke [Tue, 18 Oct 2016 15:14:53 +0000 (17:14 +0200)]
Merge pull request #1742 from nextcloud/us_sync-date-of-death

[oc] Sync deathdate and anniversary to birthday calendar

8 years agoMerge pull request #1739 from nextcloud/bump_symfony_process
Lukas Reschke [Tue, 18 Oct 2016 15:13:51 +0000 (17:13 +0200)]
Merge pull request #1739 from nextcloud/bump_symfony_process

[3rdparty] Bump synfony/process

8 years agoMerge pull request #1774 from nextcloud/ellipsize-sharee
Morris Jobke [Tue, 18 Oct 2016 15:03:03 +0000 (17:03 +0200)]
Merge pull request #1774 from nextcloud/ellipsize-sharee

ellipsize sharee name to not overlap with can edit option on mobile

8 years agoMerge pull request #1780 from nextcloud/jquery-ui-fixes
Jan-Christoph Borchardt [Tue, 18 Oct 2016 14:37:45 +0000 (16:37 +0200)]
Merge pull request #1780 from nextcloud/jquery-ui-fixes

jquery UI fixes

8 years agoThe red box already makes clear it's an error 1164/head
Joas Schilling [Mon, 29 Aug 2016 14:50:45 +0000 (16:50 +0200)]
The red box already makes clear it's an error

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoCheck the mimetype before reading the content and catch exception
Joas Schilling [Mon, 29 Aug 2016 14:50:01 +0000 (16:50 +0200)]
Check the mimetype before reading the content and catch exception

Signed-off-by: Joas Schilling <coding@schilljs.com>
8 years agoMerge pull request #1722 from nextcloud/hide-storage-warnings
Morris Jobke [Tue, 18 Oct 2016 14:15:52 +0000 (16:15 +0200)]
Merge pull request #1722 from nextcloud/hide-storage-warnings

hide storage wrapper warning for the readonly storage

8 years agoMerge pull request #1777 from nextcloud/user-mgmt-layout
Morris Jobke [Tue, 18 Oct 2016 12:57:21 +0000 (14:57 +0200)]
Merge pull request #1777 from nextcloud/user-mgmt-layout

User management layout improvements

8 years agojquery UI fixes 1780/head
Jan-Christoph Borchardt [Tue, 18 Oct 2016 12:55:53 +0000 (14:55 +0200)]
jquery UI fixes

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1606 from nextcloud/search-detail
Morris Jobke [Tue, 18 Oct 2016 11:48:01 +0000 (13:48 +0200)]
Merge pull request #1606 from nextcloud/search-detail

search design details

8 years agoimprove look of Add group flow 1777/head
Jan-Christoph Borchardt [Tue, 18 Oct 2016 10:14:38 +0000 (12:14 +0200)]
improve look of Add group flow

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agofix list height and border to be as in Files
Jan-Christoph Borchardt [Tue, 18 Oct 2016 10:10:05 +0000 (12:10 +0200)]
fix list height and border to be as in Files

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoellipsize sharee name to not overlap with 1774/head
Jan-Christoph Borchardt [Tue, 18 Oct 2016 09:18:25 +0000 (11:18 +0200)]
ellipsize sharee name to not overlap with

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
8 years agoMerge pull request #1754 from nextcloud/files-move
Jan-Christoph Borchardt [Tue, 18 Oct 2016 08:32:46 +0000 (10:32 +0200)]
Merge pull request #1754 from nextcloud/files-move

Add file action to move files and folders