Commit Graph

11851 Commits

Author SHA1 Message Date
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
Tim Dettrick 1b582ba66b Don't log expected Swift 404 responses
File existence checks are expected in some cases to be false, so passing
404 Not Found errors through to the logs just causes noise.
2015-09-14 11:12:52 +10:00
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
Robin McCorkell 080fafe63a AjaxController uses RSA auth mechanism 2015-08-28 12:58:47 +01:00
Robin McCorkell 1084e3adc7 Migrate SFTP_Key external storage to new API
The SFTP backend now supports public key authentication alongside
password authentication.
2015-08-28 12:58:47 +01:00
Robin McCorkell cb1ef82702 Migrate SMB_OC external storage to new API
SMB_OC has been merged with SMB, via the identifier aliases mechanism.
Legacy migration is done to the Session Credentials password mechanism
2015-08-28 12:58:47 +01:00
Robin McCorkell 19bc5a452a Migrate Swift external storage to new API
The Rackspace/OpenStack differences have been split into separate auth
mechanisms, with correct legacy migration
2015-08-28 12:58:47 +01:00
Jan-Christoph Borchardt 30d2283bed compress icons in navigation, move to monochrome again 2015-08-28 13:30:20 +02:00
Jan-Christoph Borchardt e9e8f57655 Merge pull request #18621 from owncloud/filetype-icons-elsewhere
fix filetype icons elsewhere, empty page, sidebar, apps menu
2015-08-28 12:40:57 +02:00
Morris Jobke d3fc28a6ba Merge pull request #18606 from owncloud/fix-filename-overflow-sidebar
fix right sidebar causing filename overflow, fix #18383
2015-08-28 12:16:53 +02:00
Vincent Petry 61bfa3652f Merge pull request #18614 from owncloud/fix-favorites-display
restore behavior where favorite stars only show up on hover, to not clutter the interface so much
2015-08-28 12:03:09 +02:00
Jenkins for ownCloud 933ac14b76 [tx-robot] updated from transifex 2015-08-28 01:55:25 -04:00
Jan-Christoph Borchardt f967a1df68 fix filetype icons elsewhere, empty page, sidebar, apps menu 2015-08-28 00:53:27 +02:00
Jan-Christoph Borchardt 589b066c4c restore behavior where favorite stars only show up on hover, to not clutter the interface so much 2015-08-27 23:09:32 +02:00
Jan-Christoph Borchardt 67f3dc232f fix right sidebar causing filename overflow, fix #18383 2015-08-27 14:49:40 +02:00
Jenkins for ownCloud 46978b616c [tx-robot] updated from transifex 2015-08-27 01:55:20 -04:00
Jan-Christoph Borchardt c41089bcad reduce grey tones to one for list highlight 2015-08-26 17:28:40 +02:00
Jan-Christoph Borchardt bf0c3b3d21 reduce grey tones in app navigation, bubble menu and scrollbar 2015-08-26 17:00: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
Bjoern Schiessle 8c08dd0ac2 occ tool to encrypt all files 2015-08-26 14:58:22 +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 27af0e82dd Merge pull request #18042 from GreenArchon/master
Properly nest groups when using memberOf to detect group membership, …
2015-08-26 11:42:47 +02:00
Morris Jobke 202af1e322 fix unit tests 2015-08-26 11:39:22 +02:00
Jan-Christoph Borchardt c11ea056d0 properly shade file actions and menu items, don't differentiate between mobile and desktop 2015-08-26 11:07:29 +02:00
Roeland Jago Douma ef3aa1218e [provisioning api] Updated tests
* Test pass again
* Code coverage getUsers is at 100% again
2015-08-26 11:00:13 +02:00
michag86 e958638221 enable api getUsers for subadmins
Now subadmins can get a list of users they are subadmins of.
2015-08-26 11:00:13 +02:00
Jenkins for ownCloud 90e11ee005 [tx-robot] updated from transifex 2015-08-26 04:10:42 -04:00
Jan-Christoph Borchardt 8d1fb6059f proper padding and whitespace for share and more actions 2015-08-26 09:57:32 +02:00
Jan-Christoph Borchardt 2458a09ac4 use same font-size for share action text 2015-08-26 09:46:47 +02:00
Christoph Wurst d7ceb3a162 adjust dropdown borders to button borders 2015-08-25 22:59:15 +02:00
Morris Jobke 1ca638cfbd Merge pull request #18564 from owncloud/fix-transifex-sync
Update slug
2015-08-25 22:00:52 +02:00
Morris Jobke 6946edef5c Merge pull request #18554 from owncloud/fix-gs-share-master
Simply hide sharing buttons for IE8
2015-08-25 21:59:14 +02:00
Lukas Reschke e2bd026b2e Merge pull request #18558 from owncloud/ext-objectstore
Prevent objectstore being set from client side
2015-08-25 20:56:51 +02:00
Jenkins for ownCloud 2171cc02c3 [tx-robot] updated from transifex 2015-08-25 12:39:10 -04:00
Robin McCorkell 63218ec098 Prevent objectstore being set from client side 2015-08-25 16:14:31 +01:00
Jan-Christoph Borchardt a262be5141 Merge pull request #18550 from owncloud/mobile-shared-style
fix being able to distinguish shared items on mobile
2015-08-25 17:08:34 +02:00
Thomas Müller 5cf3170e89 don't load gs-share 2015-08-25 16:49:40 +02:00
Jan-Christoph Borchardt 1efbc99365 Merge pull request #18543 from owncloud/remove-lines
Remove some lines
2015-08-25 16:08:06 +02:00
Thomas Müller fcde0234b7 Simply hide sharing buttons for IE8 - fixes #18011 2015-08-25 16:05:57 +02:00
Vincent Petry 1dc9283413 Merge pull request #18538 from owncloud/sidebar-improvements
Fix sidebar for trashbin and others
2015-08-25 14:57:41 +02:00
Jan-Christoph Borchardt cc898cf346 fix being able to distinguish shared items on mobile 2015-08-25 14:45:39 +02:00
Jan-Christoph Borchardt 3cfbf77866 reduce files table header line 2015-08-25 14:14:53 +02:00
Vincent Petry 010c03fc30 Fix row highlight in other file lists 2015-08-25 12:05:04 +02:00
Morris Jobke 494c1d7417 Merge pull request #18440 from owncloud/ext-backends.customjs
Migrate custom JS external storage backends to new registration API [part 2]
2015-08-25 11:52:56 +02:00
Vincent Petry 5e6fa3c938 Fix trashbin sidebar
Do not display size as it is not available.
Use display name instead of name to remove the ".d123456" suffix.
2015-08-25 11:29:35 +02:00
Vincent Petry a86602a157 Properly hide sidebar when switching between files app sections
Since there are multiple sidebars, one for each files app section, we
need to hide the correct ones.
2015-08-25 11:07:47 +02:00
Thomas Müller 2f86be9ced Merge pull request #18523 from owncloud/crazy-scanner
Prevent bkg scanner going crazy with unavailable storages (ajax/scan.php)
2015-08-25 09:23:42 +02:00
Morris Jobke 424759908d Merge pull request #18445 from owncloud/ext-only-setuservars-string
setUserVars() should only attempt substitution with strings
2015-08-25 08:43:01 +02:00
Robin McCorkell 88a78237b0 Migrate Google external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell a50ef61876 Migrate Dropbox external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell ced04f9ad2 Migrate AmazonS3 external storage to new API 2015-08-25 00:22:10 +01:00
Robin McCorkell f505883e45 Add on-backend and on-auth-mechanism events to JS 2015-08-25 00:22:10 +01:00
Morris Jobke b2fcdd65cd Merge pull request #18528 from owncloud/files-sidebar-mtime
Parse mtime from the data attributes
2015-08-24 19:44:46 +02:00
Morris Jobke 1797bb576f Merge pull request #18525 from owncloud/app-sidebar-style
Right sidebar style improvements
2015-08-24 19:44:31 +02:00
Vincent Petry 37939fb0e8 Parse mtime from the data attributes 2015-08-24 17:16:20 +02:00
Jan-Christoph Borchardt a659ccb89c bigger file thumbnail in app sidebar 2015-08-24 16:58:30 +02:00
Vincent Petry fe575feca8 Prevent scanner going crazy with unavailable storages 2015-08-24 16:42:53 +02:00
Morris Jobke e88b380973 Remove DEBUG constant and use config value
* introduces config.php option 'debug' that defaults to false
* migrate DEBUG constant to config value
2015-08-24 15:14:05 +02:00
blizzz 642ec8e3ba Merge pull request #18244 from owncloud/fix-issue-17677
Fix 17677 - Remove LDAP case sensitive checkbox
2015-08-24 13:45:15 +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
Lukas Reschke cca35f0c3e Merge pull request #18121 from owncloud/enc_improve_privkey_encryption
use password hash to encrypt private key
2015-08-24 12:03:27 +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
Morris Jobke 1f7a59b0e2 Merge pull request #18505 from owncloud/fix-personal-scrollbar
fix horizontal scrollbar in personal settings caused by federated cloud ID section
2015-08-24 11:03:37 +02:00
Vincent Petry 31d62c10bf Merge pull request #17501 from tbartenstein/patch-1
Update fileinfo.php
2015-08-24 09:57:27 +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
Lennart Rosam 4b04412db3 Spaces -> tabs 2015-08-22 01:27:32 +02:00
Lennart Rosam 588fae54cb Remove if-block as the helper does return the empty prefix 2015-08-21 22:50:28 +02:00
tbartenstein 5e1c2aecc7 fix unit test for folder renaming (icon)
fix unit test to go with #17501 and check for the new icon
2015-08-21 18:54:09 +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 6379b1932f Allow domain to be specified for SMB 2015-08-21 10:30:42 +01:00
Robin McCorkell 843135e4ff Replace array_filter() with foreach for PHP <5.6
ARRAY_FILTER_USE_KEY is PHP 5.6+
2015-08-21 10:13:15 +01:00
Robin McCorkell 5ded5c6fc1 Add availability methods to files_external FailedStorage 2015-08-20 22:47:57 +01:00
Robin McCorkell 99b54e102d Prevent shares being added to oc_storages via availability 2015-08-20 22:43:46 +01:00
Vincent Petry 7c64ae4663 Add namespace in case the file is loaded individually
Some apps might load this file in JS unit tests and need the OCA.Files
namespace to exist.
2015-08-20 17:54:52 +02:00
Joas Schilling 9573d7d60d Merge pull request #18372 from owncloud/issue-18358-object-type-and-id-for-activities
Issue 18358 object type and id for activities
2015-08-20 15:53:36 +02:00
Robin McCorkell d93bf35482 Merge pull request #18408 from owncloud/ext-ocp
Use OCP classes as much as possible in files_external v2
2015-08-20 13:09:12 +01:00
Robin McCorkell 67893ca839 Merge pull request #18380 from owncloud/files-sidebar-selectbar
Fix files select bar width when app sidebar is visible
2015-08-20 12:35:33 +01:00
Robin McCorkell 643e3a5b6d Convert string booleans to real booleans
Legacy compatibility, from the days in stable8 when checkbox boolean
values were stored as the strings 'true' and 'false'.
2015-08-20 12:23:12 +01:00
Vincent Petry 28e58594ba Merge pull request #18437 from owncloud/ext-auth-trigger
Trigger storage recheck on auth mechanism change
2015-08-20 11:58:18 +02:00
Morris Jobke 2fe070ca37 Merge pull request #18447 from owncloud/ext-fix-empty-var
Don't use `empty()` with a return value, PHP 5.4
2015-08-20 11:36:12 +02:00
Robin McCorkell 62d328525a setUserVars() should only attempt substitution with strings 2015-08-20 02:19:03 +01:00
Robin McCorkell 6907a88d14 Don't use `empty()` with a return value, PHP 5.4 2015-08-20 01:03:45 +01:00
Robin McCorkell 8cd47e4f03 Fix 'Declaration of SessionStorageWrapper::__construct()...' 2015-08-19 20:14:56 +01:00
Robin McCorkell dc335ba5a9 Trigger storage recheck on auth mechanism change 2015-08-19 20:11:29 +01:00
Morris Jobke b3356b1288 Merge pull request #18432 from owncloud/ext-backends.simple
Migrate simple external storage backends to new registration API [part 1]
2015-08-19 20:04:20 +02:00
Lennart Rosam fdf1a941b7 Add database update routine and bump version to 0.6.2 2015-08-19 17:55:21 +02:00
Lennart Rosam 45fba849a9 Remove another occurance of ldap_nocase 2015-08-19 17:54:16 +02: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
Robin McCorkell d577aad4ac Use OCP classes as much as possible in files_external 2015-08-19 15:26:38 +01:00
Robin Appelman 273c776eb7 add missing return statements in getSystem/getPersonalMountPoints 2015-08-19 16:26:33 +02:00
Robin McCorkell 16389270ff Migrate SFTP external storage to new API 2015-08-19 14:41:44 +01:00
Robin McCorkell a99e524898 Migrate OwnCloud external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell 68418bdd34 Migrate DAV external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell ab8c738b8d Migrate SMB external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell 0f1809eced Migrate FTP external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell 0ffb51c6cc Migrate Local external storage to new API 2015-08-19 14:41:43 +01:00
Robin McCorkell 118cb7df1a Allow builtin auth mechanism to be overridden
The builtin mechanism is used exclusively for legacy external storages,
which when upgraded to the new registration need to fallback to the
defined legacy authentication mechanism instead.
2015-08-19 14:41:43 +01:00
Robin McCorkell 3bb793b6a7 Implement password authentication mechanisms
Introduces the basic password authentication mechanism, along with a
mechanism based on ownCloud credentials stored in the user session.

