Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #21930 from owncloud/less-error-messages | Thomas Müller | 2016-01-27 | 1 | -1/+3 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Avoid error message in log during setup because of existing data dir | Morris Jobke | 2016-01-26 | 1 | -1/+3 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-27 | 12 | -0/+14 | |
|/ / / | ||||||
* | | | Merge pull request #21664 from owncloud/comments-dav | Thomas Müller | 2016-01-26 | 2 | -3/+5 | |
|\ \ \ | |_|/ |/| | | ||||||
| * | | Comments DAV implementation | Arthur Schiwon | 2016-01-26 | 2 | -3/+5 | |
| |/ | ||||||
* / | We must resolve to the proper usergroup share | Roeland Jago Douma | 2016-01-26 | 1 | -3/+11 | |
|/ | ||||||
* | Merge pull request #21901 from owncloud/fix-setup | Thomas Müller | 2016-01-26 | 1 | -5/+8 | |
|\ | ||||||
| * | Fix setup page | Morris Jobke | 2016-01-26 | 1 | -5/+8 | |
* | | Merge pull request #21845 from owncloud/sync-system-addressbook-on-avatar-change | Thomas Müller | 2016-01-26 | 3 | -19/+30 | |
|\ \ | ||||||
| * | | Trigger change on avatar delete | Thomas Müller | 2016-01-25 | 1 | -0/+1 | |
| * | | Changing the avatar of the user emits the changeUser event which triggers upd... | Thomas Müller | 2016-01-25 | 3 | -19/+29 | |
* | | | Merge pull request #21894 from owncloud/refactor-csrf | Thomas Müller | 2016-01-26 | 11 | -70/+350 | |
|\ \ \ | ||||||
| * | | | Regenerate CSRF token upon login | Lukas Reschke | 2016-01-25 | 1 | -0/+2 | |
| * | | | Add new CSRF manager for unit testing purposes | Lukas Reschke | 2016-01-25 | 11 | -70/+348 | |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-26 | 78 | -80/+4 | |
* | | | | Merge pull request #21892 from owncloud/issue-21890-parameters | Thomas Müller | 2016-01-25 | 7 | -18/+59 | |
|\ \ \ \ | |_|/ / |/| | | | ||||||
| * | | | Replace other usages | Joas Schilling | 2016-01-25 | 6 | -18/+20 | |
| * | | | Add parameters to public interface | Joas Schilling | 2016-01-25 | 1 | -0/+39 | |
| | |/ | |/| | ||||||
* / | | Adding support of -1 as size to be passed into get and getFile | Thomas Müller | 2016-01-25 | 2 | -14/+14 | |
|/ / | ||||||
* | | Merge pull request #21424 from owncloud/appversions | Thomas Müller | 2016-01-25 | 2 | -21/+11 | |
|\ \ | ||||||
| * | | Faster AppConfig->getValues | Robin Appelman | 2016-01-11 | 1 | -7/+6 | |
| * | | Use appconfig for getAppVersions | Robin Appelman | 2016-01-11 | 1 | -14/+5 | |
* | | | Merge pull request #21806 from owncloud/mdusher-master | Thomas Müller | 2016-01-25 | 1 | -3/+3 | |
|\ \ \ | ||||||
| * | | | fix error message and comment | Morris Jobke | 2016-01-20 | 1 | -2/+2 | |
| * | | | Added ' to characters allowed in the username | Michael U | 2016-01-20 | 1 | -2/+2 | |
* | | | | Merge pull request #21844 from owncloud/drop-image-path | Thomas Müller | 2016-01-25 | 4 | -30/+18 | |
|\ \ \ \ | ||||||
| * | | | | Remove OC_Helper::imagePath and use the proper public interface | Morris Jobke | 2016-01-24 | 4 | -30/+18 | |
* | | | | | remove unused variable | Morris Jobke | 2016-01-25 | 1 | -1/+0 | |
| |_|_|/ |/| | | | ||||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-25 | 2 | -4/+4 | |
|/ / / | ||||||
* | | | Merge pull request #21841 from owncloud/share2_deletefromself | Thomas Müller | 2016-01-22 | 3 | -0/+104 | |
|\ \ \ | ||||||
| * | | | [Share 2.0] Add deleteFromSelf method | Roeland Jago Douma | 2016-01-22 | 3 | -0/+104 | |
* | | | | Merge pull request #21836 from RomanKreisel/master | Thomas Müller | 2016-01-22 | 1 | -0/+5 | |
|\ \ \ \ | ||||||
| * | | | | Solves # | Roman Kreisel | 2016-01-21 | 1 | -0/+5 | |
* | | | | | Merge pull request #21719 from owncloud/move-notification-api-to-ocp | Thomas Müller | 2016-01-22 | 11 | -81/+75 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Allow automatic injection of the Manager | Joas Schilling | 2016-01-22 | 2 | -1/+5 | |
| * | | | | Adjust the since on the interface | Joas Schilling | 2016-01-22 | 5 | -48/+48 | |
| * | | | | Move the notification API to public namespace | Joas Schilling | 2016-01-22 | 10 | -32/+22 | |
* | | | | | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 13 | -47/+369 | |
|\ \ \ \ \ | ||||||
| * | | | | | allow comparing clob using expressionbuilder->eq if you explicitly say you're... | Robin Appelman | 2016-01-18 | 5 | -6/+50 | |
| * | | | | | handle bool in setValue | Robin Appelman | 2016-01-18 | 1 | -3/+13 | |
| * | | | | | also handle not null violations | Robin Appelman | 2016-01-18 | 1 | -1/+1 | |
| * | | | | | Introduce CredentialsManager for storage of credentials in DB | Robin McCorkell | 2016-01-18 | 5 | -0/+221 | |
| * | | | | | Introduce IDBConnection::setValues() | Robin McCorkell | 2016-01-18 | 4 | -42/+89 | |
* | | | | | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess | Thomas Müller | 2016-01-22 | 4 | -4/+22 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Exclude .htaccess modifications from code checker | Lukas Reschke | 2016-01-22 | 4 | -4/+22 | |
* | | | | | | | Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-au... | Thomas Müller | 2016-01-22 | 1 | -4/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Use path instead of app id | Lukas Reschke | 2016-01-20 | 1 | -4/+7 | |
* | | | | | | | Merge pull request #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 9 | -20/+616 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | use insertifnotexists | Robin Appelman | 2016-01-20 | 1 | -23/+5 | |
| * | | | | | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 2 | -0/+36 |