Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correctly indent uneditable email/display name fields | Joas Schilling | 2016-02-26 | 1 | -2/+2 |
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-26 | 56 | -34/+210 |
* | Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508 | Thomas Müller | 2016-02-25 | 2 | -4/+4 |
|\ | |||||
| * | Fix PHPDoc of OC_App::loadApps() | Thomas Müller | 2016-02-23 | 1 | -1/+1 |
| * | Install new shipped apps after upgrading all existing apps | Thomas Müller | 2016-02-23 | 1 | -4/+4 |
| * | Before installing new shipped apps we need to load authentication apps - fixe... | Thomas Müller | 2016-02-23 | 1 | -1/+1 |
* | | Merge pull request #22653 from owncloud/integration-tests-for-dav-csrf | Thomas Müller | 2016-02-25 | 2 | -2/+127 |
|\ \ | |||||
| * | | Fix typo | Lukas Reschke | 2016-02-25 | 1 | -1/+1 |
| * | | Add integration test for CSRF protection on DAV | Lukas Reschke | 2016-02-25 | 2 | -2/+127 |
* | | | Merge pull request #22654 from owncloud/icon-fixes | Thomas Müller | 2016-02-25 | 3 | -0/+17 |
|\ \ \ | |||||
| * | | | add download icon for image detail view, ref gallery issue 51 | Jan-Christoph Borchardt | 2016-02-25 | 3 | -0/+17 |
* | | | | Merge pull request #22659 from owncloud/fix-formatting | Thomas Müller | 2016-02-25 | 2 | -54/+62 |
|\ \ \ \ | |||||
| * | | | | Fix formatting of response | Lukas Reschke | 2016-02-25 | 2 | -54/+62 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rules | Thomas Müller | 2016-02-25 | 1 | -0/+1 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Exclude ocs-provider from rewrite rule | Lukas Reschke | 2016-02-25 | 1 | -0/+1 |
|/ / / | |||||
* | | | Merge pull request #22644 from owncloud/external-share-manager | Thomas Müller | 2016-02-25 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | inject the correct external share manager into the storage | Robin Appelman | 2016-02-25 | 1 | -3/+4 |
* | | | | Merge pull request #21854 from owncloud/fix-share-hook-group-add | Thomas Müller | 2016-02-25 | 1 | -0/+17 |
|\ \ \ \ | |||||
| * | | | | Fix addUserToGroup hook of the share code | Morris Jobke | 2016-01-22 | 1 | -0/+17 |
* | | | | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjob | Thomas Müller | 2016-02-25 | 1 | -0/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Skip users with no trashbin | Victor Dubiniuk | 2016-02-24 | 1 | -0/+6 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #22611 from owncloud/add-uid-on-hover | Thomas Müller | 2016-02-25 | 2 | -3/+12 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Tweak tooltip style for recipients | Vincent Petry | 2016-02-25 | 2 | -2/+10 |
| * | | | | Add the uid on hover for sharing autocomplete | Joas Schilling | 2016-02-24 | 1 | -1/+2 |
* | | | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storages | Thomas Müller | 2016-02-25 | 4 | -12/+45 |
|\ \ \ \ \ | |||||
| * | | | | | Properly cast type | Lukas Reschke | 2016-02-24 | 3 | -11/+40 |
| * | | | | | Add proxy support to external storage | Lukas Reschke | 2016-02-24 | 1 | -1/+5 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #22604 from owncloud/fix-google-drive-encryption | Thomas Müller | 2016-02-25 | 1 | -5/+11 |
|\ \ \ \ \ | |||||
| * | | | | | More error handling | Lukas Reschke | 2016-02-25 | 1 | -2/+6 |
| * | | | | | Copy into local file | Lukas Reschke | 2016-02-25 | 1 | -3/+5 |
* | | | | | | Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault | Thomas Müller | 2016-02-25 | 4 | -3/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Disable sharing by default for external storage mounts | Vincent Petry | 2016-02-24 | 4 | -3/+10 |
* | | | | | | | Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname | Thomas Müller | 2016-02-25 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | take the first result of that array, if present. Fixes 2nd display name to be... | Arthur Schiwon | 2016-02-24 | 1 | -2/+2 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #22579 from owncloud/fix_broken_unencrypted_size | Thomas Müller | 2016-02-25 | 2 | -4/+286 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | recalculate unencrypted size if we assume that the size stored in the db is n... | Bjoern Schiessle | 2016-02-23 | 2 | -4/+286 |
* | | | | | | | | Merge pull request #22639 from owncloud/dont-show-pcntl-warning | Morris Jobke | 2016-02-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Don't show PCNTL warning if --no-warnings is passed | Morris Jobke | 2016-02-25 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | / / / / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-25 | 608 | -1034/+4140 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #22593 from owncloud/swift-docker-fix | Thomas Müller | 2016-02-24 | 2 | -277/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Enable upstream entrypoint changes with Ceph Docker | Robin McCorkell | 2016-02-23 | 2 | -277/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #22612 from owncloud/davclient-update-headers | Thomas Müller | 2016-02-24 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Update davclient.js for headers fix | Vincent Petry | 2016-02-24 | 1 | -1/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22592 from owncloud/fix-response-header | Thomas Müller | 2016-02-24 | 3 | -21/+73 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Drop unneeded use statements | Morris Jobke | 2016-02-23 | 1 | -4/+0 |
| * | | | | | | Add header for attachment disposition only once | Lukas Reschke | 2016-02-23 | 3 | -17/+73 |
* | | | | | | | Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids | Thomas Müller | 2016-02-24 | 4 | -44/+43 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Make sure we can store strings as per the interface | Joas Schilling | 2016-02-22 | 4 | -44/+43 |
* | | | | | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storage | Thomas Müller | 2016-02-24 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Avoids scanning the root storage | Morris Jobke | 2016-02-22 | 1 | -0/+4 |
| |/ / / / / / / |