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

11213 commits

Author SHA1 Message Date
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
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