summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-01-29146-334/+50
* Merge pull request #21333 from owncloud/migrate-contactsThomas Müller2016-01-2812-5/+650
|\
| * Add copyright headerLukas Reschke2016-01-281-0/+19
| * Fix sql to get shared addressbooks including unit testsThomas Müller2016-01-272-1/+17
| * Unit testing database access to old contacts tablesThomas Müller2016-01-273-3/+267
| * Unit testing migration logicThomas Müller2016-01-274-44/+176
| * Add app to migrate contacts and calendarsThomas Müller2016-01-278-5/+219
* | Merge pull request #21860 from owncloud/sharedialog-ocs-adapterVincent Petry2016-01-289-544/+617
|\ \
| * | Fix share default expiration date calculationVincent Petry2016-01-282-9/+8
| * | Share dialog use OCS APIVincent Petry2016-01-288-537/+611
|/ /
* | Merge pull request #21975 from owncloud/fix_ocs_unit_testsThomas Müller2016-01-282-32/+32
|\ \
| * | Fix OCS unit tests after two share mergesRoeland Jago Douma2016-01-282-32/+32
|/ /
* | Merge pull request #21958 from owncloud/systemtags-styleThomas Müller2016-01-285-25/+46
|\ \
| * | Use boxes for system tags, shorten permission textVincent Petry2016-01-285-25/+46
* | | Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_stringsThomas Müller2016-01-282-32/+744
|\ \ \
| * | | [Share 2.0] Allow using permissions to update link shareRoeland Jago Douma2016-01-272-14/+113
| * | | [Share 2.0] Still allow isolated updatesRoeland Jago Douma2016-01-272-11/+125
| * | | [Share 2.0] Also handle empty parameter in updateShareRoeland Jago Douma2016-01-272-24/+283
| * | | [Share 2.0] When passing empty strings don't failRoeland Jago Douma2016-01-272-10/+250
* | | | Merge pull request #21952 from owncloud/systemtags-fix-conflictsThomas Müller2016-01-282-3/+85
|\ \ \ \
| * | | | Fix system tags conflict situationsVincent Petry2016-01-272-3/+85
| | |/ / | |/| |
* | | | Merge pull request #21851 from owncloud/shared-unreadableThomas Müller2016-01-288-548/+71
|\ \ \ \
| * | | | fix cachejail->updateRobin Appelman2016-01-281-1/+1
| * | | | cleanup shared cacheRobin Appelman2016-01-288-547/+70
|/ / / /
* | | | Merge pull request #21858 from owncloud/getMountsForFileIdThomas Müller2016-01-283-13/+205
|\ \ \ \
| * | | | Fix failing oracle and postgres testsJoas Schilling2016-01-271-2/+2
| * | | | Use new constantsJoas Schilling2016-01-271-7/+8
| * | | | add IUserMountCache->getMountsForFileIdRobin Appelman2016-01-273-7/+198
| |/ / /
* | | | Merge pull request #21970 from zander/mentionbotThomas Müller2016-01-281-1/+2
|\ \ \ \
| * | | | Stop spamming me.Tom2016-01-281-1/+2
| | |/ / | |/| |
* | | | Merge pull request #21971 from owncloud/notify-meThomas Müller2016-01-281-0/+9
|\ \ \ \
| * | | | More more more, kidding, just to be sureJoas Schilling2016-01-281-0/+9
|/ / / /
* | | | Merge pull request #21957 from owncloud/share2_to_ocpMorris Jobke2016-01-2819-632/+827
|\ \ \ \ | |/ / / |/| | |
| * | | [Share 2.0] Remove setId and setProviderId from the interfaceRoeland Jago Douma2016-01-282-20/+0
| * | | [Share 2.0] Fix interfaces and commentsRoeland Jago Douma2016-01-2812-207/+213
| * | | [Share 2.0] Add getShareManager to OCP\IServerContainerRoeland Jago Douma2016-01-274-2/+15
| * | | [Share 2.0] Create IManger interface for share managerRoeland Jago Douma2016-01-272-2/+214
| * | | [Share 2.0] Move IShare to OCPRoeland Jago Douma2016-01-2713-150/+192
| * | | [Share 2.0] Fix IShareRoeland Jago Douma2016-01-274-108/+50
|/ / /
* | | Merge pull request #21963 from owncloud/fix-installerThomas Müller2016-01-275-82/+225
|\ \ \
| * | | Check whether ownCloud is installedLukas Reschke2016-01-275-82/+225
* | | | Merge pull request #21959 from owncloud/cache-interface-cleanThomas Müller2016-01-271-15/+0
|\ \ \ \
| * | | | clean cache interfaceRobin Appelman2016-01-271-15/+0
| | |/ / | |/| |
* | | | Merge pull request #21895 from owncloud/calendar-sharingThomas Müller2016-01-2712-132/+912
|\ \ \ \ | |_|/ / |/| | |
| * | | Extract sharing functionality into own backend class for reusabilityThomas Müller2016-01-276-96/+203
| * | | Fix server ctor including unit test - this shall never happen againThomas Müller2016-01-272-1/+25
| * | | Migrate from CardDAV sharing to more generalk DAV sharingThomas Müller2016-01-279-36/+685
* | | | Merge pull request #21923 from owncloud/fix-errors-after-installThomas Müller2016-01-272-12/+13
|\ \ \ \
| * | | | Fix errors after installLukas Reschke2016-01-262-12/+13
* | | | | Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_...Thomas Müller2016-01-273-9/+16
|\ \ \ \ \