summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #21992 from owncloud/share-dialog-error-handlingThomas Müller2016-01-292-7/+158
|\ \ \ \ \ \ \
| * | | | | | | Properly forward error messages in share dialogVincent Petry2016-01-282-7/+158
| |/ / / / / /
* | | | | | | Merge pull request #21928 from owncloud/files-external-js-checkbox-fixThomas Müller2016-01-292-5/+93
|\ \ \ \ \ \ \
| * | | | | | | Add storage validation JS unit testsRobin McCorkell2016-01-291-1/+75
| * | | | | | | Fix validation of inputs that aren't textRobin McCorkell2016-01-261-4/+18
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #21990 from owncloud/systemtags-cleanup-orphansThomas Müller2016-01-295-17/+268
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Cleanup job for system and user tag orphaned when file was deletedVincent Petry2016-01-295-17/+268
* | | | | | | Merge pull request #21701 from owncloud/scan_files_more_details_IIThomas Müller2016-01-291-38/+71
|\ \ \ \ \ \ \
| * | | | | | | occ scan:files Adding more details in the base print out (II)martin.mattel@diemattels.at2016-01-291-38/+71
| |/ / / / / /
* | | | | | | Merge pull request #21995 from owncloud/share2_delete_user_defined_group_sharesThomas Müller2016-01-292-65/+67
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | [Share 2.0] When deleting a group share delete childrenRoeland Jago Douma2016-01-282-65/+67
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #21932 from owncloud/comments-dav-refinementsThomas Müller2016-01-294-8/+36
|\ \ \ \ \ \
| * | | | | | provide info about plugin, and do not run commit ourselves on proppatchArthur Schiwon2016-01-264-8/+36
* | | | | | | Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-awayThomas Müller2016-01-294-37/+18
|\ \ \ \ \ \ \
| * | | | | | | Remove other broken usages in deprecated methodsJoas Schilling2016-01-291-35/+3
| * | | | | | | Deprecate the method and warn against using itJoas Schilling2016-01-282-0/+4
| * | | | | | | Do not create a loop that generates thousands of jobsJoas Schilling2016-01-281-2/+11
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #21981 from owncloud/systemtags-trim-nameThomas Müller2016-01-291-5/+6
|\ \ \ \ \ \ \
| * | | | | | | Trim tag names to avoid problemsJoas Schilling2016-01-281-5/+6
* | | | | | | | Merge pull request #21993 from owncloud/updater-htaccesThomas Müller2016-01-291-0/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Do not rewrite updater requestsVictor Dubiniuk2016-01-281-0/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | [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
|\ \ \ \ \ \