Change to lib/private is an extension of PermissionsMask, as
isSharable() override was missing.

Session credentials auth mechanism now disables sharing on applied
storages, as credentials will not be available.
2015-08-19 14:20:09 +01:00
Vincent Petry 5fd36d017e Merge pull request #18378 from owncloud/files-delete-spinner
Fix spinner when deleting all files in a folder
2015-08-19 14:31:23 +02:00
Vincent Petry bd6beaaae2 Merge pull request #18354 from owncloud/files-fixdnd
Fix file drag and drop JS error
2015-08-19 14:30:21 +02:00
Robin McCorkell eb0e5ce12c Restrict Local backend to admin-only 2015-08-19 10:08:24 +01:00
Robin McCorkell df8f5425dc Load custom JS for all backends/auth mechanisms
Loading custom JS on a per-backend basis added needless complexity and
made dealing with async required. Now all backends/auth mechanisms load
custom JS in PHP
2015-08-19 10:08:23 +01:00
Robin McCorkell b6eb952ac6 Propagate auth mechanism/backend failures to filesystem layer
Failure to prepare the storage during backend or auth mechanism
manipulation will throw an InsufficientDataForMeaningfulAnswerException,
which is propagated to StorageNotAvailableException in the filesystem
layer via the FailedStorage helper class.

