summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Exclude ocs-provider from rewrite ruleLukas Reschke2016-02-251-0/+1
* Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\
| * inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
* | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \
| * | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
* | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \
| * | | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
* | | | Merge pull request #22611 from owncloud/add-uid-on-hoverThomas Müller2016-02-252-3/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Tweak tooltip style for recipientsVincent Petry2016-02-252-2/+10
| * | | Add the uid on hover for sharing autocompleteJoas Schilling2016-02-241-1/+2
* | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-254-12/+45
|\ \ \ \
| * | | | Properly cast typeLukas Reschke2016-02-243-11/+40
| * | | | Add proxy support to external storageLukas Reschke2016-02-241-1/+5
| | |/ / | |/| |
* | | | Merge pull request #22604 from owncloud/fix-google-drive-encryptionThomas Müller2016-02-251-5/+11
|\ \ \ \
| * | | | More error handlingLukas Reschke2016-02-251-2/+6
| * | | | Copy into local fileLukas Reschke2016-02-251-3/+5
* | | | | Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefaultThomas Müller2016-02-254-3/+10
|\ \ \ \ \
| * | | | | Disable sharing by default for external storage mountsVincent Petry2016-02-244-3/+10
* | | | | | Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displaynameThomas Müller2016-02-251-2/+2
|\ \ \ \ \ \
| * | | | | | take the first result of that array, if present. Fixes 2nd display name to be...Arthur Schiwon2016-02-241-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22579 from owncloud/fix_broken_unencrypted_sizeThomas Müller2016-02-252-4/+286
|\ \ \ \ \ \
| * | | | | | recalculate unencrypted size if we assume that the size stored in the db is n...Bjoern Schiessle2016-02-232-4/+286
* | | | | | | Merge pull request #22639 from owncloud/dont-show-pcntl-warningMorris Jobke2016-02-251-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Don't show PCNTL warning if --no-warnings is passedMorris Jobke2016-02-251-1/+1
|/ / / / / /
* | / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-25608-1034/+4140
| |/ / / / |/| | | |
* | | | | Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ \ \ \ \
| * | | | | Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #22612 from owncloud/davclient-update-headersThomas Müller2016-02-241-1/+2
|\ \ \ \ \
| * | | | | Update davclient.js for headers fixVincent Petry2016-02-241-1/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-243-21/+73
|\ \ \ \ \
| * | | | | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| * | | | | Add header for attachment disposition only onceLukas Reschke2016-02-233-17/+73
* | | | | | Merge pull request #22573 from owncloud/issue-22568-allow-string-object-idsThomas Müller2016-02-244-44/+43
|\ \ \ \ \ \
| * | | | | | Make sure we can store strings as per the interfaceJoas Schilling2016-02-224-44/+43
* | | | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storageThomas Müller2016-02-241-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Avoids scanning the root storageMorris Jobke2016-02-221-0/+4
| |/ / / / / /
* | | | | | | Merge pull request #22549 from owncloud/issue-20470-yellow-warning-for-user-a...Thomas Müller2016-02-242-16/+18
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use the notification instead of the disruptive popupJoas Schilling2016-02-222-16/+18
* | | | | | | Merge pull request #20876 from owncloud/reproducing-test-for-20686Thomas Müller2016-02-231-0/+11
|\ \ \ \ \ \ \
| * | | | | | | Add a test that reproduces #20686Morris Jobke2016-02-231-0/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entriesThomas Müller2016-02-234-17/+68
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| * | | | | | Allow defining a limit and offset for getObjectIdsForTagsJoas Schilling2016-02-233-6/+57
* | | | | | | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-238-3/+95
|\ \ \ \ \ \ \
| * | | | | | | Make sure we don't quote column names twiceJoas Schilling2016-02-233-3/+3
| * | | | | | | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| * | | | | | | Add ILIKE support to querybuilderThomas Müller2016-02-226-0/+92
* | | | | | | | Merge pull request #22586 from owncloud/be-verbose-when-something-fails-on-ciThomas Müller2016-02-232-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Add verbose flag to occ commands of autotest*Joas Schilling2016-02-232-3/+3
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-237-119/+299
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 11:58:50 +0000