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

2399 commits

Author SHA1 Message Date
Vincent Petry
f709022559 Fix share permissions for share tab 2015-09-16 07:23:26 +02:00
Vincent Petry
018d07b3e5 Add share dialog into share tab 2015-09-16 07:23:26 +02:00
Arthur Schiwon
edd163a611 refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability 2015-09-16 07:23:25 +02:00
Joas Schilling
59967599ac Fix the parameter order in the translation 2015-09-16 06:47:40 +02:00
Joas Schilling
fe8ef0dd36 Add reshare activities for the parent sharee and the original file owner 2015-09-15 17:36:56 +02:00
Joas Schilling
754850f473 Fix status code 2015-09-15 15:51:54 +02:00
Roeland Jago Douma
91dfcab055 Expose federated sharing capabilities to authenticated users 2015-09-15 15:10:13 +02:00
Joas Schilling
aa8b1b2894 Throw an error when the page count or perPage setting is invalid 2015-09-15 15:04:04 +02:00
Joas Schilling
665716095b Fix parameter name to match the specs 2015-09-15 12:14:14 +02:00
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Jenkins for ownCloud
ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Jenkins for ownCloud
9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Lukas Reschke
fb717f254f Merge pull request #18699 from owncloud/notification-manager 
Notification manager
 2015-09-10 15:26:36 +02:00
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Joas Schilling
38001d824b Move interfaces to private until they are no longer experimental 2015-09-08 09:01:02 +02:00
Joas Schilling
805f1d0096 Scrap the notifications when the share is accepted or declined 2015-09-08 09:01:01 +02:00
Joas Schilling
d191a0dacc Add notifications for remote shares 2015-09-08 09:01:01 +02:00
Jenkins for ownCloud
d044884cfa [tx-robot] updated from transifex 2015-09-08 01:55:56 -04:00
Morris Jobke
f3e6e0121d Merge pull request #18876 from owncloud/missing-context-on-update-file-target 
Use context function call instead of static
 2015-09-07 16:41:41 +02:00
Joas Schilling
7af7fdd929 Use context function call instead of static 2015-09-07 14:28:20 +02:00
Jan-Christoph Borchardt
004de1425e Merge pull request #18630 from owncloud/files-combineuploadbutton 
Combine upload action into the "New" menu
 2015-09-07 14:03:57 +02:00
Jenkins for ownCloud
53a0009e7b [tx-robot] updated from transifex 2015-09-07 01:55:04 -04:00
Roeland Douma
24f5f50b20 Merge pull request #18742 from owncloud/mimetype-updatedb 
Introduce mimetype DB update occ command
 2015-09-06 16:56:35 +02:00
Jenkins for ownCloud
f3b8634058 [tx-robot] updated from transifex 2015-09-05 01:55:18 -04:00
Robin McCorkell
cdf01f0419 Split mimetype handling to new class 2015-09-04 17:28:20 +01:00
Morris Jobke
e1a79cd651 Avoid re-propagation of shares during one propagation run 
* fix was proposed by @nickvergessen
 2015-09-04 16:17:27 +02:00
Jenkins for ownCloud
4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Vincent Petry
1f9974894d Merge pull request #18810 from owncloud/shared-mount-delay-setup 
Delay setting up the filesystem for a share owner untill the share is used
 2015-09-03 15:09:57 +02:00
Morris Jobke
2b9c34d756 Merge pull request #18781 from owncloud/move-background-job-registration-to-install-update 
Move background job registration to install update
 2015-09-03 14:55:07 +02:00
Robin Appelman
fd7b210654 Delay setting up the filesystem for a share owner untill the share is used 2015-09-03 13:46:08 +02:00
Lukas Reschke
ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Joas Schilling
49b98abc25 Move registration of background job to install/update 2015-09-02 19:26:22 +02:00
Björn Schießle
39bd4ea8f2 Merge pull request #18234 from owncloud/ocs_api_for_sharees_list 
Add OCS API for sharees list
 2015-09-01 17:09:57 +02:00
Roeland Jago Douma
d54b497ade Return permissions and expiration on create share responses 
Updated and added unit tests
 2015-08-30 15:42:19 +02:00
