wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33687 commits 157 branches 562 tags 714 MiB
Commit graph

33687 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lukas Reschke
e4436e46cb Merge pull request #752 from nextcloud/disbale_failing_test 
Disbale failing intergration test for now
 2016-08-08 12:01:42 +02:00
Lukas Reschke
fa352a81a5 Merge pull request #728 from nextcloud/update-styling 
Design fixes for updates
 2016-08-08 11:23:31 +02:00
Björn Schießle
727cd6aad0 Merge pull request #711 from nextcloud/password-policy-on-createUser 
Apply password policy on user creation
 2016-08-08 11:17:07 +02:00
Nextcloud bot
344916de15
[tx-robot] updated from transifex 2016-08-07 00:10:23 +00:00
Nextcloud bot
b80e3e70e5
[tx-robot] updated from transifex 2016-08-06 00:10:17 +00:00
Roeland Jago Douma
044da699fb Merge pull request #747 from nextcloud/up_24941 
Move Share backends to PSR-4 instead of using class path (#24941)
 2016-08-05 15:38:26 +02:00
Roeland Jago Douma
774ff433d7
Disbale failing intergration test for now 
I have not been able to reproduce this failure locally yet.
But it seems to happen often on CI.
So disable for now.
 2016-08-05 15:29:10 +02:00
Roeland Jago Douma
dd44624540 Merge pull request #732 from nextcloud/fix-shipped.json 
Order alphabetically and deduplicate the shipped.json
 2016-08-05 15:11:28 +02:00
Joas Schilling
f37fa6e45c
Move Share backends to PSR-4 instead of using class path (#24941) 2016-08-05 14:13:41 +02:00
Joas Schilling
84e6b8d9d0 Merge pull request #737 from nextcloud/blizzz-fix-name-console 
Correct name in Console Application.php
 2016-08-05 09:17:34 +02:00
Nextcloud bot
c44c9a55f4
[tx-robot] updated from transifex 2016-08-05 00:10:09 +00:00
Morris Jobke
e1807ed0a4 Merge pull request #465 from nextcloud/fix_smb_attributes 
Fix file permissions for SMB (read-only folders will be writeable) (#…
 2016-08-04 19:48:21 +02:00
blizzz
329c714a7e Correct name in Console Application.php 
see changes :)
 2016-08-04 19:17:13 +02:00
Joas Schilling
b5c2b5e882 Merge pull request #729 from nextcloud/fix-724 
Fix #724 by using step instead of job
 2016-08-04 14:44:38 +02:00
Joas Schilling
89cb7b59f8
Order alphabetically and deduplicate the shipped.json 2016-08-04 14:40:43 +02:00
Lukas Reschke
b59fb9fe87 Merge pull request #730 from nextcloud/add-new-apps-as-official 
[master] Add new apps as official
 2016-08-04 14:26:48 +02:00
Lukas Reschke
966e2d8dde [master] Add new apps as official 2016-08-04 14:15:42 +02:00
Bernhard Posselt
d7c1bfb4ed fix #724 by using step instead of job 2016-08-04 13:32:03 +02:00
Jan-Christoph Borchardt
835dc59d6a reduce info on update screens, introduce button to refresh 2016-08-04 12:48:25 +02:00
Joas Schilling
dab0a6223a Merge pull request #718 from jurgenhaas/patch-1 
Exit from upgrade without reporting error
 2016-08-04 09:04:24 +02:00
Nextcloud bot
258ee140a4
[tx-robot] updated from transifex 2016-08-04 00:11:51 +00:00
Jan-Christoph Borchardt
2f9725469d switch nested containers in update to semibold style 2016-08-03 18:58:44 +02:00
Joas Schilling
d0e669745a Merge pull request #717 from nextcloud/mark-apps-as-shipped 
Add access control and automated tagging as shipped
 2016-08-03 18:56:51 +02:00
Jürgen Haas
aeb5dfa4ac Exit from upgrade without reporting error 
As reported at https://help.nextcloud.com/t/silent-mode-for-occ-upgrade/2120 we should exit with a return value of 0 (zero) if the current instance is already up to date so that automatic deployment tools don't recognize that as an error.
 2016-08-03 15:51:55 +02:00
Joas Schilling
d1d891fed0
Add access control and automated tagging as shipped 2016-08-03 14:47:52 +02:00
Joas Schilling
8ad79eb097 Merge pull request #611 from nextcloud/add-more-checks 
Add more checks
 2016-08-03 14:38:53 +02:00
michag86
5fb39bd0cb Apply password policy on user creation 2016-08-03 11:52:15 +02:00
Roeland Jago Douma
223f3fa9d5 Merge pull request #474 from nextcloud/group_shares 
Group shares with same source and target
 2016-08-03 11:41:15 +02:00
Marius Blüm
fdbd598d33 Merge pull request #709 from nextcloud/add-code-check 
Add workflowengine to check-code call
 2016-08-03 11:36:29 +02:00
Morris Jobke
f012b574e5
Add workflowengine to check-code call 2016-08-03 10:29:06 +02:00
Vincent Petry
6d8d5f7bc5
Add integration tests for double shares with rename in between 2016-08-03 10:16:28 +02:00
Vincent Petry
2404f6a5a7
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-03 10:16:28 +02:00
Vincent Petry
0c6352e095
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-03 10:16:28 +02:00
Vincent Petry
0c7c9a3b95
Adjust repair version check for unmerged shares 2016-08-03 10:16:28 +02:00
Vincent Petry
0f3674a446
Group incoming shares for resharing in JS 2016-08-03 10:16:28 +02:00
Vincent Petry
0bddaa23b0
Added more tests for sharing's MountProvider 2016-08-03 10:16:28 +02:00
Vincent Petry
67fa6bf9bc
Add repair step for unmerged shares (WIP) 2016-08-03 10:16:28 +02:00
Vincent Petry
714d7ec936
Improved share grouping readability + fixed test 2016-08-03 10:16:28 +02:00
Vincent Petry
573f6de6a0
Add integration tests for merging received shares 2016-08-03 10:16:28 +02:00
Roeland Jago Douma
04d5465228
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-03 10:16:28 +02:00
Nextcloud bot
0874460e48
[tx-robot] updated from transifex 2016-08-03 00:11:12 +00:00
Morris Jobke
c76dc835c4 Merge pull request #701 from nextcloud/fix-add-apps-icon 
Apply black app icon style to newly installed app icons
 2016-08-02 14:23:42 +02:00
Morris Jobke
17c3027094 Merge pull request #637 from nextcloud/h1-prevent-delete-update-on-group-shares 
Do not allow to delete/update group shares as a group member
 2016-08-02 14:17:22 +02:00
Morris Jobke
ab3b90eff2 Merge pull request #700 from nextcloud/token-provider-invalidateoldtokens 
add invalidateOldTokens to IProvider interface
 2016-08-02 14:16:25 +02:00
Joas Schilling
bcf022c964
Ooops 2016-08-02 12:52:46 +02:00
Christoph Wurst
e90f00791d add invalidateOldTokens to IProvider interface 2016-08-02 12:08:13 +02:00
Roeland Jago Douma
1088870eb1
Add intergration test 2016-08-02 11:12:52 +02:00
Joas Schilling
4e5fb74773
Do not allow to delete/update group shares as a group member 2016-08-02 10:50:35 +02:00
Joas Schilling
248020f61f
No multi support, less magic 2016-08-02 10:50:21 +02:00
Joas Schilling
62d009ad09
Allow to define the operation 2016-08-02 10:50:21 +02:00