Commit Graph

19484 Commits

Author SHA1 Message Date
Nextcloud bot 1f82aad842
[tx-robot] updated from transifex 2018-11-17 01:12:47 +00:00
John Molakvoæ (skjnldsv) ce6e77ad74
Fix revert icon position on theming settings
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-16 18:35:42 +01:00
Morris Jobke 9a6d60e95f
Merge pull request #12474 from nextcloud/default-to-files-list
Rollback to default list view
2018-11-16 13:48:16 +01:00
Nextcloud bot def8af3e7e
[tx-robot] updated from transifex 2018-11-16 01:12:14 +00:00
John Molakvoæ (skjnldsv) 1deda8fd65
Rollback to default list view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-15 20:29:10 +01:00
Robin Appelman 846e2f2967
Merge pull request #12472 from nextcloud/dav-versions-user
actually return the user when creating version dav nodes
2018-11-15 19:23:10 +01:00
Robin Appelman fbe35c346d
actually return the user when creating version dav nodes
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-15 17:17:54 +01:00
Morris Jobke 790ee0c8a3
Merge pull request #12467 from nextcloud/bugfix/11901/show-thumbnail-on-rename
Show thumbnail on rename
2018-11-15 14:09:55 +01:00
John Molakvoæ (skjnldsv) a8dafc2ff8
Remove conflicting multiselect
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-15 14:08:13 +01:00
Morris Jobke c09560627f
Enhance jsunit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 13:40:05 +01:00
Morris Jobke a4d81ba164
Merge pull request #12458 from nextcloud/bugfix/dav_shares_hickup
fixes dav share issue with owner
2018-11-15 13:32:54 +01:00
Georg Ehrke 7179ffe37b
fix caldav tests
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-15 12:35:05 +01:00
Morris Jobke 61f7eecc0b
Show thumbnail on rename
* does not hide thumbnail when rename is shown
* fixes layout for grid and list view
* fixes #11901

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-15 12:14:15 +01:00
Morris Jobke 159d75945a
Merge pull request #12292 from nextcloud/fix/2947/lapse-sizelimit-error
avoid logging of "Partial search results returned: Sizelimit exceeded…"
2018-11-15 10:48:57 +01:00
Morris Jobke d70b010432
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again
Shorten index name of calendar changes table
2018-11-15 10:47:51 +01:00
Joas Schilling 1997346369
Fix interaction with groups that contain a slash
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-15 10:03:32 +01:00
Nextcloud bot 10c9b37461
[tx-robot] updated from transifex 2018-11-15 01:12:14 +00:00
Georg Ehrke c23a66cda4
fixes dav share issue with owner
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-14 21:49:00 +01:00
Morris Jobke c993b6e261
Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps
Load apps that have a dav type set before the dav server plugins
2018-11-14 21:42:47 +01:00
Morris Jobke c126c3f56a
Update PHPDoc to fix typos
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-14 21:21:41 +01:00
Morris Jobke 08bd8373f6
Merge pull request #12417 from nextcloud/bugfix/noid/app-files_external-replace-insertIfNotExist
Fix UniqueConstraintViolationException while insert into files_external config tables
2018-11-14 21:05:32 +01:00
Morris Jobke cbf90bf201
Merge pull request #12454 from nextcloud/list-shrink-fix
Fix breakpoint and shrinking of the content + list
2018-11-14 20:58:24 +01:00
Robin Appelman 7ac15d4bab
twofactor auth settings are not regular settings
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-14 18:05:13 +01:00
John Molakvoæ (skjnldsv) 2b7832d0c9
Fix breakpoint and shrinking of the content + list
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-14 17:19:35 +01:00
Morris Jobke 6bace99aa1
Fix UniqueConstraintViolationException while insert into files_external config tables
* followup to #12371

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-14 15:24:03 +01:00
Julius Härtl 5a5d46b1b8
Load apps that have a dav type set before the dav server plugins
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-14 11:01:42 +01:00
Joas Schilling aa88254f64
Shorten index name of calendar changes table
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-14 10:14:23 +01:00
Nextcloud bot fef51895c2
[tx-robot] updated from transifex 2018-11-14 01:12:12 +00:00
Morris Jobke 79681ef3d9
Merge pull request #12398 from nextcloud/fix/12378
change "Download" to "Download all files" for shared folders
2018-11-13 17:21:09 +01:00
Morris Jobke 3c5e43898e
Merge pull request #12275 from nextcloud/bugfix/11975/oracle_calendar_subscriptions_source
Fix Calendarsubscriptions source column change on Oracle
2018-11-13 16:34:32 +01:00
Georg Ehrke 071301bfb9
Fix Calendarsubscriptions source column change on Oracle
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-13 16:32:47 +01:00
Nextcloud bot 5e84824839
[tx-robot] updated from transifex 2018-11-13 01:12:40 +00:00
Morris Jobke fd8eeccb15
Merge pull request #11942 from nextcloud/techdebt/noid/use-count-function
Use the defined func()->count() instead of manual counting
2018-11-12 17:43:56 +01:00
John Molakvoæ d6de8ebeb2
Merge pull request #12389 from nextcloud/fix-dav-groupid
Fix displayName return of dav groups request
2018-11-12 09:49:24 +01:00
Nextcloud bot 48395baa7e
[tx-robot] updated from transifex 2018-11-12 01:12:49 +00:00
Morris Jobke bbd51f4ddb
Merge pull request #12385 from nextcloud/fix/12356/grid-toggle-fix
Fixes the grid toggle for none folder shares
2018-11-11 23:30:14 +01:00
Nextcloud bot 6dc2b03ebe
[tx-robot] updated from transifex 2018-11-11 01:13:10 +00:00
Jonas Sulzer 1f237c7e25
change "Download" to "Download all files" for shared folders
fixes #12378

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-11-10 19:10:31 +01:00
John Molakvoæ (skjnldsv) e18548ce75
Fix displayName return of dav groups request
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-10 13:34:07 +01:00
Nextcloud bot cc96b93f95
[tx-robot] updated from transifex 2018-11-10 01:12:25 +00:00
Michael Weimann 04b9154c9a
Fixes the grid toggle for none folder shares
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-09 22:28:19 +01:00
Morris Jobke b7a59fb56a
Merge pull request #12358 from nextcloud/bugfix/noid/wrong-update-check-version
Check for compatible apps from the appstore fails
2018-11-09 16:48:12 +01:00
Joas Schilling eff7a9c904
Adjust unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-09 10:24:34 +01:00
Nextcloud bot da57aaf814
[tx-robot] updated from transifex 2018-11-09 01:12:25 +00:00
Morris Jobke bd7e983080
Merge pull request #12349 from nextcloud/feature/noid/populate-notification-message-with-the-comment
Populate the mention-notification with the actual message
2018-11-08 22:47:55 +01:00
Joas Schilling bb352fb667
Use the defined func()->count() instead of manual counting
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 15:44:45 +01:00
Morris Jobke 03b140c008
Improve style of incompatible apps list
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-08 15:28:58 +01:00
blizzz 42121fe4d7
Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernames
do not offer to change display name or password, if not possible.
2018-11-08 15:13:24 +01:00
Joas Schilling b04a44babd
Use the version number when checking the appstore for compatible updates
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 14:52:28 +01:00
Morris Jobke 90a35aab29
Fix overlapping update button in notifications
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-08 14:19:46 +01:00
Joas Schilling 1b4f1b9a63
Populate the mention-notification with the actual message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-08 12:10:09 +01:00
Morris Jobke 0fb74aff5a
Merge pull request #10059 from nextcloud/feature/1497/cache_webcal_calendars
cache webcal calendars on server
2018-11-08 10:54:18 +01:00
Nextcloud bot 55f0c2ac3b
[tx-robot] updated from transifex 2018-11-08 01:12:18 +00:00
Arthur Schiwon 505722cc0d
do not offer to change display name or password, if not possible.
Fixes #12319

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-11-07 22:37:41 +01:00
John Molakvoæ (skjnldsv) f54b201f23
Better primary visual on public pages
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-07 16:30:59 +01:00
Morris Jobke 7940a79a41
Merge pull request #12324 from nextcloud/add-password-response-parameter-for-returning-the-password-of-link-shares
Add "password" parameter to the response data of link shares
2018-11-07 16:29:05 +01:00
Morris Jobke ab3543380c
Merge pull request #11836 from nextcloud/bugfix/2443/comment-mentions-with-spaces
Comment mentions with spaces
2018-11-07 16:27:36 +01:00
Morris Jobke 9eb5ab9e70
Merge pull request #12317 from nextcloud/deps/noid/es6-polyfill
Add es6-shim as polyfill and minify core vendor scripts
2018-11-07 16:03:33 +01:00
Georg Ehrke 30d13bb760
cache webcal calendars on server
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-11-07 13:25:14 +01:00
Arthur Schiwon deec5a70a0
avoid logging of "Partial search results returned: Sizelimit exceeded at"
LDAP servers respond with that even if a limit was passed with the
request. Having this statement logged causes a lot of confusion.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-11-07 13:15:55 +01:00
Joas Schilling 375589b274
Fix the comments UI and activities for space-mentions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-11-07 12:33:44 +01:00
Julius Härtl c48722c201
Fix file move tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-07 11:14:19 +01:00
Morris Jobke 463dfb50d9
Fix unit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-07 10:25:36 +01:00
Morris Jobke 9669d451e3
Reduce function calls
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-07 10:19:20 +01:00
Morris Jobke ca93d73f97
Improve text to be better translatable and use CSS instead of HTML for bold text
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-07 10:19:20 +01:00
Morris Jobke 68d39e4b92
Fix indentation of CSS
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-07 10:19:20 +01:00
Michael Weimann c572c669e5
Adapts the code to the new master state
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-07 10:19:20 +01:00
Michael Weimann e0ab2902d6
Moves the terms of service into a dialog
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-07 10:19:19 +01:00
Michael Weimann 95a19bdfdd
Inlines the share note for file drops
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-07 10:19:19 +01:00
Michael Weimann 08e681b221
Inlines the share note for file drops
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-07 10:19:19 +01:00
Michael Weimann 16f379b974
Hides the header actions for file drops
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-11-07 10:19:19 +01:00
Nextcloud bot c26d847d19
[tx-robot] updated from transifex 2018-11-07 01:12:29 +00:00
Daniel Calviño Sánchez b2cc2d6023 Add "password" parameter to the response data of link shares
Due to legacy reasons the password of link shares was returned in the
"share_with" and "share_with_displayname" parameters of the response
data. Now a proper "password" parameter is returned too; the old
"share_with" and "share_with_displayname" parameters are kept, although
deprecated, and they will be removed in a future version of Nextcloud.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-06 23:48:28 +01:00
John Molakvoæ e03bc6e4c9
Merge pull request #12303 from nextcloud/grid-for-all-file-templates
Add grid toggle for every files view
2018-11-06 17:29:31 +01:00
John Molakvoæ (skjnldsv) cac2f7f4d6
Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-06 16:05:34 +01:00
Daniel Kesselberg ccd89f366d
Merge pull request #11968 from nextcloud/feature/noid/drop-verbose-appscan
Replace $verbose with VERBOSITY_VERBOSE for scanFiles method
2018-11-06 14:41:39 +01:00
John Molakvoæ (skjnldsv) 98edf3612c
Fix min trhumbnail size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-06 11:45:19 +01:00
John Molakvoæ (skjnldsv) 5682d302c7
Add grid toggle for every files view
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-06 11:42:18 +01:00
Morris Jobke a88e7d30f3
Merge pull request #11831 from nextcloud/feature/noid/drop-verbose-scan
Replace $verbose with VERBOSITY_VERBOSE
2018-11-06 10:21:51 +01:00
Nextcloud bot 54a30a4b81
[tx-robot] updated from transifex 2018-11-06 01:12:39 +00:00
Morris Jobke f350f2e3ec
Merge pull request #12128 from tomasz-grobelny/fix_file_move
Fix file move operation for large number of files
2018-11-06 00:24:27 +01:00
Roeland Jago Douma cd31bea2b7
Merge pull request #12289 from nextcloud/ie11-grid-disable
Disable grid for ie
2018-11-05 22:48:24 +01:00
John Molakvoæ (skjnldsv) e0de0a122f
Disable grid for ie
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 17:27:09 +01:00
Roeland Jago Douma 665a6d2055
Allow writing an empty file with the new writeStream
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 17:00:04 +01:00
John Molakvoæ 9ea6573416
Merge pull request #12242 from nextcloud/uid-conccurency
Uid concurrency check fix for vcards
2018-11-05 15:24:44 +01:00
John Molakvoæ (skjnldsv) 68968a870b
Phpunit tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 13:15:21 +01:00
John Molakvoæ (skjnldsv) b6d8c5ff2f
Add check for vCard uid
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 12:49:39 +01:00
Morris Jobke 04774eaf68
Merge pull request #12271 from nextcloud/prevent-upload-cancel
Ask before cancelling an ongoing upload
2018-11-05 12:28:32 +01:00
Morris Jobke cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer
Cleanup the DIContainer
2018-11-05 12:16:36 +01:00
John Molakvoæ 934d08b2e8
Merge pull request #12004 from nextcloud/dl-vcf-groups-plugin
Multi vcf download plugin
2018-11-05 10:16:30 +01:00
John Molakvoæ (skjnldsv) a793b1027c
Ask before cancelling an ongoing upload
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 10:11:50 +01:00
Roeland Jago Douma 765c576029
Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.24.0
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility
2018-11-05 09:28:38 +01:00
Roeland Jago Douma d4b6a8739a
Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
2018-11-05 09:24:44 +01:00
dependabot[bot] f749ab0da8
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 08:09:33 +00:00
Roeland Jago Douma dcddccb004
Merge pull request #12265 from nextcloud/dav-bump
bump dav version for migration
2018-11-05 09:05:32 +01:00
John Molakvoæ f85215e41c
Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2
make twofactor .button inline-block
2018-11-05 08:52:29 +01:00
Roeland Jago Douma 2528dc751a
Merge pull request #12252 from nextcloud/theming-advanced-h3
Change "Advanced options" to h3
2018-11-05 08:28:12 +01:00
Roeland Jago Douma 30b54cf287
Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
2018-11-05 08:26:21 +01:00
Roeland Jago Douma 32f9a32352
Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
2018-11-05 08:25:15 +01:00
Roeland Jago Douma c3a877f7e9
Rebuild assets
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 08:22:10 +01:00
Roeland Jago Douma 4fa8dfb153
Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
2018-11-05 08:19:44 +01:00
Roeland Jago Douma e81e11db46
Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
2018-11-05 08:18:57 +01:00
John Molakvoæ (skjnldsv) a6c8fe099d
bump dav version for migration
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 08:11:31 +01:00
Roeland Jago Douma 4be625b128
Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_render
Set the filemodel before rending the detailsview
2018-11-05 08:07:49 +01:00
dependabot[bot] ead6ce8e97
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:20:03 +00:00
dependabot[bot] 436ee94fe6
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:19:45 +00:00
dependabot[bot] 834c7fef0f
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:18:53 +00:00
dependabot[bot] e81ff4ebcb
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:13:08 +00:00
dependabot[bot] 39b111d58d
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:12:42 +00:00
Nextcloud bot c28ea52155
[tx-robot] updated from transifex 2018-11-05 01:12:32 +00:00
Marius Blüm 9340a6a0e4
Change "Advanced options" to h3
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-11-04 23:52:22 +01:00
Roeland Jago Douma 72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares
Shares are displayed to users with resharing rights
2018-11-04 21:08:11 +01:00
John Molakvoæ (skjnldsv) 60d8b56856
Added multi-get vcf download plugin
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-04 20:01:49 +01:00
Roeland Jago Douma ab8c2b0719
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
Roeland Jago Douma 5d3051ff62
Do not log FileLock as exception
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
Tomasz Grobelny 1fa6e0be23 Merge remote-tracking branch 'upstream/master' into fix_file_move
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
2018-11-04 09:39:19 +00:00
Jonas Sulzer afd39c27af
make twofactor .button inlin-block
fixes #3752

Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-11-04 04:01:40 +01:00
Nextcloud bot 9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Tomasz Grobelny 41687ef00f Fix move related tests
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
2018-11-03 23:01:32 +00:00
Nextcloud bot f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00:00
Roeland Jago Douma b1fd72c1cf
Set the filemodel before rending the detailsview
fixes #10934

Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 22:45:25 +01:00
Roeland Jago Douma 9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration
Addressbook uid check migration
2018-11-02 19:37:48 +01:00
Roeland Jago Douma c8cf986527
Fix files_sharing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 19:20:37 +01:00
Roeland Jago Douma 2452a3ec73
Properly query the methodreflector
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 19:20:37 +01:00
Roeland Jago Douma 30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk
Add support for sending the password for a link share by Nextcloud Talk
2018-11-02 14:54:46 +01:00
John Molakvoæ (skjnldsv) 66624cfe0a
Phpunit fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-02 14:20:53 +01:00
Morris Jobke f5728f2c14
Merge pull request #12190 from forsd/AddtestFiles_Trashbin
Add test OCA\Files_Trashbin\Capabilities
2018-11-02 14:01:25 +01:00
Roeland Jago Douma 7ba8700ba1
Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-message
suppress wrong audit log messages about failed login attempts
2018-11-02 13:52:50 +01:00
Julius Härtl 166907afef
Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3
[3rdparty] Bump sabre/dav to 3.2.3
2018-11-02 13:09:46 +01:00
Maxence Lange 77b95ccd12
revert tests
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:49 +01:00
Maxence Lange 0fc8a0f58e
user can have his resharing rights revoked, yet seeing created shares
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:49 +01:00
Maxence Lange 236a293f6a
check parents resharing rights
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:48 +01:00
Maxence Lange 275cea5d9c
limit to circles moderator
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:28 +01:00
Maxence Lange 72ad2d60b5
display shares to circles moderator
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:28 +01:00
Maxence Lange 68c44bb642
shares are displayed to users with resharing rights
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:26 +01:00
Nextcloud bot 3b5e031e6b
[tx-robot] updated from transifex 2018-11-02 01:13:34 +00:00
Daniel Calviño Sánchez adf80aa8b3 Add sending the password by Talk for a link share to ShareAPIController
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 01:57:48 +01:00
Daniel Calviño Sánchez 52cada951b Check "note", "label" and "hide download" too in update share tests
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 01:56:07 +01:00
Morris Jobke f28691c26e
Merge pull request #11844 from nextcloud/multiple-link-shares
allow to create multiple link shares via share api
2018-11-01 22:36:09 +01:00
Jan-Christoph Borchardt 9dea41f8fe Fix wording, sort 'Add another link' to bottom so it does not confuse
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-11-01 21:33:10 +01:00
Jan-Christoph Borchardt 7bfb32230a Use primary color for share link icon background instead of bland grey
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-11-01 21:33:10 +01:00
John Molakvoæ (skjnldsv) 206d6126b6 Fix note display
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv) 106ed07d6a Copy link outside menu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-01 21:30:45 +01:00
John Molakvoæ (skjnldsv) 1bd6d39b39 Migrate link shares to array
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-01 21:29:40 +01:00
Morris Jobke 7246f2ace5
Update PHPDoc to reflect the actual behaviour
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-11-01 15:02:50 +01:00
John Molakvoæ (skjnldsv) d89edb28c4
move migration
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-01 15:02:50 +01:00
John Molakvoæ (skjnldsv) 9afff2fb20
Properly set uid and create and update
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-01 15:00:49 +01:00
Morris Jobke d842cd1eec
Merge pull request #12150 from nextcloud/techdebt/noid/ldap-rm-iusertools
remove app specific IUserTools and consolidate test
2018-11-01 13:52:45 +01:00
Unknown 0ad76cc81a Add test OCA\Files_Trashbin\Capabilities 2018-11-01 17:20:34 +05:00
Morris Jobke bfab6ccf1b
Merge pull request #12180 from nextcloud/sidebar-fixes
Sidebar fixes, mostly fixing design of tabs
2018-11-01 12:42:03 +01:00
Morris Jobke 0247a0d6db
Merge pull request #12162 from nextcloud/file-menu-align
Align file menu below '+' button, fix #5595
2018-11-01 12:01:05 +01:00
Roeland Jago Douma e94ee7cbca
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-01 11:31:41 +01:00
Morris Jobke 15ef354ace
Merge pull request #12129 from nextcloud/versions-modular-api
modular versions api
2018-11-01 10:59:47 +01:00
Roeland Jago Douma 3503329b52
Merge pull request #12072 from nextcloud/writestream
extend storage api to allow directly writing a stream to storage
2018-11-01 07:52:31 +01:00
Bjoern Schiessle feb9f72e8b adjust unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-01 04:27:25 +01:00
Jan-Christoph Borchardt 4e12132e43
Fix issues with clipboard button for local link in sidebar
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-11-01 04:11:20 +01:00
Jan-Christoph Borchardt bb1d503f3e
Add icon to Versions sidebar tab
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-11-01 04:10:55 +01:00
Bjoern Schiessle 5e90711600 allow to update lables for public link shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-01 02:18:55 +01:00
Bjoern Schiessle f377a61f90 allow to add labels to shares
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-11-01 02:15:07 +01:00
Nextcloud bot 9d5982ba4b
[tx-robot] updated from transifex 2018-11-01 01:12:59 +00:00
Robin Appelman 4403d771ad
modular versions api
Allows apps to register version backends for storage types
The existing versions backend is wrapped in a "legacy" backend.

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-11-01 00:21:48 +01:00
Robin Appelman 9b3cc72f7c
fix writeStream for jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-31 21:10:57 +01:00
Robin Appelman 4094a5e74a
update dav tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-31 21:10:54 +01:00
Robin Appelman 93de63777e
extend storage api to allow directly writing a stream to storage
this removes the need for temporary storages with some external storage backends.
The new method is added to a separate interface to maintain compatibility with
storage backends implementing the storage interface directly (without inheriting common)