Roeland Jago Douma
2aff11c80b Actually validate the expire date on share 
* Added more intergration tests
 2015-08-30 10:31:43 +02:00
Roeland Jago Douma
fc64ea670d Allow to directly set the expireDate on a new (link)share 
Since this extends the API we now properly parse the date. We only
accept valid ISO 8601 Dates (YYYY-MM-DD).

Currently this only works for link shares (it is just ignored for other
shares). Since we do not have user/group/federated expiring shares yet.

* Tests added
 2015-08-29 12:39:47 +02:00
Vincent Petry
59273a8863 Combine upload action into the "New" menu 
Refactored the new menu to be encapsulated in the NewFileMenu JS class
 2015-08-28 17:27:48 +02:00
Morris Jobke
062fd37f74 Merge pull request #18577 from owncloud/action-details 
file action detail style fixes
 2015-08-26 16:28:40 +02:00
Thomas Müller
40203d7d1e Remove languages which are no longer maintained on transifex 2015-08-26 12:19:24 +02:00
Joas Schilling
199d1dc239 Bring the coverage back to 100% 2015-08-26 11:54:25 +02:00
Joas Schilling
2a6e676048 Adjust tests 2015-08-26 11:54:25 +02:00
Joas Schilling
aa2a894eb0 Fix performance issues of the sharees api 2015-08-26 11:54:25 +02:00
Joas Schilling
ac8941f6ac Manually query for the last id 2015-08-26 11:54:25 +02:00
Joas Schilling
f4186d3dfc Fix wrong value for datetime field 2015-08-26 11:54:25 +02:00
Joas Schilling
937586a3f0 Rename file to match the class name 2015-08-26 11:54:25 +02:00
Joas Schilling
6b69e7b1da Add tests for "getShareesForShareIds()" 2015-08-26 11:54:25 +02:00
Joas Schilling
83b88c9a26 Do not return the current user himself 2015-08-26 11:54:25 +02:00
Joas Schilling
0227cfff08 Take a list of share IDs instead of the user and group names 2015-08-26 11:54:25 +02:00
Joas Schilling
5c4fbf5191 Inject the logger as well 2015-08-26 11:54:25 +02:00
Joas Schilling
a0ab7a2578 Add all possible links next, prev, first and last 2015-08-26 11:54:25 +02:00
Joas Schilling
c6ed40c9f8 Make shareType an array 2015-08-26 11:54:24 +02:00
Joas Schilling
068a81897e Add tests for "search()" 2015-08-26 11:54:24 +02:00
Joas Schilling
327c47a989 Do not use deprecated method in new code 2015-08-26 11:54:24 +02:00
Joas Schilling
3f64e9423b Split logic and global usage and add tests for "searchSharees()" 2015-08-26 11:54:24 +02:00
Joas Schilling
a66aa1fe02 Filter the sharees with the existing shares 2015-08-26 11:54:24 +02:00
Joas Schilling
4b08783946 Use SearchResultSorter 2015-08-26 11:54:24 +02:00
Joas Schilling
16e5c15c28 Add tests for "getRemote()" 2015-08-26 11:54:24 +02:00
Joas Schilling
ad450d4f0e Add tests for "getGroups()" 2015-08-26 11:54:24 +02:00
Joas Schilling
be257bc9cc Add tests for "getUsers()" 2015-08-26 11:54:24 +02:00
Joas Schilling
9b0058d2b0 Move test file to subdir 2015-08-26 11:54:24 +02:00
Roeland Jago Douma
b2fbecc39f Empty skeleton for tests 2015-08-26 11:54:24 +02:00
Roeland Jago Douma
8a5c1e6d4d Sort sharees 
To ensure that pagination is working properly we need to make sure the
shares are always in the same order.

Sorting is first done by label (catches most instances)
If there is a user and a group with the same label we sort by shareType
If there are multiple users with the same label we sort those by
shareWith
 2015-08-26 11:54:24 +02:00
