Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Display storage status as tooltip | Robin McCorkell | 2015-10-23 | 4 | -7/+47 |
| | |||||
* | Remove status indicator on modification | Robin McCorkell | 2015-10-23 | 1 | -8/+21 |
| | |||||
* | Merge pull request #19970 from owncloud/encryption-getuidonboolean | Thomas Müller | 2015-10-23 | 1 | -4/+4 |
|\ | | | | | Fix "Call to a member function getUID() on boolean" in Crypt | ||||
| * | Fix "Call to a member function getUID() on boolean" in Crypt | Joas Schilling | 2015-10-22 | 1 | -4/+4 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-23 | 12 | -8/+68 |
| | | |||||
* | | handle NoUserException in sharing code | Morris Jobke | 2015-10-22 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | * setup LDAP users * share from an LDAP user * delete that LDAP user * log in as share recipient * before: unhandled NoUserException * after: NoUserEception is logged and share is not shown anymore | ||||
* | | Merge pull request #19937 from owncloud/detailsview-donotopenonrename | Thomas Müller | 2015-10-22 | 1 | -3/+6 |
|\ \ | | | | | | | Do not display details bar after rename | ||||
| * | | Do not display details bar after rename | Vincent Petry | 2015-10-21 | 1 | -3/+6 |
| | | | |||||
* | | | Merge pull request #19931 from owncloud/fix-webui-upload-and-conflicts | Thomas Müller | 2015-10-22 | 2 | -11/+129 |
|\ \ \ | |_|/ |/| | | Fix file upload, conflict dialog, also in public link | ||||
| * | | Fix file upload, conflict dialog, also in public link | Vincent Petry | 2015-10-21 | 2 | -11/+129 |
| |/ | | | | | | | | | | | | | | | - Use "FileList" instead of "OCA.Files.App.fileList" that doesn't exist in public link page. - Fix public link upload by properly adding the form data using a new utility function "addFormData". That one is needed because IE8 upload and regular upload use a different format... | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-22 | 10 | -2/+60 |
| | | |||||
* | | [provisioning api] losen test | Roeland Jago Douma | 2015-10-21 | 1 | -1/+14 |
| | | | | | | | | | | | | | | Since we have no control of how backends sort their list of users and we also don't want to sort yet another time the test now just checks if the correct number of elements is returned and if they are from the list of group members. | ||||
* | | increase core version and add dav version number | Morris Jobke | 2015-10-21 | 1 | -0/+1 |
|/ | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-21 | 124 | -170/+74 |
| | |||||
* | Fix scrutinizer issues | Roeland Jago Douma | 2015-10-20 | 2 | -3/+3 |
| | | | | | * PHPDoc * Proper array initialization | ||||
* | fix pagination on public file list | Hendrik Leppelsack | 2015-10-20 | 1 | -1/+1 |
| | |||||
* | Merge pull request #19863 from owncloud/external-storage-wording | Thomas Müller | 2015-10-20 | 1 | -1/+1 |
|\ | | | | | fix wording on external storage checkbox, ref #19858 | ||||
| * | fix wording on external storage checkbox, ref #19858 | Jan-Christoph Borchardt | 2015-10-19 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths | Thomas Müller | 2015-10-20 | 1 | -5/+9 |
|\ \ | | | | | | | Fix Dropbox metadata cache with trimmed paths | ||||
| * | | Fix Dropbox metadata cache with trimmed paths | Vincent Petry | 2015-10-19 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | | Makes sure that the paths are trimmed to avoid duplicate entries like "/test" and "test". This should make this storage slightly faster by reducing the cache misses. | ||||
* | | | Merge pull request #18399 from owncloud/api-getusers-for-subadmins | Thomas Müller | 2015-10-20 | 3 | -3/+104 |
|\ \ \ | | | | | | | | | enable api getUsers for subadmins | ||||
| * \ \ | Merge branch 'master' into api-getusers-for-subadmins | michag86 | 2015-10-13 | 1246 | -8036/+18357 |
| |\ \ \ | |||||
| * | | | | [provisioning api] Updated tests | Roeland Jago Douma | 2015-08-26 | 1 | -1/+77 |
| | | | | | | | | | | | | | | | | | | | | | | | | | * Test pass again * Code coverage getUsers is at 100% again | ||||
| * | | | | enable api getUsers for subadmins | michag86 | 2015-08-26 | 2 | -2/+27 |
| | | | | | | | | | | | | | | | | | | | | Now subadmins can get a list of users they are subadmins of. | ||||
* | | | | | Merge pull request #19636 from owncloud/share_expire_backgroun | Thomas Müller | 2015-10-20 | 5 | -1/+283 |
|\ \ \ \ \ | | | | | | | | | | | | | Add backgroundjob to expire link shares | ||||
| * | | | | | use correct class name | Morris Jobke | 2015-10-20 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Add backgroundjob to expire link shares | Roeland Jago Douma | 2015-10-20 | 5 | -1/+283 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple background job to expire the link shares. * added unit tests | ||||
* | | | | | | Merge pull request #19742 from owncloud/shareinfo_performance | Thomas Müller | 2015-10-20 | 3 | -14/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Do not calculate non essential info | ||||
| * | | | | | | Do not calculate non essential info | Roeland Jago Douma | 2015-10-13 | 3 | -14/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to calculate a human readable date on the server side. We supply the mtime and a client can easily convert that himself if needed. This is already done most of the time since the date is often not in the exact right format. There is also no need to attach icon info. We have that available in javascript. And else the client should get the right icon based on the mimetype for its platform. * Updated tests | ||||
* | | | | | | | Merge pull request #19838 from owncloud/remove-files-remote.php | Thomas Müller | 2015-10-20 | 1 | -55/+0 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Remove apps/files/appinfo/remote.php - this is no longer used | ||||
| * | | | | | | | Remove apps/files/appinfo/remote.php - this is no longer used | Thomas Müller | 2015-10-16 | 1 | -55/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #19666 from owncloud/fix_13002 | Thomas Müller | 2015-10-20 | 1 | -27/+10 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Combine OCS API getUser method code into provisioning_api app | ||||
| * | | | | | | | | Combine OCS API getUser method code into provisioning_api app | Roeland Jago Douma | 2015-10-13 | 1 | -27/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API. | ||||
* | | | | | | | | | Merge pull request #19859 from owncloud/fix-long-groupnames | Thomas Müller | 2015-10-20 | 1 | -1/+12 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977 | ||||
| * | | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977 | Jan-Christoph Borchardt | 2015-10-19 | 1 | -1/+12 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-20 | 4 | -6/+58 |
| |_|_|_|/ / / / |/| | | | | | | | |||||
* | | | | | | | | Merge pull request #17641 from owncloud/fix_objectstore_rename | Jörn Friedrich Dreyer | 2015-10-19 | 9 | -45/+100 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | don't move files in cache twice, fixes renaming for objectstores | ||||
| * | | | | | | | | fix encryption migration test | Robin Appelman | 2015-10-16 | 1 | -0/+25 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix listing of trash files in test | Robin Appelman | 2015-10-16 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix trashbin handling of unknown/unlimited free space | Robin Appelman | 2015-10-16 | 1 | -2/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix rename shared versions test | Robin Appelman | 2015-10-16 | 1 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | handle versions expire for home storages with unlimited quota | Robin Appelman | 2015-10-16 | 1 | -8/+12 |
| | | | | | | | | | |||||
| * | | | | | | | | fix delete orphan shares test with object home storage | Robin Appelman | 2015-10-16 | 1 | -1/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix preserving file ids when restoring a file with object storage | Robin Appelman | 2015-10-16 | 1 | -1/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | dont assume home storage is local in trash test | Robin Appelman | 2015-10-16 | 1 | -13/+15 |
| | | | | | | | | | |||||
| * | | | | | | | | Make shared folder size propagation test work with object home storage | Robin Appelman | 2015-10-16 | 2 | -7/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix shared storage tests for non local home storage | Robin Appelman | 2015-10-16 | 1 | -3/+3 |
| | | | | | | | | | |||||
| * | | | | | | | | fix sabre connector tests when using a non local home storage | Robin Appelman | 2015-10-16 | 2 | -8/+14 |
| |/ / / / / / / | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-19 | 8 | -24/+114 |
| | | | | | | | | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-18 | 16 | -148/+416 |
| | | | | | | | |