summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Replace other usagesJoas Schilling2016-01-258-21/+25
* Add parameters to public interfaceJoas Schilling2016-01-251-0/+39
* Merge pull request #18444 from owncloud/occ-config-typesThomas Müller2016-01-256-73/+413
|\
| * Allow array recursion in getJoas Schilling2016-01-142-6/+31
| * Allow deleting a nested system config valueJoas Schilling2016-01-143-16/+156
| * Retain backwards compatibilityJoas Schilling2016-01-142-76/+71
| * occ config:system:set can now set other value typesRobin McCorkell2016-01-142-52/+232
* | Merge pull request #21401 from owncloud/dav-cache-getchildrenThomas Müller2016-01-253-7/+32
|\ \
| * | Put nodes from Directory->getChildren in the ObjectTree cacheRobin Appelman2016-01-173-7/+32
* | | Merge pull request #21424 from owncloud/appversionsThomas Müller2016-01-252-21/+11
|\ \ \
| * | | Faster AppConfig->getValuesRobin Appelman2016-01-111-7/+6
| * | | Use appconfig for getAppVersionsRobin Appelman2016-01-111-14/+5
* | | | Merge pull request #21806 from owncloud/mdusher-masterThomas Müller2016-01-251-3/+3
|\ \ \ \
| * | | | fix error message and commentMorris Jobke2016-01-201-2/+2
| * | | | Added ' to characters allowed in the usernameMichael U2016-01-201-2/+2
* | | | | Merge pull request #21811 from owncloud/fix-unauthenticated-avatarThomas Müller2016-01-251-2/+5
|\ \ \ \ \
| * | | | | Show default placeholder if avatar image can't be fetchedMorris Jobke2016-01-201-2/+5
* | | | | | Merge pull request #21844 from owncloud/drop-image-pathThomas Müller2016-01-258-37/+25
|\ \ \ \ \ \
| * | | | | | Remove OC_Helper::imagePath and use the proper public interfaceMorris Jobke2016-01-248-37/+25
* | | | | | | Merge pull request #21862 from owncloud/sync-certificates-with-upstreamThomas Müller2016-01-251-119/+60
|\ \ \ \ \ \ \
| * | | | | | | Sync certificates with upstreamLukas Reschke2016-01-221-119/+60
* | | | | | | | Merge pull request #21878 from owncloud/fix-apps-management-templatingThomas Müller2016-01-251-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Includ author and license in l10n string to be able to change orderMorris Jobke2016-01-251-2/+2
* | | | | | | | | Merge pull request #21879 from owncloud/remove-unused-codeThomas Müller2016-01-251-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove unused variableMorris Jobke2016-01-251-1/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #21877 from owncloud/fix_dav_appLukas Reschke2016-01-251-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Add missing use statements for IGroupManager and IUserSessionRoeland Jago Douma2016-01-251-0/+2
|/ / / / / / / /
* | / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-01-2516-40/+86
| |/ / / / / / |/| | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2420-24/+68
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-23150-16/+352
|/ / / / / /
* | | | | | Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-downloadThomas Müller2016-01-221-16/+13
|\ \ \ \ \ \
| * | | | | | Modified swift handling to explicitly set 404 responses to falseDaniel Tosello2016-01-121-1/+2
| * | | | | | Fixing swift fopen by ensuring stream is a valid resourceDaniel Tosello2015-12-101-1/+4
| * | | | | | Streaming download from Swift external storageTim Dettrick2015-12-101-17/+10
* | | | | | | Merge pull request #21841 from owncloud/share2_deletefromselfThomas Müller2016-01-224-2/+404
|\ \ \ \ \ \ \
| * | | | | | | [Share 2.0] Add deleteFromSelf methodRoeland Jago Douma2016-01-224-2/+404
* | | | | | | | Merge pull request #21836 from RomanKreisel/masterThomas Müller2016-01-221-0/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Solves #Roman Kreisel2016-01-211-0/+5
* | | | | | | | | Merge pull request #21719 from owncloud/move-notification-api-to-ocpThomas Müller2016-01-2217-149/+143
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow automatic injection of the ManagerJoas Schilling2016-01-222-1/+5
| * | | | | | | | | Adjust the since on the interfaceJoas Schilling2016-01-225-48/+48
| * | | | | | | | | Move the notification API to public namespaceJoas Schilling2016-01-2216-100/+90
* | | | | | | | | | Merge pull request #21814 from owncloud/systemtags-backend-permissionsThomas Müller2016-01-2212-112/+715
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Inject user session to check for admin in system tags DAV handlersVincent Petry2016-01-216-30/+122
| * | | | | | | | | Fix DAV to respect system tags permissionsVincent Petry2016-01-2112-109/+620
* | | | | | | | | | Merge pull request #21850 from owncloud/more-output-for-integrity-checkThomas Müller2016-01-221-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Print output for integrity check during ./occ upgradeMorris Jobke2016-01-221-0/+6
* | | | | | | | | | | Merge pull request #18531 from owncloud/ext-user-credentialsThomas Müller2016-01-2230-89/+780
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | allow comparing clob using expressionbuilder->eq if you explicitly say you're...Robin Appelman2016-01-185-6/+50
| * | | | | | | | | | | bumb app versionRobin Appelman2016-01-181-1/+1