Roeland Jago Douma
98301210a9 Start of OCS Share API sharees endpoint 2015-08-26 11:54:23 +02:00
Morris Jobke
202af1e322 fix unit tests 2015-08-26 11:39:22 +02:00
Jenkins for ownCloud
90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Morris Jobke
1ca638cfbd Merge pull request #18564 from owncloud/fix-transifex-sync 
Update slug
 2015-08-25 22:00:52 +02:00
Jenkins for ownCloud
2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Thomas Müller
5cf3170e89 don't load gs-share 2015-08-25 16:49:40 +02:00
Thomas Müller
fcde0234b7 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:05:57 +02:00
Vincent Petry
6848f25c0d Merge pull request #18477 from owncloud/fed-alwaysdetectremotechanges 
Always detect remote changes for fed sharing
 2015-08-24 12:17:23 +02:00
Vincent Petry
fe568ab64d Merge pull request #18486 from owncloud/use-client-service-to-work-behind-proxy 
Use client service to work behind proxy for checks for remote ownCloud instances
 2015-08-24 11:05:14 +02:00
Jan-Christoph Borchardt
0f10e2c1fe fix horizontal scrollbar in personal settings caused by federated cloud ID section 2015-08-24 09:36:44 +02:00
Lukas Reschke
0a1d551090 Use IClientService to check for remote ownCloud instances 
1. Allows to set a timeout (though still not perfect but way better than before)
2. Allows to have unit tests
3. I also added unit tests for the existing controller code
4. Corrected PHPDoc on IClient
 2015-08-22 14:39:43 +02:00
Vincent Petry
d658d8dd4e Always detect remote changes for fed sharing 
This is even more important now that filesystem_check_changes is 0 by
default.
 2015-08-21 15:32:53 +02:00
Robin McCorkell
99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Joas Schilling
4314c8fc6f Use an IEvent object instead of a huge parameter list 2015-08-19 17:44:57 +02:00
Joas Schilling
e985dcc5a0 Send the file id when dealing with remote share responses 2015-08-19 17:44:57 +02:00
Thomas Müller
d9172a1907 Merge pull request #14401 from owncloud/ux-s2s-ldap 
allow login names to be used for s2s with LDAP users
 2015-08-19 08:31:27 +02:00
Morris Jobke
08aaa334cc Merge pull request #18389 from owncloud/fix-17770 
Fix extracting basename from path in sharing
 2015-08-18 16:22:02 +02:00
Robin McCorkell
6e47661afd Fix extracting basename from path in sharing 2015-08-18 13:41:47 +01:00
Vincent Petry
22b63ecd12 Load missing JS dep in public link page 2015-08-18 11:35:21 +02:00
Morris Jobke
5b7143885d Merge pull request #18318 from owncloud/files-sidebar-fixtabs 
Improve right sidebar tabs behavior
 2015-08-16 12:53:50 +02:00
Roeland Jago Douma
dce5d9b5d1 Add public upload to capability 2015-08-14 20:03:32 +02:00
Vincent Petry
e2549fa660 Improve right sidebar tabs behavior 
Tab heads are not rendered if only one tab.

The tab contents is updated on-demand. This means that if a tab is not
visible it is not rendered at first. If the tab was already rendered
through switching, its model will not get updated until the next time it
becomes visible. This will prevent needless rerendering of invisible tab
contents, especially considering that some tabs might need extra ajax
requests.
 2015-08-14 16:51:04 +02:00
Thomas Müller
ddc7f668e5 Merge pull request #18271 from owncloud/issue-18261-sharing-capabilities-use-wrong-default 
Fix default values of sharing capabilities
 2015-08-14 12:23:06 +02:00
Jan-Christoph Borchardt
4e53b5922d Merge pull request #18178 from owncloud/files-sidebar-actions 
Sidebar file actions
 2015-08-13 17:17:10 +02:00
Joas Schilling
20d8576d3d Fix config map provider for tests 2015-08-13 13:07:49 +02:00
Joas Schilling
70504920e7 Fix default values of sharing capabilities 
The problem is the UI used a different default than the capabilities.
So when you never touched the config, the setting in admins said "disabled"
while the capabilities said "enabled".
 2015-08-13 12:46:52 +02:00
