Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #18531 from owncloud/ext-user-credentials | Thomas Müller | 2016-01-22 | 13 | -16/+160 |
|\ | | | | | External storage 'Login credentials' auth mechanism | ||||
| * | bumb app version | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
| | | |||||
| * | fix test | Robin Appelman | 2016-01-18 | 3 | -2/+3 |
| | | |||||
| * | 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 |
| | | | | | | | | | | Stores user credentials in the database after user login, uses the new CredentialsManager class | ||||
* | | 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 | ||||
| * | | 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 | 9 | -13/+77 |
|\ \ \ | | | | | | | | | cache mountpoints in the db | ||||
| * | | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 9 | -13/+77 |
| | | | | |||||
* | | | | Merge pull request #21532 from owncloud/share2.0_getShares | Thomas Müller | 2016-01-22 | 2 | -1/+99 |
|\ \ \ \ | | | | | | | | | | | [Share 2.0] get shares | ||||
| * | | | | Comments from Vincent | Roeland Jago Douma | 2016-01-21 | 1 | -5/+3 |
| | | | | | |||||
| * | | | | [Share 2.0] Add subfiles=x | Roeland Jago Douma | 2016-01-21 | 1 | -0/+44 |
| | | | | | |||||
| * | | | | [Sharing 2.0] Start with getShares | Roeland Jago Douma | 2016-01-21 | 2 | -1/+57 |
| | | | | | |||||
* | | | | | Merge pull request #21829 from owncloud/remove-duplicated-value | Thomas Müller | 2016-01-21 | 1 | -1/+0 |
|\ \ \ \ \ | |/ / / / |/| | | | | remove duplicated array value | ||||
| * | | | | remove duplicated array value | blizzz | 2016-01-21 | 1 | -1/+0 |
| | | | | | |||||
* | | | | | Merge pull request #21761 from owncloud/share2_link | Thomas Müller | 2016-01-21 | 4 | -250/+429 |
|\ \ \ \ \ | | | | | | | | | | | | | Share2 link | ||||
| * | | | | | Directly get from the server container | Roeland Jago Douma | 2016-01-20 | 3 | -66/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Updated unit tests | ||||
| * | | | | | Do not use deprected activities API | Roeland Jago Douma | 2016-01-20 | 1 | -21/+33 |
| | | | | | | |||||
| * | | | | | Get correct path for activity downloads | Roeland Jago Douma | 2016-01-20 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | [Share 2.0] Make public link work without view | Roeland Jago Douma | 2016-01-20 | 1 | -2/+13 |
| | | | | | | |||||
| * | | | | | [Share 2.0] Make link share download use share manager | Roeland Jago Douma | 2016-01-20 | 3 | -72/+79 |
| | | | | | | |||||
| * | | | | | [Share 2.0] Move tests over the sharemanager | Roeland Jago Douma | 2016-01-20 | 3 | -111/+196 |
| | | | | | | | | | | | | | | | | | | | | | | | | Nice side effect... pure unit tests! | ||||
| * | | | | | [Share 2.0] Move showing link share to sharing 2.0 | Roeland Jago Douma | 2016-01-20 | 3 | -37/+91 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #21808 from owncloud/testing-app-details | Thomas Müller | 2016-01-21 | 2 | -2/+6 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Testing app details | ||||
| * | | | | testing app: fix app name capitalization | Jan-Christoph Borchardt | 2016-01-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | testing app: add max version | Jan-Christoph Borchardt | 2016-01-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | testing app: add logo | Jan-Christoph Borchardt | 2016-01-21 | 1 | -0/+4 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21778 from owncloud/share-calendars | Thomas Müller | 2016-01-21 | 22 | -204/+339 |
|\ \ \ \ | | | | | | | | | | | More tests for CalDAV | ||||
| * | | | | Add back the current-user-principal test suite | Thomas Müller | 2016-01-19 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | CalDAV sync tests | Thomas Müller | 2016-01-19 | 21 | -203/+331 |
| | | | | | |||||
| * | | | | Adjust CalDAV tests | Thomas Müller | 2016-01-19 | 2 | -2/+9 |
| | | | | | |||||
* | | | | | Merge pull request #20847 from owncloud/systemtags-ui | Thomas Müller | 2016-01-21 | 8 | -4/+406 |
|\ \ \ \ \ | |_|/ / / |/| | | | | System tags sidebar section | ||||
| * | | | | Adjust system tags app max version | Vincent Petry | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix app metadata/test issues for system tags app | Vincent Petry | 2016-01-20 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | Fix content type parsing in system tags plugin | Vincent Petry | 2016-01-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Added system tags GUI in sidebar | Vincent Petry | 2016-01-19 | 8 | -3/+406 |
| |/ / / | | | | | | | | | | | | | | | | | Added files details sidebar panel to assign/unassign/rename/delete system tags. | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-21 | 130 | -220/+66 |
| | | | | |||||
* | | | | Use IUser::setEMailAddress in ldap as well | Thomas Müller | 2016-01-20 | 11 | -103/+132 |
| | | | | |||||
* | | | | React on OC_User::changeUser hook and update the user's vcard | Thomas Müller | 2016-01-20 | 1 | -0/+9 |
| | | | | |||||
* | | | | Introduce IUser::setEMailAddress and add hook mechanism | Thomas Müller | 2016-01-20 | 3 | -4/+7 |
| |/ / |/| | | |||||
* | | | Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displayname | Thomas Müller | 2016-01-20 | 5 | -1/+141 |
|\ \ \ | | | | | | | | | LDAP: do not attempt to process user records without display name, fi… | ||||
| * | | | LDAP: do not attempt to process user records without display name, fixes ↵ | Arthur Schiwon | 2016-01-11 | 5 | -1/+141 |
| | | | | | | | | | | | | | | | | fatal error | ||||
* | | | | Merge pull request #21795 from owncloud/remove-unneeded-markup | Thomas Müller | 2016-01-20 | 2 | -10/+0 |
|\ \ \ \ | | | | | | | | | | | Remove unneeded markup for scan process - ref #20545 | ||||
| * | | | | Remove unneeded markup for scan process - ref #20545 | Morris Jobke | 2016-01-20 | 2 | -10/+0 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-20 | 16 | -12/+224 |
| | | | | | |||||
* | | | | | Merge pull request #21785 from owncloud/cron-sync-system-addressbook | Thomas Müller | 2016-01-20 | 6 | -5/+102 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add daily cron job to sync system address book | ||||
| * | | | | Install cron job on install and update | Thomas Müller | 2016-01-19 | 3 | -4/+52 |
| | | | | | |||||
| * | | | | Add daily cron job to sync system address book | Thomas Müller | 2016-01-18 | 4 | -2/+51 |
| | | | | | |||||
* | | | | | Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2 | Thomas Müller | 2016-01-19 | 32 | -113/+587 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Show group shared addressbooks | ||||
| * | | | | Fix test for ensureSystemAddressBookExists | Thomas Müller | 2016-01-18 | 2 | -5/+4 |
| | | | | |