Lukas Reschke
94d9d52de2
Merge pull request #743 from nextcloud/fix_smb_attributes-10
...
[10] Fix file permissions for SMB (read-only folders will be writeable
2016-08-10 00:23:17 +02:00
Lukas Reschke
6888dee06c
Merge pull request #803 from nextcloud/use-correct-version
...
Use correct version
2016-08-10 00:14:46 +02:00
Roeland Jago Douma
232b1f4417
Admin setting PHP and SMTP casing
2016-08-09 23:46:11 +02:00
Lukas Reschke
808a82dd6c
Use correct version
...
Fixes https://github.com/nextcloud/server/issues/800 , other apps such as fileaccesscontrol and workflow already have the correct version.
2016-08-09 23:02:42 +02:00
Roeland Jago Douma
4bab962cca
Merge pull request #798 from nextcloud/stable10_781
...
[Stable10] Remove AGPL title
2016-08-09 21:54:07 +02:00
Roeland Jago Douma
cb2e535565
Merge pull request #794 from nextcloud/stable10_780
...
[Stable10] Add clipboard action to Personal Settings Fed Cloud Id
2016-08-09 20:47:47 +02:00
Björn Schießle
e7e81e9e76
Merge pull request #795 from nextcloud/stable10-backport-786
...
[stable10] log class name, ID only is hard to debug
2016-08-09 20:33:17 +02:00
Björn Schießle
044f2734af
Merge pull request #792 from nextcloud/stable10_789
...
[Stable10] Padding of federated server
2016-08-09 19:34:05 +02:00
Roeland Jago Douma
f3ae93ddd7
Remove AGPL title
2016-08-09 19:24:53 +02:00
Jörn Friedrich Dreyer
9b760aafa1
log class name, ID only is hard to debug
2016-08-09 16:19:06 +02:00
Roeland Jago Douma
b5f32a055f
Add clipboard action to Personal Settings Fed Cloud Id
2016-08-09 16:18:44 +02:00
Roeland Jago Douma
8fc5f6bcd0
Padding of federated server
2016-08-09 16:14:26 +02:00
Björn Schießle
289704f13d
Merge pull request #788 from nextcloud/stable10-federation-error-messages
...
[stable10] improve federation error messages
2016-08-09 15:50:33 +02:00
Roeland Jago Douma
3914861b90
Merge pull request #785 from nextcloud/stable10_779
...
[Stable10] Make 'Add to your website' toggleable
2016-08-09 15:47:52 +02:00
Bjoern Schiessle
d61c49a0b0
improve federation error messages
2016-08-09 14:36:30 +02:00
Roeland Jago Douma
1d6448beb1
Make 'Add to your website' toggleable
2016-08-09 14:16:32 +02:00
Björn Schießle
25a72c8099
Merge pull request #776 from nextcloud/workflow-cleanup-stable10
...
[stable10] Workflow cleanup
2016-08-09 12:36:03 +02:00
Joas Schilling
7637c2e366
Allow a description for workflow sections
2016-08-09 11:33:04 +02:00
Joas Schilling
ae1a41f05b
Add placeholder to the name field
2016-08-09 11:32:57 +02:00
Joas Schilling
1f527576a4
Rename operations and checks
2016-08-09 11:32:50 +02:00
Joas Schilling
99494925fe
Highlight the check row on hover
2016-08-09 11:32:42 +02:00
Joas Schilling
47a3700973
Add some space between the rule groups
2016-08-09 11:32:32 +02:00
Roeland Jago Douma
63c8011a15
Merge pull request #773 from nextcloud/stable10-fix-systemtags-icon
...
[stable10] Add black version of system tags icon
2016-08-08 21:35:19 +02:00
Bugsbane
0174579fb5
Add black version of system tags icon
...
Includes PNG (16x16px) and SVG (scoured) versions in black, to be uniform with the other icon files.
2016-08-08 20:23:50 +02:00
Roeland Jago Douma
167e248177
Merge pull request #738 from nextcloud/increment-versions
...
[stable10] Increment the versions and adjust the capitilization
2016-08-08 18:26:30 +02:00
Roeland Jago Douma
5332ec4a27
Fix intergration test for admin_audit
2016-08-08 16:48:10 +02:00
Joas Schilling
924b0ac060
Disable by default
2016-08-08 16:48:00 +02:00
Joas Schilling
f910837722
More casing
2016-08-08 16:48:00 +02:00
Joas Schilling
7b3974501e
Increment the versions and adjust the capitilization
2016-08-08 16:48:00 +02:00
Björn Schießle
7321baa108
Merge pull request #713 from nextcloud/stable10_474
...
[Stable 10] Group shares with same source and target
2016-08-08 10:55:26 +02:00
Morris Jobke
65dd174655
Merge pull request #756 from nextcloud/twofactor-isset-10
...
[10] Check if an app provide two-factor-auth providers before we try to use them
2016-08-08 09:15:13 +02:00
Roeland Jago Douma
f5bd7a3dd6
Disable buggy test for now
2016-08-07 14:05:54 +02:00
Marius Blüm
eb9d0b4664
Merge pull request #757 from nextcloud/nextcloud-version-check-10
...
[10] Translate the server version for nextcloud
2016-08-07 09:08:49 +02:00
Joas Schilling
9bc13eb7eb
Translate the server version for nextcloud
2016-08-06 10:42:26 +02:00
Robin Appelman
e9310f750c
Check if an app provide two-factor-auth providers before we try to use them
2016-08-06 10:30:36 +02:00
blizzz
0e808a45b8
Merge pull request #748 from nextcloud/stable10-backport-name-changes
...
[stable10] correct name
2016-08-05 15:42:40 +02:00
Daniel Hansson
61b3796ea5
ownCloud -> Nextcloud
2016-08-05 14:37:43 +02:00
blizzz
6bbcbb22e9
Correct name in Console Application.php
...
see changes :)
2016-08-05 14:37:32 +02:00
Julius Härtl
efe8f7d136
Merge pull request #705 from nextcloud/backport-408-psr4-for-theming
...
[stable10] Theming input validation
2016-08-05 11:51:42 +02:00
Juan Pablo Villafañez
91c6c451f4
Fix file permissions for SMB (read-only folders will be writeable) ( #25301 )
...
* Fix file permissions for SMB (read-only folders will be writeable)
* Read-only folders won't be deletable
* Added comment for the read-only behaviour for folders
2016-08-05 10:23:50 +02:00
Vincent Petry
e75a0a44c6
Make share target consistent when grouping group share with user share
...
In some situations, a group share is created before a user share, and
the recipient renamed the received share before the latter is created.
In this situation, the "file_target" was already modified and the second
created share must align to the already renamed share.
To achieve this, the MountProvider now groups only by "item_source"
value and sorts by share time. This makes it so that the least recent
share is selected as super-share and its "file_target" value is then
adjusted in all grouped shares.
This fixes the issue where this situation would have different
"file_target" values resulting in two shared folders appearing instead
of one.
2016-08-04 19:50:16 +02:00
Vincent Petry
56e9f7cdf9
Add integration tests for double shares with rename in between
2016-08-04 19:50:16 +02:00
Vincent Petry
21907c4f3e
Fix RepairUnmergedShares to not skip valid repair cases
...
The repair step was a bit overeager to skip repairing so it missed the
case where a group share exists without subshares but with an
additional direct user share.
2016-08-04 19:50:16 +02:00
Vincent Petry
3a86dd1d1a
Adjust repair version check for unmerged shares
2016-08-04 19:50:16 +02:00
Vincent Petry
bee0a8f32a
Group incoming shares for resharing in JS
2016-08-04 19:50:16 +02:00
Vincent Petry
2ab799f674
Added more tests for sharing's MountProvider
2016-08-04 19:50:16 +02:00
Vincent Petry
6638e1857a
Add repair step for unmerged shares (WIP)
2016-08-04 19:50:16 +02:00
Vincent Petry
3e8b787dd1
Improved share grouping readability + fixed test
2016-08-04 19:50:16 +02:00
Vincent Petry
c5095e760e
Add integration tests for merging received shares
2016-08-04 19:50:16 +02:00
Roeland Jago Douma
39ebf120c2
Group shares with same source and target
...
Fixes #24575
Note that this is a very limited solution and eventually we want smarter
merging!
2016-08-04 19:49:27 +02:00