summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* inject loggerRobin Appelman2016-01-296-11/+33
* Dont set null values when validating storage definitionRobin Appelman2016-01-293-6/+12
* minor fixesRobin Appelman2016-01-293-7/+11
* set auth mechanism in testsRobin Appelman2016-01-291-0/+1
* remove custom controler for user provided password authRobin Appelman2016-01-297-141/+97
* dont show user provided auth as option for personal mountsRobin Appelman2016-01-293-3/+5
* Allow setting user provided credentials from the personal settings pageRobin Appelman2016-01-296-44/+180
* expose user provided credentials for admin mountsRobin Appelman2016-01-292-1/+10
* Add user provided credentials mechanismRobin Appelman2016-01-294-1/+142
* Fix invalid storages not showing in directory listingRobin Appelman2016-01-292-1/+130
* Merge pull request #21660 from owncloud/sharing2_update_resharesThomas Müller2016-01-294-46/+496
|\
| * Update the initiator of the share as well in migrationRoeland Jago Douma2016-01-283-7/+74
| * Update reshares in batches as not to run out of memoryRoeland Jago Douma2016-01-282-14/+97
| * upgrade to sharing 2.0, remove hierarchical re-sharesBjörn Schießle2016-01-284-48/+348
* | 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
|\ \ \ \ \