Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22900 from owncloud/diskfreespace-filesworkaround | Thomas Müller | 2016-03-07 | 1 | -1/+9 |
|\ | |||||
| * | Fix call to disk_free_space when a file is provided | Vincent Petry | 2016-03-07 | 1 | -1/+9 |
* | | Merge pull request #22902 from owncloud/share-archivenamedownloadall | Thomas Müller | 2016-03-07 | 2 | -3/+5 |
|\ \ | |||||
| * | | Remove "files" arg from download URL in public link page | Vincent Petry | 2016-03-07 | 1 | -2/+4 |
| * | | Fix archive file name when downloading public share | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlim... | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fix uploading when free space is unlimited | Vincent Petry | 2016-03-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #22872 from owncloud/password-change-tooltip-text | Thomas Müller | 2016-03-07 | 1 | -0/+2 |
|\ \ | |||||
| * | | Update error text for link passwords | Morris Jobke | 2016-03-04 | 1 | -0/+2 |
* | | | Merge pull request #22815 from prastut/feature-enhance-loginflow | Thomas Müller | 2016-03-07 | 1 | -0/+11 |
|\ \ \ | |||||
| * | | | trigger login if remember_login checked | prastut | 2016-03-04 | 1 | -0/+11 |
* | | | | Merge pull request #22812 from owncloud/node-lock | Thomas Müller | 2016-03-07 | 2 | -0/+75 |
|\ \ \ \ | |||||
| * | | | | Add locking to the node api | Robin Appelman | 2016-03-03 | 2 | -0/+75 |
* | | | | | Merge pull request #22787 from owncloud/versions-fixmtimetooltip | Thomas Müller | 2016-03-07 | 1 | -1/+3 |
|\ \ \ \ \ | |||||
| * | | | | | Fix tooltip for versions mtime | Vincent Petry | 2016-03-02 | 1 | -1/+3 |
* | | | | | | Merge pull request #22785 from owncloud/trash-returnfalseon401 | Thomas Müller | 2016-03-07 | 2 | -0/+8 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Return false on 401 in file list + trash file list | Vincent Petry | 2016-03-03 | 2 | -0/+8 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Correctly default to null and add type hint | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #22904 from owncloud/get-user-groups-should-return-an-array | Thomas Müller | 2016-03-07 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Make sure that the return value is an array | Joas Schilling | 2016-03-07 | 1 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #22244 from owncloud/dont-update-shared-resource-properties | Thomas Müller | 2016-03-07 | 5 | -3/+84 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Allow to change properties of readonly calendars | Joas Schilling | 2016-02-29 | 1 | -0/+8 |
| * | | | | | Allow to hide a shared calendar | Joas Schilling | 2016-02-29 | 2 | -4/+29 |
| * | | | | | For 9.0 we don't have the possibility to store calendar and addressbook prope... | Thomas Müller | 2016-02-29 | 4 | -3/+51 |
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-07 | 58 | -8/+448 |
* | | | | | | Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-ownc... | Thomas Müller | 2016-03-06 | 1 | -2/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Cache results of testRemoteUrl | Lukas Reschke | 2016-03-04 | 1 | -2/+19 |
* | | | | | | | Merge pull request #22807 from owncloud/remove-empty-translations | Thomas Müller | 2016-03-06 | 32 | -240/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ne, or_IN, uz and yo have been removed from transifex and will be removed fro... | Thomas Müller | 2016-03-03 | 32 | -240/+0 |
* | | | | | | | | Merge pull request #22888 from owncloud/use-custom-header | Thomas Müller | 2016-03-06 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use custom header | Lukas Reschke | 2016-03-05 | 1 | -1/+1 |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-06 | 18 | -0/+58 |
|/ / / / / / / / | |||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-05 | 146 | -178/+592 |
* | | | | | | | | Merge pull request #22878 from owncloud/use-clob-for-timezone | C. Montero Luque | 2016-03-04 | 2 | -3/+3 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Use CLOB for timezone | Lukas Reschke | 2016-03-04 | 2 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #22870 from owncloud/autoenable-federation-app | C. Montero Luque | 2016-03-04 | 2 | -11/+13 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into autoenable-federation-app | C. Montero Luque | 2016-03-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Adjust OCS test | Lukas Reschke | 2016-03-04 | 1 | -0/+1 |
| * | | | | | | | | | Automatically enable "federation" app | Lukas Reschke | 2016-03-04 | 1 | -11/+12 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #22865 from owncloud/fix-db-locking-cleanup | C. Montero Luque | 2016-03-04 | 5 | -16/+71 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into fix-db-locking-cleanup | C. Montero Luque | 2016-03-04 | 11 | -22/+241 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge pull request #22860 from owncloud/trashbin-checkpath | C. Montero Luque | 2016-03-04 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Properly check path validity before deleting to trash | Vincent Petry | 2016-03-04 | 1 | -1/+1 |
* | | | | | | | | | Merge pull request #22857 from owncloud/add-release-channel-selection | Thomas Müller | 2016-03-04 | 7 | -14/+219 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add release channel selection back | Lukas Reschke | 2016-03-04 | 7 | -14/+219 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge pull request #22816 from owncloud/external-unavailable-recheck | Thomas Müller | 2016-03-04 | 3 | -7/+21 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Properly set exception in FailedStorage | Vincent Petry | 2016-03-03 | 2 | -1/+7 |
| * | | | | | | | | allow availability recheck for external storages | Robin Appelman | 2016-03-03 | 2 | -6/+14 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
| | | * | | | | | Run cleanup of expired DB file locks to background job | Morris Jobke | 2016-03-04 | 5 | -16/+71 |
| |_|/ / / / / |/| | | | | | |