289704f13d
Merge pull request #788 from nextcloud/stable10-federation-error-messages
...
[stable10] improve federation error messages
2016-08-09 15:50:33 +02:00
3914861b90
Merge pull request #785 from nextcloud/stable10_779
...
[Stable10] Make 'Add to your website' toggleable
2016-08-09 15:47:52 +02:00
d61c49a0b0
improve federation error messages
2016-08-09 14:36:30 +02:00
1d6448beb1
Make 'Add to your website' toggleable
2016-08-09 14:16:32 +02:00
25a72c8099
Merge pull request #776 from nextcloud/workflow-cleanup-stable10
...
[stable10] Workflow cleanup
2016-08-09 12:36:03 +02:00
7637c2e366
Allow a description for workflow sections
2016-08-09 11:33:04 +02:00
ae1a41f05b
Add placeholder to the name field
2016-08-09 11:32:57 +02:00
1f527576a4
Rename operations and checks
2016-08-09 11:32:50 +02:00
99494925fe
Highlight the check row on hover
2016-08-09 11:32:42 +02:00
47a3700973
Add some space between the rule groups
2016-08-09 11:32:32 +02:00
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
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
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
5332ec4a27
Fix intergration test for admin_audit
2016-08-08 16:48:10 +02:00
924b0ac060
Disable by default
2016-08-08 16:48:00 +02:00
f910837722
More casing
2016-08-08 16:48:00 +02:00
7b3974501e
Increment the versions and adjust the capitilization
2016-08-08 16:48:00 +02:00
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
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
f5bd7a3dd6
Disable buggy test for now
2016-08-07 14:05:54 +02:00
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
9bc13eb7eb
Translate the server version for nextcloud
2016-08-06 10:42:26 +02:00
e9310f750c
Check if an app provide two-factor-auth providers before we try to use them
2016-08-06 10:30:36 +02:00
0e808a45b8
Merge pull request #748 from nextcloud/stable10-backport-name-changes
...
[stable10] correct name
2016-08-05 15:42:40 +02:00
61b3796ea5
ownCloud -> Nextcloud
2016-08-05 14:37:43 +02:00
6bbcbb22e9
Correct name in Console Application.php
...
see changes :)
2016-08-05 14:37:32 +02:00
efe8f7d136
Merge pull request #705 from nextcloud/backport-408-psr4-for-theming
...
[stable10] Theming input validation
2016-08-05 11:51:42 +02:00
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
56e9f7cdf9
Add integration tests for double shares with rename in between
2016-08-04 19:50:16 +02:00
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
3a86dd1d1a
Adjust repair version check for unmerged shares
2016-08-04 19:50:16 +02:00
bee0a8f32a
Group incoming shares for resharing in JS
2016-08-04 19:50:16 +02:00
2ab799f674
Added more tests for sharing's MountProvider
2016-08-04 19:50:16 +02:00
6638e1857a
Add repair step for unmerged shares (WIP)
2016-08-04 19:50:16 +02:00
3e8b787dd1
Improved share grouping readability + fixed test
2016-08-04 19:50:16 +02:00
c5095e760e
Add integration tests for merging received shares
2016-08-04 19:50:16 +02:00
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
f4f43dddf5
Merge pull request #733 from nextcloud/fix-724-stable10
...
Backport Stable 10: Fix #724 by using step instead of job
2016-08-04 16:23:53 +02:00
c707150dd6
Merge pull request #731 from nextcloud/stable10-add-new-apps-as-official
...
[stable10] Add new apps as official
2016-08-04 16:09:38 +02:00
5e24c6b5fd
fix #724 by using step instead of job
2016-08-04 14:52:38 +02:00
4d5df58378
Merge pull request #727 from jurgenhaas/patch-2
...
Backport of #718
2016-08-04 14:45:28 +02:00
4bb277aee9
Order alphabetically and deduplicate the shipped.json
2016-08-04 14:42:44 +02:00
66f6a91ade
[stable10] Add new apps as official
2016-08-04 14:28:24 +02:00
713e201074
Merge pull request #602 from nextcloud/backport-workflow-engine
...
🚧 [WIP] Backport workflow engine 🚧
2016-08-04 14:20:14 +02:00
2037ff1f2f
Backport of #718
...
Backporting https://github.com/nextcloud/server/pull/718 to stable10
2016-08-04 09:14:40 +02:00
d896d42931
Merge pull request #706 from nextcloud/backport-637-prevent-delete-update-on-group-shares
...
[stable10] Do not allow to delete/update group shares as a group member
2016-08-03 14:52:49 +02:00
fc7bd03822
Add access control and automated tagging as shipped
2016-08-03 14:50:53 +02:00
8d23405602
Ooops
2016-08-03 14:44:18 +02:00
065763f117
No multi support, less magic
2016-08-03 14:44:08 +02:00
7d71535f57
Allow to define the operation
2016-08-03 14:44:01 +02:00
Björn Schießle
Roeland Jago Douma
Roeland Jago Douma
Joas Schilling
Bugsbane
Morris Jobke
Marius Blüm
Robin Appelman
blizzz
Daniel Hansson
Julius Härtl
Vincent Petry
Bernhard Posselt
Lukas Reschke
Bernhard Posselt
Jürgen Haas