Joas Schilling
acc452ae74 Add a basic unit test which notifies us about incompatible extending 2015-08-13 11:38:10 +02:00
Vincent Petry
55dc74bba4 Merge pull request #16543 from rullzer/files_sharing_proper_function_args 
files_sharing private function to proper signature
 2015-08-13 10:13:21 +02:00
Vincent Petry
c964eff17b Make file actions work from sidebar 
The favorite icon in the sidebar now triggers the file action and also
updates itself according to the model's state when triggered from the
file row.

The thumbnail triggers the default action.

Currently only one FileInfoModel is used for the selection and state
synchronization between views.

FileList reload now auto-closes the sidebar.
 2015-08-12 17:30:20 +02:00
Thomas Müller
eb13cb8d75 Merge pull request #18127 from owncloud/dav-request-tests 
add test framework for doing full request webdav tests
 2015-08-12 10:07:20 +02:00
Roeland Jago Douma
77b6e3d5ec Extend tests for files_sharing api 2015-08-11 15:16:35 +02:00
Roeland Jago Douma
f2e0c98a9b Move private functions to proper list of arguments 
Some private static functions in the OCS Share API
(files_sharing/api/local.php) take a params array with all the info
inside. This is bad for the limited type checking and is not clear.
 2015-08-11 15:16:22 +02:00
Jan-Christoph Borchardt
d04a6bce6f Merge pull request #17709 from owncloud/fileactions-dropdown 
Move file actions to dropdown
 2015-08-11 15:13:59 +02:00
Robin Appelman
b0c8654f9e split out creating the sabre dav server to it's own factory 2015-08-11 14:43:46 +02:00
Joas Schilling
acd54fbeda Merge pull request #16528 from owncloud/activity-302-improve-settings 
Activity 302 improve settings
 2015-08-11 11:24:27 +02:00
Roeland Douma
c2856c05aa Merge pull request #15093 from rullzer/capabilities_manager 
Capabilities manager
 2015-08-10 20:33:50 +02:00
Vincent Petry
86e1eaf370 Inline actions using default renderer are now always permanent 
Default renderer like the favorite icon can decide whether to use the
permanent class or not.

Fixed sharing code to properly update the icon according to sharing
state modifications.
 2015-08-10 15:57:21 +02:00
Vincent Petry
9acbb3e902 Remove share action display name 2015-08-10 14:13:43 +02:00
Vincent Petry
ca34921cdf Implement file actions dropdown 
File actions now have two types "inline" and "dropdown". The default is
"dropdown".
The file actions will now be shown in a dropdown menu.
 2015-08-10 14:12:34 +02:00
Roeland Jago Douma
f0b617b508 Use DI 
* Register OCP\Capability\IManager at DIContainer
* Add register capabilities to appframework
* Register capabilities in DI way
* Make unit test pass again
* Remove CapabiltiesManager from OCP
 2015-08-10 10:45:16 +02:00
Roeland Jago Douma
e84cffc063 Moved core apps to the capabilities manager 
* Files
* Files_Sharing
* Files_Trashbin
* Files_Versions
 2015-08-10 10:45:16 +02:00
Jan-Christoph Borchardt
3c36813ea7 fix right sidebar position and first style 2015-08-07 01:22:44 +02:00
Vincent Petry
3e44ca6dc2 Added unit tests for right sidebar 2015-08-07 01:22:43 +02:00
Vincent Petry
b6192db610 Disable right sidebar in public file list page 2015-08-07 01:22:43 +02:00
Vincent Petry
ad90ba27cd Styling fixes + hightlight in files sidebar 
Sidebar scrolls with contents
Highlight currently show file
 2015-08-07 01:22:43 +02:00
Vincent Petry
ff614a7dbd More fixes to the right sidebar 
Sidebar now works in all file list views.
Moved owner to share tab.
 2015-08-07 01:22:43 +02:00
Vincent Petry
12e5f310dd Improved right sidebar 
Added owner info.
Added animation, but causes scrollbal.
Default file action now when clicking on name directly.
Fixed icon.
Added empty share tab.
 2015-08-07 01:22:42 +02:00
