Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-18 | 12 | -8/+56 |
| | |||||
* | 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 #23370 from owncloud/fix-username-change | Thomas Müller | 2016-03-17 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | Update avatar on username change if avatar is set | ||||
| * | | | | Update avatar on username change if avatar is set | Morris Jobke | 2016-03-17 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | * fixes #20455 | ||||
* | | | | | Merge pull request #23371 from owncloud/paurisa-Fixed_21588 | Thomas Müller | 2016-03-17 | 23 | -1/+1487 |
|\ \ \ \ \ | | | | | | | | | | | | | Rating icons changed to .svg | ||||
| * | | | | | Rating icons changed to .svg | Pau | 2016-03-17 | 23 | -1/+1487 |
| |/ / / / | |||||
* | | | | | Merge pull request #23255 from owncloud/update-sabre3.0.8-fseek | Thomas Müller | 2016-03-17 | 1 | -0/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update 3rdparty commit for sabre update 3.0.8 | ||||
| * | | | | Update 3rdparty commit for sabre update 3.0.8 | Vincent Petry | 2016-03-16 | 1 | -0/+0 |
| | | | | | |||||
* | | | | | 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 #23303 from owncloud/exclude-only-specific-third-party | Thomas Müller | 2016-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Exclude only known failing third-party files | ||||
| * | | | | | | Exclude only known failing third-party files | Lukas Reschke | 2016-03-16 | 1 | -1/+1 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | This way we can also scan the third-party folder for incompatibilities with a used PHP version. Since there are some polyfills that would otherwise fail I had to exclude them manually here. | ||||
* | | | | | | Merge pull request #23326 from owncloud/manishbisht-combined-database-errors | Thomas Müller | 2016-03-17 | 2 | -6/+8 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [CI] Installation: Combined database errors | ||||
| * | | | | | | Update oci.php | Manish Bisht | 2016-03-16 | 2 | -6/+8 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error Fixed combined the database errors Merged Database Errors | ||||
* | | | | | | Merge pull request #23336 from owncloud/occ-typos | Thomas Müller | 2016-03-17 | 4 | -4/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Some typo corrections in occ command output | ||||
| * | | | | | | Some typo corrections in occ command output | Carla Schroder | 2016-03-16 | 4 | -4/+4 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #23340 from owncloud/dont-try-to-test-syntax-as-dav-test | Thomas Müller | 2016-03-17 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Don't try to execute a dav syntax test | ||||
| * | | | | | | | Don't try to execute a dav syntax test | Joas Schilling | 2016-03-17 | 1 | -4/+4 |
|/ / / / / / / | |||||
* / / / / / / | [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 #23258 from owncloud/sharee-tests | Thomas Müller | 2016-03-16 | 7 | -219/+299 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Add integration tests for sharee endpoint | ||||
| * | | | | | | Split the context so we don't reset the config on each test | Joas Schilling | 2016-03-15 | 4 | -57/+82 |
| | | | | | | | |||||
| * | | | | | | Add tests for user enumeration and sharing in group only | Joas Schilling | 2016-03-15 | 2 | -45/+103 |
| | | | | | | | |||||
| * | | | | | | Always use the admin when putting poeple in a group | Joas Schilling | 2016-03-15 | 1 | -4/+5 |
| | | | | | | | |||||
| * | | | | | | Make the app config code ready for reuse | Joas Schilling | 2016-03-15 | 2 | -78/+104 |
| | | | | | | | |||||
| * | | | | | | Deduplicate the existing background | Joas Schilling | 2016-03-14 | 1 | -44/+14 |
| | | | | | | | |||||
* | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #23300 from owncloud/smb-not-available | Thomas Müller | 2016-03-16 | 1 | -14/+40 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | handle connection errors as storage not available in smb | ||||
| * | | | | | | | handle connection errors as storage not available in smb | Robin Appelman | 2016-03-16 | 1 | -14/+40 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1 | Thomas Müller | 2016-03-16 | 2 | -1/+54 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Ensure that stored version is at least 1 for cross-storage copy | ||||
| * | | | | | | | | Ensure that stored version is at least 1 for cross-storage copy | Lukas Reschke | 2016-03-16 | 2 | -1/+54 |
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a move operation from an unencrypted to an encrypted storage the old encrypted version would stay with "0" while the correct value would be "1". Thus we manually set the value to "1" for those cases. See also https://github.com/owncloud/core/issues/23078 | ||||
* | | | | | | | | Merge pull request #22994 from owncloud/check-syntax-on-travis | Thomas Müller | 2016-03-16 | 2 | -0/+13 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Check the syntax on travis | ||||
| * | | | | | | | | Execute PHP Parallel Linter on Travis | Lukas Reschke | 2016-03-16 | 2 | -0/+13 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0 | Thomas Müller | 2016-03-16 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Require at least libxml 2.7.0 | ||||
| * | | | | | | | Require at least libxml 2.7.0 | Lukas Reschke | 2016-03-12 | 1 | -0/+8 |
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23168 | ||||
* | | | | | | | 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 | 16 | -42/+126 |
| | | | | | | |||||
* | | | | | | Merge pull request #23157 from owncloud/remove-share-prop-entries | Thomas Müller | 2016-03-15 | 3 | -0/+105 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | remove old share propagation entries from appconfig |