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

11309 commits

Author SHA1 Message Date
Robin McCorkell
373e2f890f Unit tests for UserGlobalStoragesService::getUniqueStorages() 2015-09-16 13:13:01 +01:00
Robin McCorkell
ca7b4a42f9 Fix external storage priority logic 2015-09-16 13:12:47 +01:00
Thomas Müller
4d77fac191 Merge pull request #19048 from owncloud/details-icon 
add details icon for file actions dropdown
 2015-09-16 13:56:30 +02:00
Thomas Müller
919b7d203f Merge pull request #19066 from owncloud/fix-new-menu-mobile 
fix new menu not showing on mobile, fix #18879
 2015-09-16 13:54:57 +02:00
Jan-Christoph Borchardt
2356ba2494 fix accessibility of New button, use alt text instead of tooltip 2015-09-16 11:51:58 +02:00
Jan-Christoph Borchardt
475603eeb7 fix new menu not showing on mobile, fix #18879 2015-09-16 09:49:39 +02:00
Thomas Müller
afc7eeacaf Merge pull request #18185 from owncloud/share-dialog-files-sidebar 
Share dialog files sidebar
 2015-09-16 09:40:53 +02:00
Thomas Müller
af517103b1 Merge pull request #18735 from owncloud/checkbox-style 
custom checkbox style
 2015-09-16 09:34:46 +02:00
Thomas Müller
fad963970c Merge pull request #19062 from owncloud/line-height 
fix height of 'All files' entry in sidebar
 2015-09-16 09:26:36 +02:00
Hendrik Leppelsack
0ce3b19e11 fix filelist checkboxes 2015-09-16 09:06:05 +02:00
Raghu Nayyar
7ccd02ec95 Fixes white and black checkboxes in core, files will be next. 2015-09-16 09:06:05 +02:00
Vincent Petry
e7e0cfe93d Properly show sidebar when clicking on share button 2015-09-16 07:23:29 +02:00
Vincent Petry
996639f4fb More unit tests for share dialog 2015-09-16 07:23:29 +02:00
Vincent Petry
886f1ed660 Update JS unit tests for share dialog (WIP) 2015-09-16 07:23:29 +02:00
Vincent Petry
e90065881d Bring back the share icon and update its status 
Display share icon in file list row.
Update share icon status when the sharing state changed.
 2015-09-16 07:23:28 +02:00
Arthur Schiwon
6d832359b6 fix allow upload checkbox appeareance 2015-09-16 07:23:28 +02:00
Arthur Schiwon
9fe6d7c568 implements setting and removing password for link shares, including forced ones 2015-09-16 07:23:28 +02:00
Arthur Schiwon
5fad379bf1 remove obsolete file action 2015-09-16 07:23:27 +02:00
Arthur Schiwon
258a2e2696 now you even can share 2015-09-16 07:23:27 +02:00
Arthur Schiwon
ce1b0c650e show link share 2015-09-16 07:23:27 +02:00
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
Robin McCorkell
7fc545470c Make AmazonS3 path style actually work 2015-09-16 02:02:59 +01:00
Robin McCorkell
17d1358aee AmazonS3 Ceph tests 2015-09-16 01:56:49 +01:00
Thomas Müller
d1f7087b6c Merge pull request #18979 from owncloud/sidebare-preview-fixes 
Sidebare preview fixes
 2015-09-16 00:12:25 +02:00
Bjoern Schiessle
9bd4f2d41e occ script to disable encryption and to decrypt all files again 2015-09-15 22:39:44 +02:00
Robin McCorkell
0667c4363d Merge branch 'master' into smb-workgroup 2015-09-15 19:36:43 +01:00
Victor Dubiniuk
1f7ac2c309 Postrebase cleanup 2015-09-15 21:12:49 +03:00
Victor Dubiniuk
0cefbd76b9 Add expiration for versions older than max 2015-09-15 21:12:39 +03:00
Lukas Reschke
82c2e0df7c Merge branch 'master' into version-retention 2015-09-15 19:29:06 +02:00
Jan-Christoph Borchardt
1d56d74c3f fix height of 'All files' entry in sidebar 2015-09-15 19:25:49 +02:00
Jan-Christoph Borchardt
00d756b4d1 adjust multiselect bar to controls bar, fix #18989 2015-09-15 18:11:44 +02:00
Vincent Petry
7ab57f7f27 Add details icon for details menu item 2015-09-15 17:52:01 +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
Jan-Christoph Borchardt
accebae356 fix filename display in sidebar, fix #18981 2015-09-15 17:03:46 +02:00
Thomas Müller
ae9ea244f2 Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all 
Function does return void
 2015-09-15 17:03:34 +02:00
