Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 30 | -89/+780 |
|\ | |||||
| * | allow comparing clob using expressionbuilder->eq if you explicitly say you're... | Robin Appelman | 2016-01-18 | 5 | -6/+50 |
| * | bumb app version | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
| * | 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 |
| * | fix test | Robin Appelman | 2016-01-18 | 5 | -7/+24 |
| * | Pass the user when updating external storage status | Robin Appelman | 2016-01-18 | 3 | -7/+50 |
| * | Introduce 'login credentials' auth mechanism | Robin McCorkell | 2016-01-18 | 8 | -7/+107 |
| * | Introduce CredentialsManager for storage of credentials in DB | Robin McCorkell | 2016-01-18 | 7 | -0/+366 |
| * | Introduce IDBConnection::setValues() | Robin McCorkell | 2016-01-18 | 6 | -68/+179 |
* | | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess | Thomas Müller | 2016-01-22 | 11 | -4/+130 |
|\ \ | |||||
| * | | Run on installer | Lukas Reschke | 2016-01-22 | 1 | -0/+1 |
| * | | Exclude .htaccess modifications from code checker | Lukas Reschke | 2016-01-22 | 10 | -4/+129 |
* | | | Merge pull request #21816 from owncloud/require-a-specific-path-instead-of-au... | Thomas Müller | 2016-01-22 | 5 | -33/+47 |
|\ \ \ | |||||
| * | | | Use path instead of app id | Lukas Reschke | 2016-01-20 | 5 | -33/+47 |
* | | | | Merge pull request #21847 from owncloud/issue-21807-default-app-icon | Thomas Müller | 2016-01-22 | 2 | -0/+9 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add a default app icon for apps that don't have one | Joas Schilling | 2016-01-22 | 2 | -0/+9 |
|/ / / | |||||
* | | | Merge pull request #21843 from owncloud/increase-version | Thomas Müller | 2016-01-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Increase version due to new tables | Vincent Petry | 2016-01-22 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #21826 from owncloud/dav-fix-user-deletion | Thomas Müller | 2016-01-22 | 2 | -2/+49 |
|\ \ \ | |||||
| * | | | No card ID when deleting is acceptable | Joas Schilling | 2016-01-21 | 2 | -2/+49 |
* | | | | Merge pull request #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 20 | -33/+1037 |
|\ \ \ \ | |||||
| * | | | | use insertifnotexists | Robin Appelman | 2016-01-20 | 1 | -23/+5 |
| * | | | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 11 | -13/+113 |
| * | | | | handle changed mount points | Robin Appelman | 2016-01-20 | 1 | -1/+23 |
| * | | | | clear mount cache when deleting user | Robin Appelman | 2016-01-20 | 4 | -18/+101 |
| * | | | | multiple minor fies | Robin Appelman | 2016-01-20 | 7 | -22/+37 |
| * | | | | sort in tests | Robin Appelman | 2016-01-20 | 1 | -1/+18 |
| * | | | | use getmountmanager | Robin Appelman | 2016-01-20 | 1 | -1/+1 |
| * | | | | log duplicates | Robin Appelman | 2016-01-20 | 3 | -4/+20 |
| * | | | | Filter uncached mounts | Robin Appelman | 2016-01-20 | 1 | -10/+15 |
| * | | | | cache mountpoints in the db | Robin Appelman | 2016-01-20 | 10 | -4/+768 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21824 from owncloud/list-of-notifiers | Thomas Müller | 2016-01-22 | 3 | -10/+126 |
|\ \ \ \ | |||||
| * | | | | Make it possible to get a list of notifiers for a potential settings page | Joas Schilling | 2016-01-22 | 3 | -10/+126 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21840 from owncloud/fix-phpdoc | Thomas Müller | 2016-01-22 | 5 | -14/+7 |
|\ \ \ \ | |||||
| * | | | | Fix PHPDoc - @changed is no official tag -> use @since | Morris Jobke | 2016-01-22 | 5 | -14/+7 |
|/ / / / | |||||
* | | | | Merge pull request #21532 from owncloud/share2.0_getShares | Thomas Müller | 2016-01-22 | 7 | -89/+734 |
|\ \ \ \ | |||||
| * | | | | [Share 2.0] Fix displaying old shares proplery | Roeland Jago Douma | 2016-01-21 | 1 | -1/+12 |
| * | | | | Comments from Vincent | Roeland Jago Douma | 2016-01-21 | 3 | -13/+11 |
| * | | | | Add Unit tests for the default share provider | Roeland Jago Douma | 2016-01-21 | 2 | -56/+412 |
| * | | | | [Share 2.0] Add subfiles=x | Roeland Jago Douma | 2016-01-21 | 3 | -13/+45 |
| * | | | | Add intergration test for shared_with me and group shares | Roeland Jago Douma | 2016-01-21 | 1 | -0/+13 |
| * | | | | [Share 2.0] Resolve group shares | Roeland Jago Douma | 2016-01-21 | 1 | -5/+72 |
| * | | | | Renable intergration test | Roeland Jago Douma | 2016-01-21 | 1 | -17/+14 |
| * | | | | [Sharing 2.0] Start with getShares | Roeland Jago Douma | 2016-01-21 | 5 | -14/+185 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-22 | 148 | -1140/+1140 |
* | | | | | Merge pull request #21831 from owncloud/move-descriptive-tag-to-core | Thomas Müller | 2016-01-21 | 4 | -3/+99 |
|\ \ \ \ \ | |||||
| * | | | | | Move getDescriptiveTag to core | Joas Schilling | 2016-01-21 | 4 | -3/+99 |
* | | | | | | Merge pull request #21829 from owncloud/remove-duplicated-value | Thomas Müller | 2016-01-21 | 1 | -1/+0 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | remove duplicated array value | blizzz | 2016-01-21 | 1 | -1/+0 |