Currently the interface is implemented for objectstorage based storages and local storage
and used by webdav uploads

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-10-31 21:10:44 +01:00
Arthur Schiwon 0d1370f2f6
Revert "Populate the mention-notification with the actual message"
This reverts commit d295ff5367.
2018-10-31 16:16:51 +01:00
Julius Härtl 838105877c
Merge pull request #11647 from nextcloud/make-possible-for-tab-views-to-add-css-classes-to-their-container
Make possible for tab views to add CSS classes to their container
2018-10-31 15:37:48 +01:00
blizzz 83cff3178b
Merge pull request #12009 from nextcloud/feature/noid/populate-notification-message-with-the-comment
Populate the mention-notification with the actual message
2018-10-31 11:51:55 +01:00
Jan-Christoph Borchardt 1cc05af7a6
Align file menu below '+' button, fix #5595
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-10-31 11:20:02 +01:00
Roeland Jago Douma 3a6b525a34
Merge pull request #12095 from MasterOfDeath/OCA-ShareByMail-Capabilities-test-unit
OCA\ShareByMail\Capabilities add unit test
2018-10-31 10:15:03 +01:00
Roeland Jago Douma 2574394625
Merge pull request #12147 from MasterOfDeath/OCA-SystemTags-Activity-Setting-add-unit-test
OCA\SystemTags\Activity\Setting unit test
2018-10-31 10:13:50 +01:00
Bjoern Schiessle d0411b2369
allow to create multiple link shares via share api
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-31 06:55:52 +01:00
Jan-Christoph Borchardt 9c68db5ffb
slightly round off thumbnails in list view too
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2018-10-31 00:01:58 +01:00
Arthur Schiwon 0c5d9127e8
remove app specific IUserTools and consolidate test
Just some house keeping. IUserTools with used in even older days for
easier creation of Access instances…

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 22:44:50 +01:00
Bjoern Schiessle 0efd29f41f
first check if the user is already logged in and then try to authenticate via apache, this way we suppress wrong audit log messages about failed login attempts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2018-10-30 22:14:52 +01:00
blizzz 1293affc84
Merge pull request #12020 from nextcloud/bugfix/11795/calendar_invitation_fallback_lang
Calendar invitation: use system default instead of sender's language as fallback
2018-10-30 22:05:20 +01:00
Rinat Gumirov 6760c3e699 OCA\SystemTags\Activity\Setting unit test
Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
2018-10-31 01:26:59 +05:00
MasterOfDeath f465839e34 OCA\ShareByMail\Capabilities unit test
OCA\ShareByMail\Capabilities unit test