When a storage is unavailable not due to failure, but due to
insufficient data being available, a special 'indeterminate' status is
returned to the configuration UI.
2015-08-19 10:08:23 +01:00
Robin McCorkell c592e24c87 Make Application a singleton
The same Application must be used in the settings templates and in
routes, so that any registered backends are correctly seen
2015-08-19 10:08:23 +01:00
Robin McCorkell 97dbc79c16 Compatibility shims for OC_Mount_Config
The following functions have been removed:
 - addMountPoint()
 - removeMountPoint()
 - movePersonalMountPoint()

registerBackend() has been rewritten as a shim around BackendService,
allowing legacy code to interact with the new API seamlessly

addMountPoint() was already disconnected from all production code, so
this commit completes the job and removes the function itself, along
with disconnecting and removing related functions. Unit tests have
likewise been removed.

getAbsoluteMountPoints(), getSystemMountPoints() and
getPersonalMountPoints() have been rewritten to use the StoragesServices
2015-08-19 10:08:14 +01:00
Robin McCorkell c572631087 Unit tests for new backend API 2015-08-19 10:05:12 +01:00
Robin McCorkell 1eeca031f8 Split backend identifiers from the class name
Prior to this, the storage class name was stored in mount.json under the
"class" parameter, and the auth mechanism class name under the
"authMechanism" parameter. This decouples the class name from the
identifier used to retrieve the backend or auth mechanism.

Now, backends/auth mechanisms have a unique identifier, which is saved in
the "backend" or "authMechanism" parameter in mount.json respectively.
An identifier is considered unique for the object it references, but the
underlying class may change (e.g. files_external gets pulled into core
and namespaces are modified).
2015-08-19 10:05:11 +01:00
Robin McCorkell 272a46ebe1 Authentication mechanisms for external storage backends
A backend can now specify generic authentication schemes that it
supports, instead of specifying the parameters for its authentication
method directly. This allows multiple authentication mechanisms to be
implemented for a single scheme, providing altered functionality.

This commit introduces the backend framework for this feature, and so at
this point the UI will be broken as the frontend does not specify the
required information.

Terminology:
 - authentication scheme
    Parameter interface for the authentication method. A backend
    supporting the 'password' scheme accepts two parameters, 'user' and
    'password'.
 - authentication mechanism
    Specific mechanism implementing a scheme. Basic mechanisms may
    forward configuration options directly to the backend, more advanced
    ones may lookup parameters or retrieve them from the session

New dropdown selector for external storage configurations to select the
authentication mechanism to be used.

Authentication mechanisms can have visibilities, just like backends.
The API was extended too to make it easier to add/remove visibilities.
In addition, the concept of 'allowed visibility' has been introduced, so
a backend/auth mechanism can force a maximum visibility level (e.g.
Local storage type) that cannot be overridden by configuration in the
web UI.

An authentication mechanism is a fully instantiated implementation. This
allows an implementation to have dependencies injected into it, e.g. an
\OCP\IDB for database operations.

When a StorageConfig is being prepared for mounting, the authentication
mechanism implementation has manipulateStorage() called,
which inserts the relevant authentication method options into the
storage ready for mounting.
2015-08-19 10:05:11 +01:00
Robin McCorkell a6a69ef1df Introduce UserGlobalStoragesService
UserGlobalStoragesService reads the global storage configuration,
cherry-picking storages applicable to a user. Writing storages through
this service is forbidden, on punishment of throwing an exception.
Storage IDs may also be config hashes when retrieved from this service,
as it is unable to update the storages with real IDs.

As UserGlobalStoragesService and UserStoragesService share a bit of code
relating to users, that has been split into UserTrait. UserTrait also
allows for the user set to be overridden, rather than using the user
from IUserSession.

Config\ConfigAdapter has been reworked to use UserStoragesService and
UserGlobalStoragesService instead of
OC_Mount_Config::getAbsoluteMountPoints(), further reducing dependance
on that horrible static class.
2015-08-19 10:05:11 +01:00
Robin McCorkell 37beb58c6f Introduce BackendService for managing external storage backends
Backends are registered to the BackendService through new data
structures:

Backends are concrete classes, deriving from
\OCA\Files_External\Lib\Backend\Backend. During construction, the
various configuration parameters of the Backend can be set, in a design
similar to Symfony Console.

DefinitionParameter stores a parameter configuration for an external
storage: name of parameter, human-readable name, type of parameter
(text, password, hidden, checkbox), flags (optional or not).

Storages in the StoragesController now get their parameters validated
server-side (fixes a TODO).
2015-08-19 10:05:11 +01:00
Thomas Müller 0b37004808 Merge pull request #18076 from owncloud/fix-thumbnail-api-master
No need to url decode the file
2015-08-19 09:59:14 +02:00
Thomas Müller 9f6c33abe9 Merge pull request #18339 from owncloud/update-jquery-visibility
update jquery-visibility in files app
2015-08-19 09:54:05 +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
Thomas Müller 99815c17d9 Merge pull request #18287 from owncloud/smb-1.0.3
update icewind/smb to 1.0.4
2015-08-18 16:35:20 +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
Morris Jobke 7b0f43efb6 Merge pull request #18381 from owncloud/public-share-fixdepsloading
Fix file actions menu in public page
2015-08-18 13:58:03 +02:00
Vincent Petry 37a842a18e Only show delete action in menu when delete permission exists
This reverts an older decision where we said the delete action must
always appear but be grayed out when the permission is missing.
The actions menu obsoletes that.
2015-08-18 11:35:40 +02:00
Vincent Petry 22b63ecd12 Load missing JS dep in public link page 2015-08-18 11:35:21 +02:00
Vincent Petry 170259e840 Fix files select bar width when app sidebar is visible 2015-08-18 11:30:00 +02:00
Vincent Petry 730f1d199a Fix spinner when deleting all files in a folder 2015-08-18 11:14:41 +02:00
Vincent Petry ffff156965 Merge pull request #18310 from hasso/selection-string-fix
Fix the string counting a selected files/dirs
2015-08-18 10:43:17 +02:00
Hasso Tepper bbff530b65 Move decaration to the beginning of the block 2015-08-18 10:34:30 +03:00
Robin Appelman 5514a133de update icewind/smb to 1.0.4 2015-08-17 16:31:29 +02:00
Vincent Petry 009c008ed8 Fix file drag and drop JS error 2015-08-17 16:09:29 +02:00
Hasso Tepper 97bc73ad49 Update unit test to reflect the string change 2015-08-17 15:31:44 +03:00
Hasso Tepper 72799ffba2 Move selectionVars into if statement 2015-08-17 15:28:55 +03:00
Robin McCorkell 675d852c7d Merge pull request #17182 from owncloud/user_ini_upload_size
Update .user.ini when setting upload size limit
2015-08-17 13:27:47 +01:00
Morris Jobke 51c3a3ddaf update jquery-visibility in files app
* ref #12877
2015-08-17 09:39: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
Thomas Müller 184b4e7d19 Merge pull request #18320 from owncloud/public_upload_capability
Add public upload to capability
2015-08-14 21:01:41 +02:00
Roeland Jago Douma dce5d9b5d1 Add public upload to capability 2015-08-14 20:03:32 +02:00
Thomas Müller dfba425d68 Integration in files app to load scripts and styles on request 2015-08-14 18:04:17 +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
Hasso Tepper 69c550ce51 Fix the string counting a selected files/dirs
The old one contains untranslatable ' & ' if both files and dirs are
selected. The new code is especially designed to reuse strings from file
listing summary view (apps/files/js/filesummary.js), so no translation
is broken.
2015-08-14 14:50:25 +03: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
Robin Appelman e76fc1cf38 remove travis files 2015-08-14 12:21:21 +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
Robin Appelman 00deffdd47 update icewind/smb to 1.0.3 2015-08-13 16:28:44 +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 b811124aac Merge pull request #18231 from owncloud/fix-show-shared-storage-full-temporary
Show storage full warning for shared storages temporary
2015-08-13 10:05:53 +02:00
Hendrik Leppelsack e5444a1a5d replace tipsys with tooltips 2015-08-12 23:09:49 +02:00
Lennart Rosam b91186c503 Fix 17677 2015-08-12 22:18:28 +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
Vincent Petry 997577cf7a Introduce FileInfoModel
FileInfoModel is a backbone model that will make it possible to track
changes and update views accordingly
2015-08-12 17:29:54 +02:00
Morris Jobke e6bf4e559a Show strage full warning for shared storages temporary
* removed the setDefault call because then it will always be
  reshown
  * was added with ba475d4862
