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
Nextcloud bot
0324993342
[tx-robot] updated from transifex
2017-07-09 00:08:41 +00:00
Nextcloud bot
f80159f52a
[tx-robot] updated from transifex
2017-07-08 00:08:37 +00:00
Morris Jobke
a5182ab7c1
Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
...
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle
8ad1123d5d
Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
...
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling
a6bae8ac44
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:54 +02:00
Joas Schilling
87e69b5510
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:44 +02:00
Joas Schilling
43964d99ee
Add a flag to allow checking if SVGs are okay
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-07 11:16:37 +02:00
Morris Jobke
36e3f3cc2a
Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps
...
[stable12] Don't load navigation entries of restricted apps
2017-07-07 10:46:11 +02:00
Nextcloud bot
a1f3f1783e
[tx-robot] updated from transifex
2017-07-07 00:08:35 +00:00
Joas Schilling
33252cda9e
Adjust tests to the old settings menu
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-06 09:30:42 +02:00
Joas Schilling
596380a62f
Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
...
[stable12] Don't try to generate logs for chunking paths
2017-07-06 08:43:39 +02:00
Nextcloud bot
f2ac9c6582
[tx-robot] updated from transifex
2017-07-06 00:08:53 +00:00
blizzz
40e454021b
Merge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-dav-exceptions-either
...
[stable12] Don't log passwords on dav exceptions
2017-07-05 22:15:04 +02:00
Morris Jobke
2122cfce4b
Merge pull request #5434 from nextcloud/backport-5404-translated-hint-password-policy
...
Use translated Hint instead of english error on password policy
2017-07-05 16:21:30 +02:00
Joas Schilling
79f6773ef9
Don't log passwords on dav exceptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:10:38 +02:00
Joas Schilling
20091a21c9
Don't load navigation entries of restricted apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-07-05 15:07:56 +02:00
Morris Jobke
5f0932a5a7
Merge pull request #5613 from nextcloud/stable12-5549
...
[stable12] Add info text about updates
2017-07-05 12:52:25 +02:00
Jos Poortvliet
68b6c3fca8
Update admin.php
...
add a note on our staged roll-out.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-07-05 11:40:26 +02:00
Joas Schilling
8b2d9251fd
Merge pull request #5584 from nextcloud/stable12-5429
...
[stable12] Use base url for cache prefix and SCSS caching
2017-07-05 11:30:08 +02:00
Nextcloud bot
3db7bd196d
[tx-robot] updated from transifex
2017-07-05 00:08:36 +00:00
Morris Jobke
29fdffb1af
Merge pull request #5525 from nextcloud/stable12-5517
...
[stable12] Enhance the logging if the part file can not be renamed
2017-07-04 19:36:08 +02:00
Morris Jobke
e0b01f9cb5
Merge pull request #5601 from nextcloud/stable12-5460-5526
...
[stable12] Improved logging for object storage and trashbin
2017-07-04 17:37:45 +02:00