Robin Appelman
859da8f0b3 just pass the share instead of searching for it 2015-08-05 15:41:29 +02:00
Robin Appelman
085acaf6ba add unit tests for share target conflict with group shares 2015-08-05 15:41:03 +02:00
Robin Appelman
7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Jenkins for ownCloud
54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Jenkins for ownCloud
a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Jan-Christoph Borchardt
033eacefd1 use inline confirm button style for password-protected links, ref #15176 2015-07-29 16:31:45 +02:00
Jenkins for ownCloud
c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Jenkins for ownCloud
bacada263c [tx-robot] updated from transifex 2015-07-27 01:54:38 -04:00
Jenkins for ownCloud
9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04:00
Joas Schilling
a1037f1679 Do not use magic strings when there are constants for it 2015-07-22 15:10:34 +02:00
Morris Jobke
2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group 
[sharing] fix addToGroup hook
 2015-07-21 13:30:41 +02:00
Jenkins for ownCloud
24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Jenkins for ownCloud
83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Jenkins for ownCloud
8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Morris Jobke
5cd7f7eccd Merge pull request #17623 from owncloud/fed-throwcorrectexception 
Throw storage not available on guzzle error
 2015-07-14 10:12:32 +02:00
Jenkins for ownCloud
2d5ddb02fa [tx-robot] updated from transifex 2015-07-14 01:54:45 -04:00
Vincent Petry
3d6be69f25 Throw storage not available on guzzle error 
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
 2015-07-13 18:51:25 +02:00
Vincent Petry
b3b080e1c0 Strip public webdav info about sharing and mount points 
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
 2015-07-13 14:20:35 +02:00
Jenkins for ownCloud
52e9c94e08 [tx-robot] updated from transifex 2015-07-13 01:54:50 -04:00
Jenkins for ownCloud
7cf6badad5 [tx-robot] updated from transifex 2015-07-12 01:54:49 -04:00
Jenkins for ownCloud
bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Vincent Petry
87f3500fda Merge pull request #17483 from rullzer/migrate-mimetype-js 
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
 2015-07-10 10:14:03 +02:00
Jenkins for ownCloud
176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Roeland Jago Douma
eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Morris Jobke
2b86ba43e3 Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype 
No more leaking of mounttype via metadata or icon in public shares.
 2015-07-09 09:41:27 +02:00
Jenkins for ownCloud
6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Morris Jobke
0fe81d2f21 Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions 
Fix the path for users which have an exception for a group share
 2015-07-08 10:33:42 +02:00
Jenkins for ownCloud
2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Joas Schilling
594f5b6a29 Add visibility to test methods 2015-07-07 11:07:11 +02:00
Vincent Petry
fb0fef78f4 Add test case when owner renames shared folder 2015-07-07 11:06:21 +02:00
Vincent Petry
547c4b9a9f Add unit test for getUsersSharingFile 
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
 2015-07-07 11:06:11 +02:00
Roeland Douma
b4f782b568 Merge pull request #16724 from owncloud/mimetype-js 
Javascript to fetch mimetype icons
 2015-07-06 20:59:56 +02:00
Jan-Christoph Borchardt
e84806f017 Merge pull request #17418 from owncloud/fix-public-download-button-regression 
Fix regression of button at public download page
 2015-07-06 17:10:23 +02:00
Roeland Jago Douma
868bc421cb Share app no longer use the OCS API icon 
Switch to new javascript mimetype resolver
 2015-07-06 16:32:15 +02:00
Thomas Müller
14eef434ff Merge pull request #17290 from owncloud/remove-readonly-wrapper 
Replace readonly wrapper with permissions mask
 2015-07-06 15:36:11 +02:00
Morris Jobke
7da5e53741 Fix regression of button at public download page 
* introduced with #17159
 2015-07-06 13:37:14 +02:00
Joas Schilling
4dbc8ab77f Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities 
Improve federated cloud sharing activities
 2015-07-06 10:23:33 +02:00
Joas Schilling
fca6bcb632 Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares 
Add OCS API to send, get, accept and decline remote shares
 2015-07-06 10:12:29 +02:00
Jenkins for ownCloud
55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00