summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |/ / | |/| |
* | | | Merge pull request #21824 from owncloud/list-of-notifiersThomas Müller2016-01-223-10/+126
|\ \ \ \
| * | | | Make it possible to get a list of notifiers for a potential settings pageJoas Schilling2016-01-223-10/+126
| | |/ / | |/| |
* | | | Merge pull request #21840 from owncloud/fix-phpdocThomas Müller2016-01-225-14/+7
|\ \ \ \
| * | | | Fix PHPDoc - @changed is no official tag -> use @sinceMorris Jobke2016-01-225-14/+7
|/ / / /
* | | | Merge pull request #21532 from owncloud/share2.0_getSharesThomas Müller2016-01-227-89/+734
|\ \ \ \
| * | | | [Share 2.0] Fix displaying old shares propleryRoeland Jago Douma2016-01-211-1/+12
| * | | | Comments from VincentRoeland Jago Douma2016-01-213-13/+11
| * | | | Add Unit tests for the default share providerRoeland Jago Douma2016-01-212-56/+412
| * | | | [Share 2.0] Add subfiles=xRoeland Jago Douma2016-01-213-13/+45
| * | | | Add intergration test for shared_with me and group sharesRoeland Jago Douma2016-01-211-0/+13
| * | | | [Share 2.0] Resolve group sharesRoeland Jago Douma2016-01-211-5/+72
| * | | | Renable intergration testRoeland Jago Douma2016-01-211-17/+14
| * | | | [Sharing 2.0] Start with getSharesRoeland Jago Douma2016-01-215-14/+185
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-22148-1140/+1140
* | | | | Merge pull request #21831 from owncloud/move-descriptive-tag-to-coreThomas Müller2016-01-214-3/+99
|\ \ \ \ \
| * | | | | Move getDescriptiveTag to coreJoas Schilling2016-01-214-3/+99
* | | | | | Merge pull request #21829 from owncloud/remove-duplicated-valueThomas Müller2016-01-211-1/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | remove duplicated array valueblizzz2016-01-211-1/+0