summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #21930 from owncloud/less-error-messagesThomas Müller2016-01-271-1/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid error message in log during setup because of existing data dirMorris Jobke2016-01-261-1/+3
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2712-0/+14
|/ / /
* | | Merge pull request #21664 from owncloud/comments-davThomas Müller2016-01-262-3/+5
|\ \ \ | |_|/ |/| |
| * | Comments DAV implementationArthur Schiwon2016-01-262-3/+5
| |/
* / We must resolve to the proper usergroup shareRoeland Jago Douma2016-01-261-3/+11
|/
* Merge pull request #21901 from owncloud/fix-setupThomas Müller2016-01-261-5/+8
|\
| * Fix setup pageMorris Jobke2016-01-261-5/+8
* | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-changeThomas Müller2016-01-263-19/+30
|\ \
| * | Trigger change on avatar deleteThomas Müller2016-01-251-0/+1
| * | Changing the avatar of the user emits the changeUser event which triggers upd...Thomas Müller2016-01-253-19/+29
* | | Merge pull request #21894 from owncloud/refactor-csrfThomas Müller2016-01-2611-70/+350
|\ \ \
| * | | Regenerate CSRF token upon loginLukas Reschke2016-01-251-0/+2
| * | | Add new CSRF manager for unit testing purposesLukas Reschke2016-01-2511-70/+348
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-2678-80/+4
* | | | Merge pull request #21892 from owncloud/issue-21890-parametersThomas Müller2016-01-257-18/+59
|\ \ \ \ | |_|/ / |/| | |
| * | | Replace other usagesJoas Schilling2016-01-256-18/+20
| * | | Add parameters to public interfaceJoas Schilling2016-01-251-0/+39
| | |/ | |/|
* / | Adding support of -1 as size to be passed into get and getFileThomas Müller2016-01-252-14/+14
|/ /
* | 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 #21844 from owncloud/drop-image-pathThomas Müller2016-01-254-30/+18
|\ \ \ \
| * | | | Remove OC_Helper::imagePath and use the proper public interfaceMorris Jobke2016-01-244-30/+18
* | | | | remove unused variableMorris Jobke2016-01-251-1/+0
| |_|_|/ |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-01-252-4/+4
|/ / /
* | | Merge pull request #21841 from owncloud/share2_deletefromselfThomas Müller2016-01-223-0/+104
|\ \ \
| * | | [Share 2.0] Add deleteFromSelf methodRoeland Jago Douma2016-01-223-0/+104
* | | | 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-2211-81/+75
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | 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-2210-32/+22
* | | | | Merge pull request #18531 from owncloud/ext-user-credentialsThomas Müller2016-01-2213-47/+369
|\ \ \ \ \
| * | | | | allow comparing clob using expressionbuilder->eq if you explicitly say you're...Robin Appelman2016-01-185-6/+50
| * | | | | handle bool in setValueRobin Appelman2016-01-181-3/+13
| * | | | | also handle not null violationsRobin Appelman2016-01-181-1/+1
| * | | | | Introduce CredentialsManager for storage of credentials in DBRobin McCorkell2016-01-185-0/+221
| * | | | | Introduce IDBConnection::setValues()Robin McCorkell2016-01-184-42/+89
* | | | | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccessThomas Müller2016-01-224-4/+22
|\ \ \ \ \ \
| * | | | | | Exclude .htaccess modifications from code checkerLukas Reschke2016-01-224-4/+22
* | | | | | | Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-au...Thomas Müller2016-01-221-4/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Use path instead of app idLukas Reschke2016-01-201-4/+7
* | | | | | | Merge pull request #20768 from owncloud/mount-cacheThomas Müller2016-01-229-20/+616
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | use insertifnotexistsRobin Appelman2016-01-201-23/+5
| * | | | | | clear mount cache when removing applicablesRobin Appelman2016-01-202-0/+36