Commit Graph

33811 Commits

Author SHA1 Message Date
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
Damjan Georgievski 4d559267bd SetupController should use \OC::$configDir too 2016-08-02 15:28:19 +02: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
Nextcloud bot 5f83f4d9a8
[tx-robot] updated from transifex 2016-08-02 00:09:59 +00:00
Morris Jobke 3a067c5041 Merge pull request #695 from nextcloud/shake-wrong-password
Shake the login fields if password is wrong
2016-08-02 01:16:05 +02:00
Julius Haertl c8e4988f85
Apply inverted app icon style to newly installed icons 2016-08-01 21:48:06 +02:00
Morris Jobke d97fe1775a
Shake the login fields if password is wrong 2016-08-01 21:42:29 +02:00
Morris Jobke dbf3ca5baf Merge pull request #682 from nextcloud/fix-theming-logo
fix missing semicolon to fix themed logo on log in page
2016-08-01 19:50:42 +02:00
Morris Jobke 32e5e48b0b Merge pull request #653 from nextcloud/animate-sidebar
slight animation for the sidebar for better feedback what happens
2016-08-01 18:21:31 +02:00
Joas Schilling 7c1560d787
Tags need to be loaded before 2016-08-01 18:09:22 +02:00
Joas Schilling 6aa5d674d6
Translate the errors 2016-08-01 17:56:33 +02:00
Joas Schilling ea4c6bd285
Load the timezones via select2 2016-08-01 17:19:05 +02:00
Morris Jobke 2734ff7d4e
add a UI to render proper time picker 2016-08-01 17:19:05 +02:00
Joas Schilling e0b5949a9f
Add request time 2016-08-01 17:19:05 +02:00
Joas Schilling 2cfd67e13b
Add remote address 2016-08-01 17:19:05 +02:00
Joas Schilling 1091cbb778
Add Request URL 2016-08-01 17:19:05 +02:00
Joas Schilling 477e79c2f2
User agent check 2016-08-01 17:19:05 +02:00
Joas Schilling 8a753342ee
Add file mime type 2016-08-01 17:19:04 +02:00
Joas Schilling 136a1a4223
Add file size as check 2016-08-01 17:19:04 +02:00
Joas Schilling c6bf641ebe
Add system tag check 2016-08-01 17:19:04 +02:00
Joas Schilling 306d725bc3
Add the systemtag js files 2016-08-01 17:19:04 +02:00
Joas Schilling 6430164a09
Make sure each plugin is only added once 2016-08-01 17:19:01 +02:00
Lukas Reschke 8a7d450fb5 Merge pull request #684 from nextcloud/fix_csrf_ocs
Fix OCS CSRF
2016-08-01 11:52:56 +02:00
Björn Schießle 368e1c3f2b Merge pull request #685 from nextcloud/validate-theming-input
Validate the input of the theming options
2016-08-01 11:24:22 +02:00
Morris Jobke ffd29e9ec5 Merge pull request #672 from sndrr/occ-rebrand-to-nextcloud
Occ rebrand to nextcloud
2016-08-01 11:15:22 +02:00
Nextcloud bot 8ef5fcec1d
[tx-robot] updated from transifex 2016-08-01 08:53:07 +00:00
Jan-Christoph Borchardt ad5e98c81a fix missing semicolon to fix themed logo on log in page 2016-08-01 09:57:05 +02:00
Lukas Reschke f0b30d7260 Merge pull request #674 from nextcloud/action-menu-position
remove extra file size padding to fix action menu position
2016-08-01 09:40:48 +02:00
Joas Schilling 13c19e5286
Validate the input of the theming options 2016-08-01 09:37:12 +02:00
Roeland Jago Douma 5c718b13b8
We should properly check for 'true' instaed of the bool 2016-08-01 08:52:50 +02:00
Nextcloud bot 50c8367041
[tx-robot] updated from transifex 2016-08-01 00:10:15 +00:00
blizzz 7bb9502d23 Merge pull request #595 from nextcloud/fix_slow_test
Close session fast when doing a test to prevent blocking the next requests
2016-07-31 17:29:22 +02:00