* fixes #18208
2015-08-12 14:14:43 +02:00
Thomas Müller 326de6f9b4 Merge pull request #18065 from owncloud/new-trashbin-retention
New trashbin retention
2015-08-12 13:13:45 +02:00
Thomas Müller 33727131ac Merge pull request #17865 from rullzer/less_static_prov_api
Move Provisioning API to OCP
2015-08-12 12:16:55 +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 b41bccd385 Check for userSession->getUser() === null 2015-08-11 15:37:06 +02:00
Roeland Jago Douma b25c3beb2f [provisioning api] Fix grouptest 2015-08-11 15:22:59 +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
Roeland Jago Douma 2148120883 [provisioning api] Test for correct displayname 2015-08-11 13:01:37 +02:00
Roeland Jago Douma 4bffe393e9 Declare fields 2015-08-11 12:51:00 +02:00
Roeland Jago Douma 934f98b592 [provisioning api] Improve apps test coverage 2015-08-11 12:47:57 +02:00
Roeland Jago Douma ed1f034e6b Fix groups 2015-08-11 12:47:42 +02:00
Morris Jobke 0abc637782 Merge pull request #18171 from owncloud/fix-language-of-files-activities-in-emails
Correctly make use of the languageCode argument in the files activity extension
2015-08-11 12:34:58 +02:00
Roeland Jago Douma 96949649f0 [provisioning api] improve coverage for groups 2015-08-11 11:47:01 +02:00
Vincent Petry 984ae8140d Fixed file actions menu to close when reclicking trigger
FileActionsMenu is now a backbone view.
The trigger and highlight handling is now done in the
FileActions.showMenu() method using events.
2015-08-11 11:35: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 Jago Douma 867f5136c2 [provisioning api] Improve test coverage user 2015-08-11 11:08:57 +02:00
Victor Dubiniuk b9f655d8ad Fix tests 2015-08-10 23:55:10 +03:00
Victor Dubiniuk 33c29d3da7 Migrate settings 2015-08-10 23:54:44 +03:00
Thomas Müller bfb9a8e58e Merge pull request #18175 from owncloud/automatic-db-prefix-query-builder
Automatic db prefix query builder
2015-08-10 21:41:32 +02:00
Victor Dubiniuk 4ef2615788 Enhance trashbin expiration settings 2015-08-10 20:40:43 +02:00
Roeland Douma c2856c05aa Merge pull request #15093 from rullzer/capabilities_manager
Capabilities manager
2015-08-10 20:33:50 +02:00
Joas Schilling e6eb74958f Remove unnecessary DB prefixes from existing query builder usages 2015-08-10 16:21:41 +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
Joas Schilling 81c3bbad57 Correctly make use of the languageCode argument in the files activity extension 2015-08-10 14:40:33 +02:00
Jan-Christoph Borchardt 08912308a0 fix width of action dropdown and last layout details 2015-08-10 14:16:49 +02:00
Jan-Christoph Borchardt 1283ecac23 remove whitespace on right cause of moved delete icon 2015-08-10 14:16:42 +02:00
Jan-Christoph Borchardt 5e7e0c7e2d fix ellipsizing for file names 2015-08-10 14:16:36 +02:00
Jan-Christoph Borchardt 28abbb1485 fix layout and design of actions dropdown 2015-08-10 14:16:26 +02:00
Vincent Petry 9acbb3e902 Remove share action display name 2015-08-10 14:13:43 +02:00
Vincent Petry b142fbe6d7 Added bubble style, applied to file actions menu 2015-08-10 14:12:34 +02:00
Vincent Petry 9454e9043a Updated unit tests for file actions and actions menu 2015-08-10 14:12:34 +02:00
Vincent Petry dd4e0a8253 Make file action menu icon permanent 2015-08-10 14:12:34 +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
Vincent Petry 15e16d335d Merge pull request #17656 from owncloud/files-rightsidebar
Basic work for right sidebar
2015-08-10 13:14:15 +02:00
Vincent Petry 038d29b8de Fix unit test for tipsy->tooltip change 2015-08-10 11:23:39 +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
Robin McCorkell 214729a552 Merge pull request #14779 from owncloud/use-iterator-directory
Use the new IteratorDirectory instead of the fakedir wrapper
2015-08-07 22:16:47 +01:00
Jan-Christoph Borchardt 09ca2e0291 Merge pull request #18125 from owncloud/filelist-emptycontentduringmask
Make sure to hide empty content message when mask is shown
2015-08-07 18:33:46 +02:00
Vincent Petry b3a1aef934 Merge pull request #13641 from owncloud/cache-storage-status
Store storage availability in database
2015-08-07 17:31:03 +02:00
Vincent Petry 8e2369f72b Make sure to hide empty content message when mask is shown 2015-08-07 15:57:16 +02:00
Bjoern Schiessle 854fd63ea9 use uid as additional information for salt 2015-08-07 15:51:43 +02:00
Bjoern Schiessle 62bc0e5264 use password hash instead of the plain password to encrypt the private key 2015-08-07 15:21:08 +02:00
Frédéric Fortier a55f233e9f fix more review comments for #18042 / #17759 2015-08-07 08:59:12 -04:00
Hendrik Leppelsack 7760300fca replace tipsy with tooltip 2015-08-07 12:33:50 +02:00
Arthur Schiwon d1439ec104 fix tipsy gravity after rebase 2015-08-07 01:23:50 +02:00
Arthur Schiwon 9c402c761f fix timezone issue with unittest 2015-08-07 01:22:45 +02:00
Vincent Petry bdfab8108e Fix sidebar mtime display unit test 2015-08-07 01:22:45 +02:00
Jan-Christoph Borchardt eb323fe8de fix position of elements in right sidebar 2015-08-07 01:22:44 +02:00
Jan-Christoph Borchardt 3c36813ea7 fix right sidebar position and first style 2015-08-07 01:22:44 +02:00
Vincent Petry 781ba420c9 Use own tabs impl in files sidebar
Also change style.
2015-08-07 01:22:44 +02:00
Arthur Schiwon 5af59c6871 rename sidebar element and use css and js utility functions to core 2015-08-07 01:22:43 +02:00
Arthur Schiwon f508cf40da sidebar shall not overlap but shrink the contnet 2015-08-07 01:22:43 +02:00
Arthur Schiwon 734c6b0b6f extend MainFileInfoDetailView JS tests 2015-08-07 01:22:43 +02:00
Arthur Schiwon 7a982872e7 Main view does not commands detail and tab views to render. Fixes JS tests.
For a predictive behaviour we need to determine who is allowed to call render
methods on the views. Either, the main view is solely allowed to call render
and views do not do anything about output until then. Or, the main view relies
on the concrete views to be ready when things are about to be shown. The latter
approach has the advantage that concrete views know when they have to update
themselves (e.g. new data arrives or information change), but the main view
has now idea of the inner workings.
2015-08-07 01:22:43 +02:00
Vincent Petry e0bcd56402 More work on right sidebar unit tests 2015-08-07 01:22:43 +02:00
Vincent Petry 3e44ca6dc2 Added unit tests for right sidebar 2015-08-07 01:22:43 +02:00
Vincent Petry f11946c8c0 Improve layout, fix mime icon 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 deb9d4d778 Right sidebar now has its own scrollbar 2015-08-07 01:22:43 +02:00
Vincent Petry d0f73d78f3 Remove horizontal scroll caused by right sidebar 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
Vincent Petry 9854e71d2c Basic work for right sidebar
Adds right sidebar with registrable panels (still WIP)
2015-08-07 01:22:42 +02:00
Vincent Petry 4c9f55a325 Merge pull request #17680 from owncloud/ftp-rmdir-file
handle rmdir on files for ftp storages
2015-08-06 18:05:28 +02:00
Vincent Petry a594b41fb0 Fix namespace conflict in OC.Encryption JS code 2015-08-06 15:53:38 +02:00
Vincent Petry 78203ecc2f Merge pull request #18082 from owncloud/share-group-conflict
Re-use the share entry we have for the shared storage instead of searching for it every time
2015-08-06 12:21:59 +02:00
Jörn Friedrich Dreyer 52085cc1ef Merge pull request #16961 from owncloud/hardening-ldap
Hardening home folder retrieval in user_ldap
2015-08-06 11:32:43 +02:00
Arthur Schiwon 6787774a32 integration tests for hardening user home retrieval 2015-08-06 09:31:07 +02:00
Morris Jobke 7f44b0fd18 Merge pull request #18077 from owncloud/fix_18055
Set proper mimetype for directories
2015-08-05 23:38:02 +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
Roeland Jago Douma bc91c5c2de Set proper mimetype for directories 2015-08-05 13:54:09 +02:00
Thomas Müller 2128bd69de No need to url decode the file 2015-08-05 13:21:04 +02:00
Lukas Reschke 99224905d8 Use absolute namespace 2015-08-05 10:30:39 +02:00
Frédéric Fortier e0469d0013 Take review comments into consideration for pr #18042 / issue #17759 2015-08-04 11:19:57 -04:00
Thomas Müller 728780aee8 Merge pull request #18024 from owncloud/phpseclib-2.0
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
Frédéric Fortier 7604bcb3cb Properly nest groups when using memberOf to detect group membership, fixes #17759 2015-08-03 20:15:22 -04:00
Robin Appelman 7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Björn Schießle 4105d17133 Merge pull request #17989 from owncloud/enc_only_update_file_cache_once
only update database on the first run
2015-08-03 11:33:46 +02:00
Andreas Fischer 3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Roeland Jago Douma 98a7e42ebb [provisioning api] Move away from OC\Util to OCP\Util 2015-08-02 10:27:36 +02:00
Roeland Jago Douma cea72c47f9 [provisioning_api] Move tests to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma a4822f9f9a [provisioning_api] Move part of apps to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 97d79202ac [provisioning_api] OC_User to IUserSession 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 9f59add9ed [provisioning_api] subadmin check for users 2015-08-02 10:22:26 +02:00
Roeland Jago Douma b745e75737 [provisioning_api] Moved groups away from static stuff 2015-08-02 10:22:26 +02:00
Roeland Jago Douma abca7737b7 [provisioning_api] Move users away from static code 2015-08-02 10:22:26 +02:00
Jenkins for ownCloud 54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Bjoern Schiessle 2f4bebb045 only update database on the first run (first run = we have a version number from the old encryption app) 2015-07-31 10:47:02 +02:00
Jenkins for ownCloud de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Morris Jobke 5699fff889 Merge pull request #17175 from owncloud/add-download-feedback
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
Jenkins for ownCloud a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Morris Jobke 0e922b1841 Only throw exception if on new LDAP setups
* this is done by setting enforce_home_folder_naming_rule for the user_ldap
  app in the app settings
