summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
| * | | | | | handle bool in setValueRobin Appelman2016-01-181-3/+13
| * | | | | | also handle not null violationsRobin Appelman2016-01-181-1/+1
| * | | | | | fix testRobin Appelman2016-01-185-7/+24
| * | | | | | Pass the user when updating external storage statusRobin Appelman2016-01-183-7/+50
| * | | | | | Introduce 'login credentials' auth mechanismRobin McCorkell2016-01-188-7/+107
| * | | | | | Introduce CredentialsManager for storage of credentials in DBRobin McCorkell2016-01-187-0/+366
| * | | | | | Introduce IDBConnection::setValues()Robin McCorkell2016-01-186-68/+179
* | | | | | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccessThomas Müller2016-01-2211-4/+130
|\ \ \ \ \ \ \
| * | | | | | | Run on installerLukas Reschke2016-01-221-0/+1
| * | | | | | | Exclude .htaccess modifications from code checkerLukas Reschke2016-01-2210-4/+129
* | | | | | | | Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-au...Thomas Müller2016-01-225-33/+47
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Use path instead of app idLukas Reschke2016-01-205-33/+47
* | | | | | | | Merge pull request #21847 from owncloud/issue-21807-default-app-iconThomas Müller2016-01-222-0/+9
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Add a default app icon for apps that don't have oneJoas Schilling2016-01-222-0/+9
|/ / / / / / /
* | | | | | | Merge pull request #21843 from owncloud/increase-versionThomas Müller2016-01-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Increase version due to new tablesVincent Petry2016-01-221-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #21826 from owncloud/dav-fix-user-deletionThomas Müller2016-01-222-2/+49
|\ \ \ \ \ \ \
| * | | | | | | No card ID when deleting is acceptableJoas Schilling2016-01-212-2/+49
* | | | | | | | Merge pull request #20768 from owncloud/mount-cacheThomas Müller2016-01-2220-33/+1037
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | use insertifnotexistsRobin Appelman2016-01-201-23/+5
| * | | | | | | clear mount cache when removing applicablesRobin Appelman2016-01-2011-13/+113
| * | | | | | | handle changed mount pointsRobin Appelman2016-01-201-1/+23
| * | | | | | | clear mount cache when deleting userRobin Appelman2016-01-204-18/+101
| * | | | | | | multiple minor fiesRobin Appelman2016-01-207-22/+37
| * | | | | | | sort in testsRobin Appelman2016-01-201-1/+18
| * | | | | | | use getmountmanagerRobin Appelman2016-01-201-1/+1
| * | | | | | | log duplicatesRobin Appelman2016-01-203-4/+20
| * | | | | | | Filter uncached mountsRobin Appelman2016-01-201-10/+15
| * | | | | | | cache mountpoints in the dbRobin Appelman2016-01-2010-4/+768
| | |/ / / / / | |/| | | | |