Signed-off-by: Rinat Gumirov <rinat.gumirov@mail.ru>
2018-10-31 00:07:44 +05:00
Roeland Jago Douma 674930da7f
Move ExpiredTokenException to the correct namespace
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 19:30:45 +01:00
Roeland Jago Douma 41ff001b77
Merge pull request #11899 from nextcloud/enhancement/noid/sharing-consolidation
Sharing user consolidation
2018-10-30 19:27:05 +01:00
Tomasz Grobelny 68a27debd1 Fix file move operation for large number of files
Signed-off-by: Tomasz Grobelny <tomasz@grobelny.net>
2018-10-30 15:37:21 +01:00
Daniel Calviño Sánchez bfb2a914d2 Honour "hide download" in the public share page
When the "hide download" property of a share is set the public share
page will not show the download button nor the menu with the download,
direct link and "Add to your Nextcloud" actions; the "downloadURL"
hidden field will not be included either in the generated HTML.

Despite that, note that the "downloadURL" parameter is still set and
passed to the template, as this could be needed anyway to generate
previews (for example, of audio files).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-10-30 15:18:55 +01:00
Roeland Jago Douma c237a3f003 Expose hide download to public page
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
Roeland Jago Douma abbb946bbb Propegate hide download state in share provider
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 15:18:55 +01:00
Morris Jobke b28a0c10bf
Merge pull request #11946 from nextcloud/bugfix/11945/fix-js-namespace-of-files-external
Fix JS namespace of files_external app
2018-10-30 14:57:57 +01:00
Julius Härtl ffc32222f1
Styling papercuts
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 14:43:34 +01:00
Julius Härtl b9c5e569d3
Update AddressBookImpl documentation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 14:43:08 +01:00
Roeland Jago Douma c1698948b8
Merge pull request #12130 from nextcloud/fix/reset_bruteforce_oauth
Reset bruteforce on token refresh OAuth
2018-10-30 14:26:50 +01:00
Roeland Jago Douma 8b2b238d86
Merge pull request #12054 from nextcloud/fix/5212/interact-with-userobject
LDAP: announce display name changes so that addressbook picks it up
2018-10-30 13:38:16 +01:00
Joas Schilling d295ff5367
Populate the mention-notification with the actual message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-30 13:29:58 +01:00
Arthur Schiwon 49456e42f9
do not run into UniqueConstraintViolationException
… when an unmapped user logs in for the first time when background job
mode is ajax and no memcache was configured.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-10-30 12:12:03 +01:00
Roeland Jago Douma 75456b057d
Reset bruteforce on token refresh OAuth
When using atoken obtained via OAuth the token expires. Resulting in
brute force attempts hitting the requesting IP.

This resets the brute force attempts for that UID on a valid refresh of
the token.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-30 11:21:27 +01:00
Julius Härtl 61af607525
Make enhancing entries with type property optional
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:35 +01:00
Julius Härtl 192324e4de
Make dropdown height 6 1/2 entries
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:35 +01:00
Julius Härtl 5059605c99
Increase max-width of the share autocompletion suggestions
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
Julius Härtl 3e11515b9c
Merge contacts and add type of result to the UI
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
Julius Härtl 8b92a6c9cb
Add type of properties to address book results
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:34 +01:00
Julius Härtl 45d8aeb9f2
Remove federated sharing address books which are the same as local ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:33 +01:00
Julius Härtl 6dde7e1183
Improve share select list
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-10-30 10:19:32 +01:00
Morris Jobke 31ccf8580a
Merge pull request #12070 from nextcloud/fix/noid/announce-chosen-uid
announce the chosen uid (fixes wrong variable usage)
2018-10-30 10:12:04 +01:00
Joas Schilling 9645e545b3 Fix JS namespace of files_external app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-10-30 09:43:26 +01:00