2015-07-29 20:25:05 +02:00
Morris Jobke 3fa6f6f77c Hardening home folder retrieval in user_ldap
* if the home folder naming rule is specified it should not fallback
  to the "use owncloud username as home folder" scenario
* this does not allow the mixed setup of users with the attribute
  and some users without the attribute (which then would fallback to
  "use owncloud username as home folder" rule) anymore
2015-07-29 20:25:05 +02:00
Jan-Christoph Borchardt 033eacefd1 use inline confirm button style for password-protected links, ref #15176 2015-07-29 16:31:45 +02:00
blizzz 332492548f Merge pull request #17923 from owncloud/fix-17921
Remove Log info when no group filter is set, fixes #17921
2015-07-29 16:12:08 +02:00
blizzz b0036ecff6 Merge pull request #17464 from owncloud/fix-17232
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
2015-07-29 12:37:48 +02:00
blizzz e0d5eb8989 remove unused var 2015-07-29 12:10:33 +02:00
Jenkins for ownCloud e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04:00
Robin McCorkell 6f72c37464 Merge pull request #17922 from owncloud/smb-storageiddoubleslash
Double slash for SMB storage id for compatibility
2015-07-28 19:54:11 +01:00
Vincent Petry 761ba344b7 Double slash for SMB storage id for compatibility 2015-07-28 11:41:54 +02:00
blizzz 81f5672393 Remove Log info when no group filter is set, fixes #17921
The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request.
2015-07-28 11:41:21 +02:00
Morris Jobke 4076f84f88 Merge pull request #17910 from owncloud/fix-modified-tooltip
Fix tooltip for modification time
2015-07-28 08:41:26 +02:00
Jenkins for ownCloud c683b1d3c9 [tx-robot] updated from transifex 2015-07-28 01:55:00 -04:00
Arthur Schiwon 0967a54755 fix test after rebasing 2015-07-27 17:34:45 +02:00
Arthur Schiwon b37d62d9d3 fix uncaught exception on not permitted file types when setting avatar, fixes #17232 2015-07-27 17:27:00 +02:00
Arthur Schiwon 85b7bde7d4 add integration tests for avatar update 2015-07-27 17:27:00 +02:00
Arthur Schiwon 68706de45b refactor integration tests to make it easier to add new ones 2015-07-27 17:27:00 +02:00
Thomas Müller 68f14a943a Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
Hendrik Leppelsack f67477206b fixed tooltip for modified date 2015-07-27 15:56:03 +02:00
Bjoern Schiessle 5923270004 add condition to update query 2015-07-27 12:08:13 +02:00
Morris Jobke 933f087d21 Merge pull request #17526 from owncloud/fix-17516
LDAP: when checking group for matching filter, also take base DN into…
2015-07-27 08:38:45 +02:00
Jenkins for ownCloud bacada263c [tx-robot] updated from transifex 2015-07-27 01:54:38 -04:00
Jenkins for ownCloud 1e48eb8882 [tx-robot] updated from transifex 2015-07-25 01:54:48 -04:00
Joas Schilling 20cf8ec205 Add an update script to reset the value
In case encryption was not enabled, we accidently set encrypted = 1 for
files inside mount points, since 8.1.0. This breaks opening the files in
8.1.1 because we fixed the code that checks if a file is encrypted.
In order to fix the file, we need to reset the flag of the file. However,
the flag might be set because the file is in fact encrypted because it was
uploaded at a time where encryption was enabled.