Victor Dubiniuk
cb529acc5c Follow PSR 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3dc5b0317 Add method docblock 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
f46b434a12 Namespacing, reusing 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3e055549e Improvements 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
b95d1e6683 Add quota status to expiration check 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
7ef937d8ad Add versions obligation 2015-09-15 17:08:54 +03:00
Joas Schilling
754850f473 Fix status code 2015-09-15 15:51:54 +02:00
Robin Appelman
8767c2b3be fix small mimetype icons 2015-09-15 15:40:42 +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
Frank Karlitschek
650e600b94 Merge pull request #18273 from owncloud/files-sidebar-toggle 
Keep right sidebar open, add Details action
 2015-09-15 14:45:34 +02:00
Robin Appelman
72cfeaf157 recognize eps, psd and illustrator as image 2015-09-15 14:32:07 +02:00
Robin Appelman
98966329bf crop to the center for landscape images 2015-09-15 14:32:07 +02:00
Robin Appelman
a734606649 Various thumbnail fixes 
- Show square images as portrait
- Set max height based on sidebar width
- cleanup
 2015-09-15 14:32:07 +02:00
Robin Appelman
19e1d35373 Fix path for fileinfomodel in subdirectories 2015-09-15 14:29:37 +02:00
Robin Appelman
1c792b9f43 normal margins for portrait previews 2015-09-15 14:29:37 +02:00
Lukas Reschke
7953cc9494 Function does return void 
This function does return void and not a bool.
 2015-09-15 14:02:10 +02:00
Joas Schilling
665716095b Fix parameter name to match the specs 2015-09-15 12:14:14 +02:00
Jenkins for ownCloud
24d2cbf3de [tx-robot] updated from transifex 2015-09-15 01:54:50 -04:00
Vincent Petry
d0cea82969 Fixed sidebar toggle entry 
Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
 2015-09-14 20:45:30 +02:00
Vincent Petry
8a6574e81a Keep right sidebar open, add Details action 2015-09-14 20:45:30 +02:00
Lukas Reschke
4a777d686b Merge pull request #18966 from owncloud/ext-remove-numeric-id 
Remove storing storage_id in mount.json
 2015-09-14 15:04:23 +02:00
Lukas Reschke
1369525e7f Merge pull request #18982 from owncloud/fix_18878 
enforce loading icon in sidebar to be 32x32
 2015-09-14 12:47:53 +02:00
Individual IT Services
04db96adaf Merge pull request #19006 from owncloud/individual-it-patch-1 
allow ".." in folder names
 2015-09-14 15:56:53 +05:45
Bjoern Schiessle
7f459c64cb check for the right user if we can change his password 2015-09-14 11:49:16 +02:00
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Individual IT Services
f7e66d49fc allow ".." in folder names 
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
 2015-09-14 10:42:00 +05:45
Robin McCorkell
522619f90e Fix dependency check for Swift and SMB_OC 
Mistake caused during merging, where the API had changed
 2015-09-13 21:41:02 +01:00
Robin McCorkell
0dc7181335 Merge pull request #18441 from owncloud/ext-backends.advanced 
Migrate advanced external storage backends to new registration API [part 3]
 2015-09-13 19:38:22 +01: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
Georg Ehrke
4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +02:00
Robin McCorkell
57e49d2005 Merge pull request #18733 from owncloud/ext-dependencycheck 
Make checkDependencies a real method
 2015-09-11 09:46:40 +01:00
Robin McCorkell
e99988b9c7 Merge pull request #18676 from owncloud/ext-eventdispatcher 
files_external event dispatcher
 2015-09-11 09:34:05 +01:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Robin McCorkell
d67251fe4c Remove storing storage_id in mount.json 
One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
 2015-09-10 22:09:42 +01: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
Morris Jobke
f67a691215 Merge pull request #18895 from owncloud/make-code-analyzers-happier 
Add proper PHPDoc
 2015-09-09 23:40:30 +02:00
