mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33,544 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

33544 Commits

Author SHA1 Message Date
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
Bernhard Posselt 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
Lukas Reschke 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
Bernhard Posselt 5e24c6b5fd fix #724 by using step instead of job 2016-08-04 14:52:38 +02:00
Joas Schilling 4d5df58378 Merge pull request #727 from jurgenhaas/patch-2 
Backport of #718
 2016-08-04 14:45:28 +02:00
Joas Schilling 4bb277aee9
Order alphabetically and deduplicate the shipped.json 2016-08-04 14:42:44 +02:00
Lukas Reschke 66f6a91ade
[stable10] Add new apps as official 2016-08-04 14:28:24 +02:00
Joas Schilling 713e201074 Merge pull request #602 from nextcloud/backport-workflow-engine 
🚧 [WIP] Backport workflow engine 🚧
 2016-08-04 14:20:14 +02:00
Jürgen Haas 2037ff1f2f Backport of #718 
Backporting https://github.com/nextcloud/server/pull/718 to stable10
 2016-08-04 09:14:40 +02:00
Björn Schießle 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
Joas Schilling fc7bd03822
Add access control and automated tagging as shipped 2016-08-03 14:50:53 +02:00
Joas Schilling 8d23405602
Ooops 2016-08-03 14:44:18 +02:00
Joas Schilling 065763f117
No multi support, less magic 2016-08-03 14:44:08 +02:00
Joas Schilling 7d71535f57
Allow to define the operation 2016-08-03 14:44:01 +02:00
Joas Schilling c12c083eba
Tags need to be loaded before 2016-08-03 14:43:52 +02:00
Joas Schilling cc719c9bb7
Translate the errors 2016-08-03 14:43:44 +02:00
Joas Schilling 66fd216d3a
Load the timezones via select2 2016-08-03 14:43:35 +02:00
Morris Jobke e978c39b13
add a UI to render proper time picker 2016-08-03 14:43:26 +02:00
Joas Schilling f1869cd183
Add request time 2016-08-03 14:43:14 +02:00
Joas Schilling af3eaa86ac
Add remote address 2016-08-03 14:42:55 +02:00
Joas Schilling 01d269bb4d
Add Request URL 2016-08-03 14:42:48 +02:00
Joas Schilling 45c74cdc5a
User agent check 2016-08-03 14:40:40 +02:00
Joas Schilling d146df5820
Add file mime type 2016-08-03 14:40:29 +02:00
Joas Schilling 627f24396c
Add file size as check 2016-08-03 14:40:20 +02:00
Joas Schilling 7b87935cb9
Add system tag check 2016-08-03 14:40:12 +02:00
Joas Schilling 7b73c0f5a2
Add the systemtag js files 2016-08-03 14:40:03 +02:00
Joas Schilling df3ca567ad
Make sure each plugin is only added once 2016-08-03 14:39:56 +02:00
Morris Jobke c425a677b2
Add workflowengine to check-code call 2016-08-03 14:35:54 +02:00
Roeland Jago Douma e2c4f4f9aa
Add intergration test 2016-08-03 09:17:57 +02:00
Joas Schilling 7289cb5ec0
Do not allow to delete/update group shares as a group member 2016-08-03 09:17:50 +02:00
Julius Härtl 482a725a8b [stable10] Change app menu to white background with dark icons (#665) 
* Change app menu to white

* adjust opacity of icons in apps and user menu

* Move to svg filter on app menu to support IE9+

* fix shading of apps icon in app menu

* Fix wrong preserveAspectRatio at app menu icons

* Apply inverted app icon style to newly installed icons
 2016-08-02 19:18:00 +02:00
Jan-Christoph Borchardt 16358381cc Merge pull request #696 from nextcloud/stable10-backport-shake-login 
[stable10] Shake the login fields if password is wrong
 2016-08-02 15:33:33 +02:00
Morris Jobke 1ae21d1e33 Rebranded to Nextcloud for the occ command line tool (#692) 2016-08-02 10:14:19 +02:00
Morris Jobke c0f2207016 Shake the login fields if password is wrong 2016-08-01 22:03:56 +02:00
Jan-Christoph Borchardt 80470093dd Merge pull request #683 from nextcloud/stable10-fix-theming-logo 
[stable10] fix missing semicolon to fix themed logo on log in page
 2016-08-01 21:01:51 +02:00
Morris Jobke 481418ff40 Merge pull request #593 from nextcloud/ldap-avoidneedlesssetemailonlogin-stable10 
[stable10] Prevent setting email and triggering events at login time (#25554)
 2016-08-01 18:22:20 +02:00
Morris Jobke a60fd5b34a Merge pull request #668 from nextcloud/stable10-video-container-size 
[stable10] up the minimum size of the public share video a bit, use 16/9 ratio
 2016-08-01 18:17:40 +02:00
Jan-Christoph Borchardt a32d9bbc6e fix missing semicolon to fix themed logo on log in page 2016-08-01 18:16:32 +02:00
Morris Jobke ab18c72400 Merge pull request #667 from thelinuxfr/stable10 
[Stable10] Transifex Owncloud > Nextcloud
 2016-07-30 09:58:53 +02:00
Frédéric LIETART f7170b39ea Transifex Owncloud > Nextcloud 
Change transifex link Owncloud > Nextcloud
 2016-07-29 23:35:45 +02:00
Jan-Christoph Borchardt 0d5b8f3293 up the minimum size of the public share video a bit, use 16/9 ratio, fix #603 2016-07-29 23:35:18 +02:00