So we can only do this when:
- Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
- Encryption is disabled
- files_encryption is not known in the app config

If the first two are not the case, we are save. However, if files_encryption
values exist in the config, we might have a false negative here.
Now if there is no file with unencrypted size greater 0, that means there are
no files that are still encrypted with "files_encryption" encryption. So we
can also safely reset the flag here.

If this is not the case, we go with "better save then sorry" and don't change
the flag but write a message to the ownCloud log file.
2015-07-24 10:37:39 +02:00
Bernhard Posselt 582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
Jenkins for ownCloud 9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04:00
Morris Jobke 296ed4c276 Merge pull request #17413 from owncloud/public-api-querybuilder
Add public api for Doctrine QueryBuilder and ExpressionBuilder
2015-07-22 17:29:08 +02:00
Robin McCorkell 145ab3a28d Merge pull request #17806 from owncloud/enc_improved_app_description
improved app description for the default encryption module
2015-07-22 15:06:08 +01:00
Joas Schilling a1037f1679 Do not use magic strings when there are constants for it 2015-07-22 15:10:34 +02:00
Joas Schilling 270ec3aaba Make the favorite type stream only 2015-07-22 15:10:34 +02:00
Bjoern Schiessle e97c1db728 improved app description and adjust it to the way the new encryption module works 2015-07-22 13:43:46 +02:00
Morris Jobke 009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00
Viktor Szépe 4699a29a70 Fixing line comments and indentation 2015-07-21 22:19:53 +02:00
Joas Schilling f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +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
Joas Schilling a35193c704 Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection
fix system wide mount point detection on migration
2015-07-21 11:06:02 +02:00
Jenkins for ownCloud 24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Robin McCorkell df19cabb44 Store storage availability in database
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.

Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
2015-07-20 16:27:26 +01:00
Bjoern Schiessle 570dd17d4f fix mount point detection 2015-07-20 16:00:33 +02:00
Björn Schießle 89d6439445 Merge pull request #17701 from owncloud/fix_repeated_migration
don't move keys if the key where already moved in a previous migration run
2015-07-20 15:12:52 +02:00
Robin McCorkell d3bcafe618 Update .user.ini when setting upload size limit 2015-07-20 12:52:43 +01:00
blizzz f573659b3a Merge pull request #17723 from owncloud/fix-17631
fix runtime caching in ldap's user manager, fixes #17631
2015-07-20 09:29:15 +02:00
Jenkins for ownCloud 83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Arthur Schiwon b961a29b0c fix indentation. no code changes, whitespace only. 2015-07-20 01:21:52 +02:00
Arthur Schiwon 4f910221c4 fix runtime caching in ldap's user manager, fixes #17631 2015-07-17 18:57:56 +02:00
Morris Jobke 37d085901b Merge pull request #17706 from rullzer/external_diricon_filelist
The external directories should get the correct icon in filelist
2015-07-17 16:39:46 +02:00
Bjoern Schiessle 4dba920fdd unit tests 2015-07-17 15:19:10 +02:00
Bjoern Schiessle 3000f0125f don't move keys if the key where already moved in a previous migration run 2015-07-17 15:19:10 +02:00
Roeland Jago Douma b0f21c0a43 The external directories should get the correct icon 2015-07-17 14:30:12 +02:00
Jenkins for ownCloud 8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Robin Appelman db89d1cec8 handle rmdir on files for ftp storages 2015-07-16 15:44:10 +02:00
Vincent Petry 15877ac7eb Merge pull request #17474 from owncloud/fix_trashbin
Don't try to move files to the trashbin outside of user/files
2015-07-16 14:15:45 +02:00
Thomas Müller d6f02eb703 Merge pull request #17500 from owncloud/encryption_migration_improvements
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
blizzz bfb90d10ed Merge pull request #17046 from nicolas-grekas/fix-16654
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
Nicolas Grekas 472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Robin Appelman 23d1cf26b9 Lock scanner to the given user 2015-07-15 14:08:06 +02:00
Robin Appelman da951ba059 Use the new IteratorDirectory instead of the fakedir wrapper 2015-07-15 13:57:53 +02:00
Morris Jobke 43afa4c0e3 refactor this to proper separation of concerns 2015-07-15 11:14:20 +02: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
Morris Jobke 42eb18c747 Merge pull request #17473 from owncloud/enc_fix_migration
more secure way to update the database
2015-07-09 22:41:56 +02:00
Roeland Jago Douma eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Roeland Jago Douma 7d943b2ddc Make the filelist get the mimetypeicon from the mimetype 2015-07-09 13:56:43 +02:00
Roeland Jago Douma a727cbc7a9 Remove ajax/mimeicon.php and its route 2015-07-09 13:40:13 +02:00
Roeland Jago Douma 5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Roeland Jago Douma 1aa2f6638f Make getMimeIcon use OC.MimeType.getIconUrl 2015-07-09 13:40:12 +02:00
Arthur Schiwon bfdf39b9bd LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516 2015-07-09 12:19:04 +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
Bjoern Schiessle 1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Bjoern Schiessle 85c3b9d5cf only cleanUp the remaining keys if the migration really finished succesfully 2015-07-08 18:23:18 +02:00
Bjoern Schiessle 876d7c160d more secure way to update the database 2015-07-08 13:26:53 +02:00
Bjoern Schiessle db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Hendrik Leppelsack 03a6e12bdb fix tipsy dependency 2015-07-08 10:55:53 +02: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
Morris Jobke 3f5aa27d49 refactoring into proper methods 2015-07-07 15:16:37 +02:00
Morris Jobke 3d8297c254 Fix unit tests and introduce better mocks of the HTML 2015-07-07 13:56:49 +02:00
Morris Jobke e557fe0aab Add proper download started feedback
* this code adds a cookie when a special get parameter is set
* the content of this get parameter is used as value for the cookie
* the cookie expires after 20 seconds
* the JS code checks every 500 milliseconds for the cookie
  -> if the cookie is set the request returned and the download is started
