Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-29 | 146 | -334/+50 |
* | Merge pull request #21333 from owncloud/migrate-contacts | Thomas Müller | 2016-01-28 | 12 | -5/+650 |
|\ | |||||
| * | Add copyright header | Lukas Reschke | 2016-01-28 | 1 | -0/+19 |
| * | Fix sql to get shared addressbooks including unit tests | Thomas Müller | 2016-01-27 | 2 | -1/+17 |
| * | Unit testing database access to old contacts tables | Thomas Müller | 2016-01-27 | 3 | -3/+267 |
| * | Unit testing migration logic | Thomas Müller | 2016-01-27 | 4 | -44/+176 |
| * | Add app to migrate contacts and calendars | Thomas Müller | 2016-01-27 | 8 | -5/+219 |
* | | Merge pull request #21860 from owncloud/sharedialog-ocs-adapter | Vincent Petry | 2016-01-28 | 9 | -544/+617 |
|\ \ | |||||
| * | | Fix share default expiration date calculation | Vincent Petry | 2016-01-28 | 2 | -9/+8 |
| * | | Share dialog use OCS API | Vincent Petry | 2016-01-28 | 8 | -537/+611 |
|/ / | |||||
* | | Merge pull request #21975 from owncloud/fix_ocs_unit_tests | Thomas Müller | 2016-01-28 | 2 | -32/+32 |
|\ \ | |||||
| * | | Fix OCS unit tests after two share merges | Roeland Jago Douma | 2016-01-28 | 2 | -32/+32 |
|/ / | |||||
* | | Merge pull request #21958 from owncloud/systemtags-style | Thomas Müller | 2016-01-28 | 5 | -25/+46 |
|\ \ | |||||
| * | | Use boxes for system tags, shorten permission text | Vincent Petry | 2016-01-28 | 5 | -25/+46 |
* | | | Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings | Thomas Müller | 2016-01-28 | 2 | -32/+744 |
|\ \ \ | |||||
| * | | | [Share 2.0] Allow using permissions to update link share | Roeland Jago Douma | 2016-01-27 | 2 | -14/+113 |
| * | | | [Share 2.0] Still allow isolated updates | Roeland Jago Douma | 2016-01-27 | 2 | -11/+125 |
| * | | | [Share 2.0] Also handle empty parameter in updateShare | Roeland Jago Douma | 2016-01-27 | 2 | -24/+283 |
| * | | | [Share 2.0] When passing empty strings don't fail | Roeland Jago Douma | 2016-01-27 | 2 | -10/+250 |
* | | | | Merge pull request #21952 from owncloud/systemtags-fix-conflicts | Thomas Müller | 2016-01-28 | 2 | -3/+85 |
|\ \ \ \ | |||||
| * | | | | Fix system tags conflict situations | Vincent Petry | 2016-01-27 | 2 | -3/+85 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21851 from owncloud/shared-unreadable | Thomas Müller | 2016-01-28 | 8 | -548/+71 |
|\ \ \ \ | |||||
| * | | | | fix cachejail->update | Robin Appelman | 2016-01-28 | 1 | -1/+1 |
| * | | | | cleanup shared cache | Robin Appelman | 2016-01-28 | 8 | -547/+70 |
|/ / / / | |||||
* | | | | Merge pull request #21858 from owncloud/getMountsForFileId | Thomas Müller | 2016-01-28 | 3 | -13/+205 |
|\ \ \ \ | |||||
| * | | | | Fix failing oracle and postgres tests | Joas Schilling | 2016-01-27 | 1 | -2/+2 |
| * | | | | Use new constants | Joas Schilling | 2016-01-27 | 1 | -7/+8 |
| * | | | | add IUserMountCache->getMountsForFileId | Robin Appelman | 2016-01-27 | 3 | -7/+198 |
| |/ / / | |||||
* | | | | Merge pull request #21970 from zander/mentionbot | Thomas Müller | 2016-01-28 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Stop spamming me. | Tom | 2016-01-28 | 1 | -1/+2 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21971 from owncloud/notify-me | Thomas Müller | 2016-01-28 | 1 | -0/+9 |
|\ \ \ \ | |||||
| * | | | | More more more, kidding, just to be sure | Joas Schilling | 2016-01-28 | 1 | -0/+9 |
|/ / / / | |||||
* | | | | Merge pull request #21957 from owncloud/share2_to_ocp | Morris Jobke | 2016-01-28 | 19 | -632/+827 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | [Share 2.0] Remove setId and setProviderId from the interface | Roeland Jago Douma | 2016-01-28 | 2 | -20/+0 |
| * | | | [Share 2.0] Fix interfaces and comments | Roeland Jago Douma | 2016-01-28 | 12 | -207/+213 |
| * | | | [Share 2.0] Add getShareManager to OCP\IServerContainer | Roeland Jago Douma | 2016-01-27 | 4 | -2/+15 |
| * | | | [Share 2.0] Create IManger interface for share manager | Roeland Jago Douma | 2016-01-27 | 2 | -2/+214 |
| * | | | [Share 2.0] Move IShare to OCP | Roeland Jago Douma | 2016-01-27 | 13 | -150/+192 |
| * | | | [Share 2.0] Fix IShare | Roeland Jago Douma | 2016-01-27 | 4 | -108/+50 |
|/ / / | |||||
* | | | Merge pull request #21963 from owncloud/fix-installer | Thomas Müller | 2016-01-27 | 5 | -82/+225 |
|\ \ \ | |||||
| * | | | Check whether ownCloud is installed | Lukas Reschke | 2016-01-27 | 5 | -82/+225 |
* | | | | Merge pull request #21959 from owncloud/cache-interface-clean | Thomas Müller | 2016-01-27 | 1 | -15/+0 |
|\ \ \ \ | |||||
| * | | | | clean cache interface | Robin Appelman | 2016-01-27 | 1 | -15/+0 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #21895 from owncloud/calendar-sharing | Thomas Müller | 2016-01-27 | 12 | -132/+912 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Extract sharing functionality into own backend class for reusability | Thomas Müller | 2016-01-27 | 6 | -96/+203 |
| * | | | Fix server ctor including unit test - this shall never happen again | Thomas Müller | 2016-01-27 | 2 | -1/+25 |
| * | | | Migrate from CardDAV sharing to more generalk DAV sharing | Thomas Müller | 2016-01-27 | 9 | -36/+685 |
* | | | | Merge pull request #21923 from owncloud/fix-errors-after-install | Thomas Müller | 2016-01-27 | 2 | -12/+13 |
|\ \ \ \ | |||||
| * | | | | Fix errors after install | Lukas Reschke | 2016-01-26 | 2 | -12/+13 |
* | | | | | Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_... | Thomas Müller | 2016-01-27 | 3 | -9/+16 |
|\ \ \ \ \ |