Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-21 | 140 | -232/+172 |
* | Merge pull request #19907 from owncloud/scrutinizer_provisioning_api | Morris Jobke | 2015-10-21 | 2 | -3/+3 |
|\ | |||||
| * | Fix scrutinizer issues | Roeland Jago Douma | 2015-10-20 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #19895 from owncloud/fix-public-pagination | Morris Jobke | 2015-10-20 | 1 | -1/+1 |
|\ | |||||
| * | 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 | 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 | Vincent Petry | 2015-10-19 | 1 | -5/+9 |
* | | | Merge pull request #19748 from owncloud/update-preventclose | Thomas Müller | 2015-10-20 | 1 | -0/+9 |
|\ \ \ | |||||
| * | | | Allow leaving update page when errors occurred | Vincent Petry | 2015-10-20 | 1 | -0/+2 |
| * | | | Prevent leaving the DB update page while in progress | Vincent Petry | 2015-10-20 | 1 | -0/+7 |
* | | | | Merge pull request #18399 from owncloud/api-getusers-for-subadmins | Thomas Müller | 2015-10-20 | 3 | -3/+104 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'master' into api-getusers-for-subadmins | michag86 | 2015-10-13 | 2199 | -18747/+40711 |
| |\ \ \ \ | |||||
| * | | | | | [provisioning api] Updated tests | Roeland Jago Douma | 2015-08-26 | 1 | -1/+77 |
| * | | | | | enable api getUsers for subadmins | michag86 | 2015-08-26 | 2 | -2/+27 |
* | | | | | | Merge pull request #19636 from owncloud/share_expire_backgroun | Thomas Müller | 2015-10-20 | 5 | -1/+283 |
|\ \ \ \ \ \ | |||||
| * | | | | | | 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 |
* | | | | | | | Merge pull request #19742 from owncloud/shareinfo_performance | Thomas Müller | 2015-10-20 | 3 | -14/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Do not calculate non essential info | Roeland Jago Douma | 2015-10-13 | 3 | -14/+0 |
* | | | | | | | | Merge pull request #19884 from owncloud/locking_exception | Thomas Müller | 2015-10-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | catch all exception if table doesn't exists | Björn Schießle | 2015-10-20 | 1 | -1/+1 |
* | | | | | | | | Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-valu... | Thomas Müller | 2015-10-20 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | Delete cookie instead of emptying value | Lukas Reschke | 2015-10-19 | 2 | -2/+7 |
* | | | | | | | | 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 | Thomas Müller | 2015-10-16 | 1 | -55/+0 |
* | | | | | | | | | Merge pull request #19666 from owncloud/fix_13002 | Thomas Müller | 2015-10-20 | 3 | -80/+10 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Combine OCS API getUser method code into provisioning_api app | Roeland Jago Douma | 2015-10-13 | 3 | -80/+10 |
* | | | | | | | | | | 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 | Jan-Christoph Borchardt | 2015-10-19 | 1 | -1/+12 |
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #19878 from owncloud/fix-filepicker-loading-spinner | Thomas Müller | 2015-10-20 | 2 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | fix filepicker loading spinner | Christoph Wurst | 2015-10-19 | 2 | -4/+4 |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge pull request #19879 from owncloud/oci-setup-static-to-object | Thomas Müller | 2015-10-20 | 1 | -15/+17 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | [OCI setup] remove static logger/config calls | Morris Jobke | 2015-10-20 | 1 | -15/+17 |
|/ / / / / / / / / / | |||||
* / / / / / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-20 | 10 | -6/+66 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge pull request #17641 from owncloud/fix_objectstore_rename | Jörn Friedrich Dreyer | 2015-10-19 | 16 | -66/+150 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Fix error in stop script | Thomas Müller | 2015-10-16 | 1 | -11/+13 |
| * | | | | | | | | | Fix termination of the ceph docker | Thomas Müller | 2015-10-16 | 1 | -1/+2 |
| * | | | | | | | | | Fix termination of the ceph docker | Thomas Müller | 2015-10-16 | 1 | -1/+1 |
| * | | | | | | | | | 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 |
| * | | | | | | | | | fix objectstore files having create permissions | Robin Appelman | 2015-10-16 | 1 | -2/+2 |
| * | | | | | | | | | 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 |