2015-07-07 13:56:49 +02:00
Morris Jobke 5a528214b8 Make download status fully visible 2015-07-07 13:56:49 +02:00
Morris Jobke 28a8697995 Reduce timeout for download spinner to 2 seconds 2015-07-07 13:56:49 +02:00
Morris Jobke 16c29021e6 Add loading spinner to multi select download button 2015-07-07 13:56:48 +02:00
Morris Jobke 0cdb46b5c6 Fix layout of disabled links in the file list
* also disable download button after click
2015-07-07 13:56:48 +02:00
Morris Jobke 28a51ef724 Add loading spinner to download icon
* vanishes after 7 seconds
2015-07-07 13:56:48 +02: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
Jenkins for ownCloud ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04: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
Thomas Müller dba6ba2523 Merge pull request #16964 from owncloud/versions_occ
add occ tool to delete versions
2015-07-06 15:34:40 +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 5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud 55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Jenkins for ownCloud 468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Roeland Jago Douma cf732c4d27 Do not leak mounttype of a public share 2015-07-04 07:27:56 +02:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Bjoern Schiessle 763b601e4a use the correct user if we update the share table 2015-07-03 15:58:52 +02:00
Björn Schießle 525745caf5 Merge pull request #17140 from owncloud/trashbin_occ
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
Morris Jobke 9da10788bc Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
Joas Schilling 2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +02:00
Joas Schilling df303b910a Allow sharing with type remote share 2015-07-03 09:28:56 +02:00
Jenkins for ownCloud b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Morris Jobke a3df41ddb6 Merge pull request #17159 from owncloud/fix-duplicate-id
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Vincent Petry 71ae96bb56 Do not show static share owner if not available
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
Vincent Petry e65034e4bc Do not register JS share plugin if core sharing API is disabled 2015-07-02 14:56:33 +02:00
Joas Schilling ddb8cc2303 Use federated cloud id as a parameter type 2015-07-02 13:14:02 +02:00
Thomas Müller 063071b58d Merge pull request #17328 from owncloud/revert-15363-ext-ocp
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
Morris Jobke f5c57e076e Merge pull request #17077 from owncloud/files-scan-absolute-path
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Vincent Petry aedf4848f7 Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Thomas Müller 079e9cecba Revert "Use OCP classes as much as possible in files_external" 2015-07-02 13:00:21 +02:00
Joas Schilling c7968d202f Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
Joas Schilling aa7c8ad191 Add the item name to the federated sahre activity 2015-07-02 12:28:48 +02:00
Joas Schilling 95faaad5cf Use the app constant to fix the grouping 2015-07-02 12:27:58 +02:00
Joas Schilling 7e3f8d3ac1 Use the item name when refering to the unaccepted remote share 2015-07-02 12:26:06 +02:00
Joas Schilling bfcb8ffeb3 Merge pull request #17246 from owncloud/share-lock-owner-parent
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling a6ea91996c Fix duplicated line in doc block 2015-07-02 10:24:16 +02:00
Lukas Reschke b100036457 Bump versions 2015-07-02 09:18:41 +02:00
Lukas Reschke 68f8717056 [master] Remove OCS IDs
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Jenkins for ownCloud d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Vincent Petry 9c06975bd5 Fix scanFile signature to avoid boring warning 2015-07-01 16:29:11 +02:00
Robin Appelman dd20cd1995 remove no longer needed readonly wrapper 2015-07-01 15:45:54 +02:00
Robin Appelman 365fafc9bc use permissions mask wrapper instead of readonly wrapper 2015-07-01 15:45:23 +02:00
Robin Appelman 3c0be7d126 only lock the parent folders 2015-07-01 15:10:25 +02:00
Robin Appelman d6f56ea609 lock parent folders for the owner when locking a shared file as recipient 2015-07-01 15:10:22 +02:00
Vincent Petry 5caeda33f1 Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
Vincent Petry 5d3aa36355 Catch more error codes thrown by federated shares
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Robin McCorkell 728a22cda1 Use OCP classes as much as possible in files_external 2015-07-01 09:08:28 +02:00
Morris Jobke 8f05d4b662 Merge pull request #16535 from rullzer/ocs_share_api_url
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
Morris Jobke 044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Thomas Müller 0a23d566ba Merge pull request #17255 from owncloud/fix-17119
[LDAP] Filter user groups obtained by memberof
2015-07-01 00:33:39 +02:00
Arthur Schiwon 5f4db0540a tests solidity 2015-06-30 14:09:11 +02:00
Arthur Schiwon 646f2f1d41 adjust unit test 2015-06-30 13:56:25 +02:00
Arthur Schiwon 663cd7af4d integration test 2015-06-30 12:52:27 +02:00
Thomas Müller 372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Robin Appelman abb0c728ef handle error during setup 2015-06-29 14:06:32 +02:00
Vincent Petry b55f71ee03 Merge pull request #17083 from owncloud/share-etag-update-target
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Jenkins for ownCloud 733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Jenkins for ownCloud 4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke af01958f3e Add missing annotations for parameters 2015-06-27 20:35:47 +02:00
Lukas Reschke d1f0ff372e Merge pull request #17163 from owncloud/update-licenses
Update license headers
2015-06-27 20:22:23 +02:00
Lukas Reschke 465606c254 Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
Jenkins for ownCloud 28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Clark Tomlinson ca1da0acb7 add check if server returns a 500 and display error
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
Olivier Paroz b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Arthur Schiwon 8625a8cf23 ensure groups match filter when using memberOf to read users group, refs #17119 2015-06-26 16:42:11 +02:00
Vincent Petry 56d9df34cb Unit test for etag update on custom share folder 2015-06-26 16:32:28 +02:00
Björn Schießle b318b9cf17 Merge pull request #17008 from owncloud/fix-17006
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Thomas Müller 9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Jenkins for ownCloud b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Robin Appelman 0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Morris Jobke 5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Morris Jobke 160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo
Ldap/ad typo
2015-06-25 07:56:04 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke a63f6023fd Dropped an S from the mouseover
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
Bjoern Schiessle 407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Robin Appelman c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke 5f59393b30 Merge pull request #17110 from owncloud/share-error-handling
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke 004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Roeland Jago Douma 6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Thomas Müller 4da1c84296 Rename user_webdavauth to prevent accidental activation - refs #17112 2015-06-24 12:17:17 +02:00
Jenkins for ownCloud ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke 4f2f8a6f28 [sharing] handle shares of users that aren't available anymore
* properly handle the case where an abandoned share is left and
  simply skip it
2015-06-23 18:22:36 +02:00
Vincent Petry e01db549a0 Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype
Use trusted mimetype
2015-06-23 08:45:05 +02:00
Jenkins for ownCloud 3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Thomas Müller 25581c7b63 Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
Robin Appelman 5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Clark Tomlinson 5466dcadc0 adding correct blocking logic for fff 2015-06-22 11:42:42 -04:00
VicDeo 5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt 9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Lukas Reschke 3d2ac6dbb6 Use trusted mimetype
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
Bjoern Schiessle 8eda9ae83c add filter-empty class if no search result in current folder 2015-06-22 12:13:05 +02:00
Jenkins for ownCloud c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Robin McCorkell 05fb9ceef9 Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Jenkins for ownCloud 59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Bjoern Schiessle ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Thomas Müller 5c2646a4bf Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
Jenkins for ownCloud a5eb2f01a9 [tx-robot] updated from transifex 2015-06-19 01:55:29 -04:00
Vincent Petry e15dd783ab Workaround for empty dir deletion for SFTP
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.

