Morris Jobke
81d785b680
Merge pull request #5730 from nextcloud/stable12-fix-drone
...
[stable12] fix drone for 0.7
2017-07-14 23:34:12 +02:00
Morris Jobke
d61fc0531f
Temporarily disable acceptance and object storage tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 21:49:20 +02:00
Morris Jobke
239ff34f3d
Fix drone
...
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-14 13:02:16 +02:00
blizzz
b9d7c48acf
Merge pull request #5711 from nextcloud/null-user-exist-12
...
[12] null users dont exist
2017-07-14 12:38:27 +02:00
Nextcloud bot
281e5eb8bc
[tx-robot] updated from transifex
2017-07-14 00:08:47 +00:00
Morris Jobke
9a07f78480
Merge pull request #5710 from nextcloud/nested-permissions-mask-12
...
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1
Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
...
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Robin Appelman
ce45f87699
null users dont exist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 15:54:16 +02:00
Morris Jobke
61bac5637f
Merge pull request #5697 from nextcloud/stable12-4984
...
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman
95e17a8245
use a generator instead of fetching all rows at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Morris Jobke
d422875ae4
Run repair step only once
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-13 13:08:23 +02:00
Morris Jobke
701a865db7
Merge pull request #5692 from nextcloud/upload-hidden-filelist-12
...
[12] properly block file upload to non-active filelist
2017-07-13 11:47:46 +02:00
Morris Jobke
7da78af4d4
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-13 11:47:35 +02:00
Nextcloud bot
a9b38c025f
[tx-robot] updated from transifex
2017-07-13 00:08:42 +00:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-07-12 20:21:27 +02:00
Robin Appelman
9e675dd8b1
fix test
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:14 +02:00
Robin Appelman
d05f67b2f3
properly block file upload to non-active filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-12 12:20:10 +02:00
Roeland Jago Douma
38ee24d56b
Merge pull request #5687 from nextcloud/jail-propagator-12
...
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma
405d3ccbd7
Merge pull request #5463 from nextcloud/shared-cache-during-init-12
...
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Morris Jobke
ac7997901b
Merge pull request #5686 from nextcloud/backport-5520
...
hint should not be clickable
2017-07-12 10:44:31 +02:00
Nextcloud bot
05b03c173e
[tx-robot] updated from transifex
2017-07-12 00:08:54 +00:00
Morris Jobke
48351b4778
Merge pull request #5484 from nextcloud/fix-if-circles-is-deleted
...
Check if Circles is still here
2017-07-11 23:42:30 +02:00
Maxence Lange
02baa45898
wrong call
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Maxence Lange
7464996c56
verify that circles is installed
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 20:21:06 +02:00
Robin Appelman
2f7d0bbb18
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-07-11 19:20:51 +02:00
Maxence Lange
51107da4f4
hint should not be clickable
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-07-11 18:14:29 +02:00
Lukas Reschke
ce59546344
Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-unreadable-items
...
[stable12] Allow dir-listing also when one child is blocked by access control
2017-07-11 16:08:43 +02:00
Morris Jobke
e768426b11
Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-on-multi-select-dropdowns
...
[stable12] Fix unselecting items on multi select dropdowns
2017-07-11 15:34:30 +02:00
Daniel Calviño Sánchez
3a660a1b89
Enable the toggleSelect extension in multi-select dropdowns
...
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez
bf4913acb9
Add select2-toggleselect to the JavaScript files to load
...
"select2-toggleselect.js" provides an extension to Select2 that makes
possible to unselect items in a multi-select dropdown by clicking on
them. It seems that its load slipped through when moving things around
in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it
to the JavaScript files to be loaded in the same position that it should
have had in that commit (based on how the other declarations were
moved).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez
00e0535aec
Add acceptance tests for unselecting items in dropdown for tags
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 13:02:09 +02:00
Morris Jobke
ad7e6cfc9c
Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activity-emails
...
[stable12] Fix remote share activity emails
2017-07-11 12:21:30 +02:00
Daniel Calviño Sánchez
6cf19cc81a
Extract app navigation elements to its own context
...
The app navigation is not exclusive to the Files app but a generic
component used by other apps too, so its locators and steps should be in
its own context.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 11:54:57 +02:00
Daniel Calviño Sánchez
b72aa998d6
Fix typo
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2017-07-11 11:48:19 +02:00
Morris Jobke
8fdd9dbb04
Merge pull request #5667 from nextcloud/5649-stable12
...
[stable12] fix alignment of radio button and its label in encryption settings
2017-07-11 11:31:41 +02:00
Morris Jobke
5fcf2d2bad
Merge pull request #5665 from GitHubUser4234/ldap_password_renew_nc12fix_backport
...
[stable12] Ldap password renewal fixes for NC12
2017-07-10 15:03:31 +02:00
Roger Szabo
ff286cd131
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 18:38:30 +08:00
Joas Schilling
1ed251c6a9
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:45 +02:00
Joas Schilling
509bc4f1eb
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-10 12:28:32 +02:00
Arthur Schiwon
0a71c1ccd3
fix alignment of radio button and its label in encryption settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-07-10 11:02:16 +02:00
Roger Szabo
500d2a0e2e
pass missing function parameter
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:17:05 +08:00
Roger Szabo
b725738870
css for button adjustment for nc12
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:55 +08:00
Roger Szabo
3e7a49e009
set needsPasswordReset flag correctly
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:42 +08:00
Roger Szabo
28933322a2
suppress superflous php error on rejected password change
...
Signed-off-by: Roger Szabo <roger.szabo@web.de>
2017-07-10 15:16:12 +08:00
Nextcloud bot
28a37f04dc
[tx-robot] updated from transifex
2017-07-10 00:08:51 +00:00