Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-18 | 2 | -8/+2 |
| | |||||
* | Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory | Thomas Müller | 2016-03-17 | 2 | -7/+29 |
|\ | | | | | Fix dropbox storage to not store the whole file in memory | ||||
| * | Fix dropbox storage to not store the whole file in memory | Vincent Petry | 2016-03-15 | 2 | -7/+29 |
| | | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file. | ||||
* | | Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap | Thomas Müller | 2016-03-17 | 2 | -3/+89 |
|\ \ | | | | | | | fix writing to cache when fallback server should be used immediately | ||||
| * | | fix writing to cache when fallback server should be used immediately | Arthur Schiwon | 2016-03-16 | 2 | -3/+89 |
| | | | |||||
* | | | Merge pull request #23346 from owncloud/fix_23325 | Thomas Müller | 2016-03-17 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | Set proper public webdav permissions when public upload disabled | ||||
| * | | | Set proper public webdav permissions when public upload disabled | Roeland Jago Douma | 2016-03-17 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23325 It can happen that a user shares a folder with public upload. And some time later the admin disables public upload on the server. To make sure this is handled correctly we need to check the config value and reduce the permissions. Fix is kept small to be easy backportable. | ||||
* | | | | Merge pull request #23287 from owncloud/issue-22786-absolute-paths | Thomas Müller | 2016-03-17 | 1 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | Fix absolute path creation for remote shares with /oc webroot | ||||
| * | | | Make sure to append the web root as per doc | Joas Schilling | 2016-03-16 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #23334 from owncloud/ext-user-mounting-gui | Thomas Müller | 2016-03-17 | 6 | -5/+14 |
|\ \ \ \ | | | | | | | | | | | Display external storage GUI even if user mounting disabled | ||||
| * | | | | Display external storage GUI even if user mounting disabled | Robin McCorkell | 2016-03-16 | 6 | -5/+14 |
| | | | | | |||||
* | | | | | Merge pull request #23336 from owncloud/occ-typos | Thomas Müller | 2016-03-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Some typo corrections in occ command output | ||||
| * | | | | | Some typo corrections in occ command output | Carla Schroder | 2016-03-16 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-17 | 2 | -0/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #23192 from ↵ | Thomas Müller | 2016-03-16 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | owncloud/make-ancient-users-happy-with-totally-untested-stuff Fallback for crappy ancient distributions | ||||
| * | | | | Fallback for crappy ancient distributions | Lukas Reschke | 2016-03-12 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23181 | ||||
* | | | | | Merge pull request #23253 from owncloud/give-swift-more-time | Thomas Müller | 2016-03-16 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Give swift 15 seconds after startup | ||||
| * | | | | | Give swift 15 seconds after startup | Morris Jobke | 2016-03-16 | 1 | -2/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #23082 from owncloud/contacts_calendar_name_color | Thomas Müller | 2016-03-16 | 1 | -0/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | add title and color to birthday calendar | ||||
| * | | | | | add title and color to birthday calendar | Georg Ehrke | 2016-03-10 | 1 | -0/+5 |
| | | | | | | |||||
* | | | | | | handle connection errors as storage not available in smb | Robin Appelman | 2016-03-16 | 1 | -14/+40 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #23155 from owncloud/fed-unshare-with | Thomas Müller | 2016-03-16 | 2 | -1/+33 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Specify the target user when unsharing a federated share | ||||
| * | | | | Specify the target user when unsharing a federated share | Robin Appelman | 2016-03-14 | 2 | -1/+33 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-16 | 4 | -2/+6 |
| | | | | | |||||
* | | | | | Merge pull request #23251 from owncloud/fix_22907 | Thomas Müller | 2016-03-15 | 2 | -2/+42 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | allow group shares, even if not all public keys are available | ||||
| * | | | | allow group shares, even if not all public keys are available | Bjoern Schiessle | 2016-03-15 | 2 | -2/+42 |
| | | | | | |||||
* | | | | | Merge pull request #22998 from owncloud/delay-loading-the-scanner | Thomas Müller | 2016-03-15 | 2 | -5/+5 |
|\ \ \ \ \ | | | | | | | | | | | | | Delay check till scanner is used | ||||
| * | | | | | Delay check till scanner is used | Lukas Reschke | 2016-03-09 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987 | ||||
* | | | | | | Merge pull request #23039 from owncloud/invalid-share-storage | Thomas Müller | 2016-03-15 | 4 | -352/+20 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | dont break when there is an invalid share | ||||
| * | | | | | | move failedstorage to core | Robin Appelman | 2016-03-11 | 4 | -359/+2 |
| | | | | | | | |||||
| * | | | | | | dont break when there is an invalid share | Robin Appelman | 2016-03-11 | 2 | -6/+31 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #23074 from ↵ | Thomas Müller | 2016-03-15 | 2 | -4/+4 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | owncloud/issue-22835-correctly-use-querybuilder-api Correctly escape join statements and use selectAlias | ||||
| * | | | | | | Correctly escape join statements and use selectAlias | Joas Schilling | 2016-03-10 | 2 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-15 | 16 | -12/+70 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-14 | 20 | -14/+22 |
| | | | | | | |||||
* | | | | | | Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1 | Thomas Müller | 2016-03-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Mark testing app as compatible with 9.1 | ||||
| * | | | | | | Mark testing app as compatible with 9.1 | Lukas Reschke | 2016-03-13 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #23091 from ↵ | Thomas Müller | 2016-03-13 | 1 | -7/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | owncloud/issue-23085-csae-insensitive-group-search Return the correct group casing in sharee api | ||||
| * | | | | | | Correctly lower the search input as well | Joas Schilling | 2016-03-11 | 1 | -5/+5 |
| | | | | | | | |||||
| * | | | | | | Return the correct group casing in sharee api | Joas Schilling | 2016-03-11 | 1 | -2/+2 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Fix intergration tests | Roeland Jago Douma | 2016-03-13 | 1 | -893/+631 |
| | | | | | | |||||
* | | | | | | Remove the old OCS Share API code | Roeland Jago Douma | 2016-03-13 | 1 | -645/+0 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-12 | 10 | -6/+38 |
|/ / / / | |||||
* | | | | Merge pull request #23080 from owncloud/use-non-localized-birthday-title | Thomas Müller | 2016-03-11 | 2 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | Use a birthday title which does not require translation because we ha… | ||||
| * | | | | Use a birthday title which does not require translation because we have no ↵ | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
| | |_|/ | |/| | | | | | | | | | | idea about the target device language and forcing English upon all users is kind of bad | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-11 | 26 | -80/+218 |
| | | | | |||||
* | | | | Merge pull request #23086 from owncloud/ldap-sort-deprecated | Thomas Müller | 2016-03-11 | 3 | -30/+1 |
|\ \ \ \ | | | | | | | | | | | remove deprecated ldap_sort | ||||
| * | | | | remove deprecated ldap_sort | Arthur Schiwon | 2016-03-10 | 3 | -30/+1 |
| |/ / / | |||||
* | | | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
|\ \ \ \ | | | | | | | | | | | getOwner is not available on FileHome | ||||
| * | | | | getOwner is not available on FileHome - fixes #23116 | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
| |/ / / |