This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
Lukas Reschke ebb5523698 Verify if path exists
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
2015-06-18 16:48:32 +02:00
Björn Schießle 7a0917e5b2 Merge pull request #16692 from owncloud/add_social_media_buttons
Add social media buttons
2015-06-18 14:41:58 +02:00
Bjoern Schiessle f9093466bf add id to url 2015-06-18 13:00:50 +02:00
Thomas Müller a04cb82fd9 Merge pull request #16890 from owncloud/fix-16588
the user is gone, userExists will not bring him back. But the user's …
2015-06-18 12:51:06 +02:00
Lukas Reschke 8d4f918671 Merge pull request #16993 from owncloud/verify-if-path-exists
[master] Verify if path exists
2015-06-18 10:05:12 +02:00
Jenkins for ownCloud c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Morris Jobke 9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle
Fix childs of slideToggle not sliding the target
2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt b43bfaf132 fix look of 'Share with me via ownCloud' button, fix wording 2015-06-17 16:05:05 +02:00
Lukas Reschke 414896d8a0 Throw nicer error message instead 500 2015-06-17 15:39:13 +02:00
Lukas Reschke 2d648ed0eb Verify if path exists
We need to verify if the specified path exists to gracefully prevent errors.
2015-06-17 15:06:50 +02:00
Jan-Christoph Borchardt 2abedd544b remove unneeded span around Settings text, fixes cursor 2015-06-17 14:37:58 +02:00
Arthur Schiwon 0e522a0b01 delete user test to take getHome into account to ensure it is also deleted subsequently 2015-06-17 14:13:01 +02:00
Bjoern Schiessle fa16c1f9b4 fix path to owncloud logo 2015-06-17 13:53:59 +02:00
Bjoern Schiessle ac9733a8b8 make the click actions work 2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt 4599da9608 federated cloud ID: add icons, fix HTML & layout, fix wording 2015-06-17 13:53:59 +02:00
Bjoern Schiessle 06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Thomas Müller d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Jenkins for ownCloud 3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Bjoern Schiessle b645d795d2 add occ tool to delete versions 2015-06-16 16:56:27 +02:00
Morris Jobke b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate
Skip directory entry in S3 opendir
2015-06-16 09:48:10 +02:00
Jenkins for ownCloud 0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Vincent Petry f98030020f Properly set mtime on S3 for touch operation
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.

Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
2015-06-15 17:35:09 +02:00
Vincent Petry d3f828af45 Skip directory entry in S3 opendir
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
2015-06-15 17:30:09 +02:00
Robin Appelman f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Robin Appelman 5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Thomas Müller 433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails
Determine the size we need before asking for a thumbnail
2015-06-15 13:30:44 +02:00
Thomas Müller 3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding
Truncate preview resolution
2015-06-15 12:53:05 +02:00
Jenkins for ownCloud 2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud 51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Olivier Paroz 7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Olivier Paroz 8ff4a66f01 Determine the size we need before asking for a thumbnail
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
2015-06-12 18:50:21 +02:00
Jenkins for ownCloud abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Arthur Schiwon 97127cd971 the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway 2015-06-11 18:24:45 +02:00
Vincent Petry d256425aba Truncate preview resolution
This prevents having float numbers appear in the URL
2015-06-11 17:17:40 +02:00
Jenkins for ownCloud 88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Thomas Müller 4747c7f509 Merge pull request #16736 from owncloud/utilize-member-of
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud 4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller 5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00
Morris Jobke 7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Thomas Müller 0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Morris Jobke bacd5de453 Merge pull request #16811 from espenfjo/master
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Jenkins for ownCloud 75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Bjoern Schiessle d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen 308b97db4c Fix regression in preview height calculation
Fix regressions introduced in a672e9d regarding the image height calculation
2015-06-08 20:57:19 +02:00
Jenkins for ownCloud 2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud 3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud 16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Morris Jobke 62ae39208a Add owner to the storage stats to enable better notifications
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Thomas Müller 9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
Check whether the user exists before trying to set up his file system
2015-06-05 16:22:03 +02:00
Joas Schilling bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Thomas Müller ccbb1cce3c Merge pull request #16718 from owncloud/files-catchajaxexceptions
Catch exceptions in files ajax calls
2015-06-05 12:01:01 +02:00
Joas Schilling 4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Morris Jobke c747a58978 Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression
port detection needs to take care of now thrown exceptions when LDAP …
2015-06-05 11:10:37 +02:00
Jenkins for ownCloud e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Arthur Schiwon 6f69fab384 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-04 16:28:48 +02:00
Jenkins for ownCloud 66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Arthur Schiwon 090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Morris Jobke a90a84b0a7 Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
Arthur Schiwon 91841bb25d Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits. 2015-06-03 15:23:37 +02:00
Vincent Petry 263bb46ff8 Catch exceptions in files ajax calls 2015-06-03 14:31:58 +02:00
Joas Schilling d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Jenkins for ownCloud 410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Vincent Petry 61356b5560 Keep versions when deleting as recipient
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
Lukas Reschke 1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
Morris Jobke 70f0cf67a5 L10n for federated cloud ID and rtrim '/' on ID 2015-06-02 15:16:21 +02:00
Bjoern Schiessle 6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Morris Jobke cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Lukas Reschke 418f4e1a90 Bump Dropbox library to newest upstream version 2015-06-01 17:03:46 +02:00
Robin Appelman 661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman 536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Vincent Petry 5a38964218 Merge pull request #16629 from owncloud/files-renametoreservedname
Check target name on rename with web UI
2015-06-01 11:07:08 +02:00
Lukas Reschke 88ee082115 Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
Fix files_external l10n
2015-06-01 09:11:21 +02:00
Jenkins for ownCloud b1ac538679 [tx-robot] updated from transifex 2015-06-01 01:54:54 -04:00
Jenkins for ownCloud 8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Morris Jobke 80d4309669 Fix files_external l10n
* current l10n..pl script can't extract JS functions that are within a handlebars
  template - therefore they are duplicated until the script is fixed
2015-05-30 14:00:52 +02:00
Jenkins for ownCloud a3bc112412 [tx-robot] updated from transifex 2015-05-30 01:55:46 -04:00
Vincent Petry 13617c8bf1 Check target name on rename with web UI
When renaming over the web UI, check early that the target name is
valid.

This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
2015-05-29 19:30:09 +02:00
Björn Schießle 01a241f711 Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
Vincent Petry 9a6d253af3 Abort expiration when file is gone
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.

This prevents showing useless warnings in the log and simply bail out.
2015-05-29 13:15:12 +02:00
Thomas Müller c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Martin f084eb07f2 Missing translation in ldap part.wizard-server.php 2015-05-29 10:50:02 +02:00
Jenkins for ownCloud fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Thomas Müller b95ebb76e5 Merge pull request #16607 from owncloud/ie9-textpreviewfallback
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
Thomas Müller 863139c1e2 Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end
Make string 'SFTP with secret key login' translateable
2015-05-28 20:42:08 +02:00
Vincent Petry 29c68a4e61 Return 404 in shareinfo.php when outgoing s2s disabled 2015-05-28 17:59:43 +02:00
Vincent Petry 2daef7c7dc Fallback to picture preview for IE <= 9
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.

So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
2015-05-28 15:36:28 +02:00
Björn Schießle e1483f65c3 Merge pull request #16591 from owncloud/enc_improved_error_message
improved error message for various states
2015-05-28 10:55:53 +02:00
Jenkins for ownCloud 1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Bjoern Schiessle 68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Bjoern Schiessle 5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Martin cdbf472c4d Make string 'SFTP with secret key login' translatable 2015-05-27 15:38:05 +02:00
Jenkins for ownCloud fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00