Lukas Reschke
46a328a75a Merge pull request #18873 from owncloud/enc_use_master_password 
Allow admin to use a master key for all files
 2015-09-09 17:05:53 +02:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Bjoern Schiessle
b2e6d7b5f4 occ command to enable master key 2015-09-08 14:58:42 +02:00
Lukas Reschke
a7f132a964 Add proper PHPDoc 
Makes my IDE happier when going through that file.
 2015-09-08 14:02:30 +02: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
Bjoern Schiessle
acfc7d7c4d enable usage of a master key 2015-09-07 16:08: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
Morris Jobke
4251dcecca Remove unneeded include 
* fixes #18867
* ref #18748
 2015-09-07 10:33:23 +02:00
Jenkins for ownCloud
53a0009e7b [tx-robot] updated from transifex 2015-09-07 01:55:04 -04:00
Morris Jobke
f2ca0f6677 Merge pull request #18748 from owncloud/files-versions-tab 
Add versions tab to files sidebar
 2015-09-07 00:53:57 +02: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
3642fb701a [tx-robot] updated from transifex 2015-09-06 01:54:56 -04: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
Morris Jobke
c9457fdcad Merge pull request #18762 from owncloud/use-json-instead-of-unserialize 
Use "json_encode" and "json_decode" instead of unserialize
 2015-09-04 11:40:01 +02:00
Jenkins for ownCloud
4100b151cc [tx-robot] updated from transifex 2015-09-04 01:55:31 -04:00
Robin McCorkell
cacbae9d55 Merge pull request #18815 from owncloud/ext-update 
Set default mount options for external storages
 2015-09-03 16:05:19 +01:00
Vincent Petry
310d797284 Add versions tab to files sidebar 
- move versions to a tab in the files sidebar
- added mechanism to auto-update the row in the FileList whenever values
  are set to the FileInfoModel given to the sidebar
- updated tags/favorite action to make use of that new mechanism
 2015-09-03 16:47:24 +02:00
Robin McCorkell
f1e97433f7 Set default mount options for external storages 2015-09-03 14:57:14 +01: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
Vincent Petry
73c61941e2 Tags in FileInfo map must be an array 
Fixes FileList.elementToFile to make an array for the tags instead of
keeping the original joined string
 2015-09-03 13:01:14 +02:00
Vincent Petry
4ba2333507 Added unit tests for "new" file menu and small fixes 
- added unit tests for NewFileMenu
- use generateUrl for FileList.createFile and FileList.createDirectory
- added unit tests for FileList.createFile and FileList.createDirectory
 2015-09-03 12:17:35 +02:00
Lukas Reschke
ac7d2efbe3 Collapse HTML code for federated code 2015-09-03 11:57:48 +02:00
Vincent Petry
d4104ed9f7 Remove ellipsis on new file menu items 2015-09-03 10:57:34 +02:00
Robin McCorkell
442f5269ef Fix Swift legacy auth mechanism fallback 2015-09-03 09:57:29 +01:00
Robin McCorkell
e33d7b34fa Fix typo in SMB_OC 2015-09-03 09:57:18 +01:00
Vincent Petry
3ea9f97c36 Fix sidebar thumbnail loading JS unit tests 2015-09-03 08:24:50 +02:00
Jan-Christoph Borchardt
69b6358df6 fix icon and layout details for new menu 2015-09-03 00:58:03 +02:00
Joas Schilling
49b98abc25 Move registration of background job to install/update 2015-09-02 19:26:22 +02:00
Robin Appelman
068ff09cfe fallback for isimage 2015-09-02 19:22:46 +02:00
Joas Schilling
cea8cc73c8 Move registration of LDAP background jobs to the install and update 2015-09-02 19:21:45 +02:00
Jenkins for ownCloud
772d39f006 [tx-robot] updated from transifex 2015-09-02 07:08:44 -04:00
Lukas Reschke
36e26c6f09 Use "json_encode" and "json_decode" instead of unserialize 2015-09-02 12:26:37 +02:00
Robin Appelman
e85620ab69 larger preview for images in the sidebar 2015-09-02 10:32:43 +02:00
Robin Appelman
c6060f53cd allow handling thumbnail errors 2015-09-02 10:32:43 +02:00
Jenkins for ownCloud
310084cc25 [tx-robot] updated from transifex 2015-09-01 14:03:19 -04: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
Vincent Petry
601c61fddf Merge pull request #12088 from AdamWill/google-opendir-root 
[WIP] google: drop duplicate path trim from opendir()
 2015-09-01 13:36:27 +02:00
Vincent Petry
0d4562c938 Merge pull request #18631 from owncloud/more_ocs_share_data 
Return permissions and expiration on create share responses
 2015-09-01 12:29:02 +02:00
Robin McCorkell
23e4b6e0c2 Test legacy backend with no dependency check 2015-09-01 10:29:49 +01:00
Robin McCorkell
cd506f210d Make checkDependencies a real method 
Replace ->setDependencyCheck(callable) with a real method
checkDependencies(). A polyfill is available for legacy storages.
 2015-09-01 10:25:33 +01:00
Robin McCorkell
82d9829c97 Fire event when BackendService is available 2015-08-31 15:11:45 +01:00
Robin McCorkell
d64bdc0fef Unit test storages with an empty mount point 2015-08-31 14:01:05 +01:00
Robin McCorkell
1e2e5abe26 Allow an empty mount point 2015-08-31 13:23:23 +01:00
Jenkins for ownCloud
65784227d6 [tx-robot] updated from transifex 2015-08-31 01:54:45 -04:00
Morris Jobke
89b603a4b3 Merge pull request #18671 from owncloud/cleanup-sidebar-semantics 
Removes unecessary divs and adds max width to longer names.
 2015-08-31 00:38:18 +02:00
Raghu Nayyar
c6053daf43 Fixes failing tests 2015-08-31 00:14:07 +02:00
Morris Jobke
5d1fb8cb11 Introduce small line for navigation sidebar 2015-08-30 20:47:22 +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
Bjoern Schiessle
166e57cf61 return false if private key is not valid 2015-08-30 15:31:19 +02:00
Bjoern Schiessle
f893de4136 use login name for password reset 2015-08-30 15:31:19 +02:00
Raghu Nayyar
468bde67ff Removes unecessary divs and adds max width to longer names. 2015-08-30 14:17:18 +02:00
Vincent Petry
045f8cc971 Merge pull request #18651 from owncloud/ocs_share_create_with_expire 
Allow to directly set the expireDate on a new (link)share
 2015-08-30 10:50:12 +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
Jenkins for ownCloud
114d1acd2c [tx-robot] updated from transifex 2015-08-30 01:54:51 -04: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
Lukas Reschke
faa62d1799 Merge pull request #18393 from owncloud/objectstore-check-class 
make sure we actually have an object store
 2015-08-29 10:11:39 +02:00
Jenkins for ownCloud
64652b3000 [tx-robot] updated from transifex 2015-08-29 01:55:05 -04:00
Björn Schießle
6e210d960c Merge pull request #18423 from owncloud/occ_encrypt_all 
occ command line tool to encrypt all files
 2015-08-28 20:44:55 +02:00
Robin McCorkell
0b97a05e7b Prevent creation of deprecated backends 2015-08-28 17:43:41 +01:00
Robin McCorkell
d2e3c17c00 Introduce MODIFY permission for external storages 2015-08-28 17:43:30 +01:00
Robin McCorkell
f0c8cfa9a6 Validate permissions for created admin storages, auth mechanism 
Backend and auth mechanism permissions are checked on storage creation,
both for personal storages and for admin storages
 2015-08-28 17:28:44 +01:00
Robin McCorkell
cc88c5f4b8 Implement more fine-grained external storage permissions model 
VisibilityTrait -> PermissionsTrait

PermissionsTrait stores two sets of data, $permissions and
$allowedPermissions (analogous to $visibility and $allowedVisibility of
VisibilityTrait). Each set is a map of user type ('admin' or 'personal')
to permissions (mounting permission, create permission).

The result is that a backend can now be restricted for creation, while
still allowing it to be mounted. This is useful for deprecating backends
or auth mechanisms, preventing new storages being created, while still
allowing existing storages to be mounted.
 2015-08-28 17:21:58 +01: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
Robin Appelman
d14252d9c7 make sure we actually have an object store 2015-08-28 16:13:19 +02:00