summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add blob: scheme to default CSP policyLukas Reschke2015-09-296-57/+58
* Merge pull request #18105 from owncloud/ocs-api-integration-testsThomas Müller2015-09-297-0/+229
|\
| * Support different server ports - defined by EXECUTOR_NUMBERThomas Müller2015-09-293-8/+14
| * added delete user testSergio Bertolin2015-09-291-0/+8
| * Use ci profileThomas Müller2015-09-291-1/+1
| * Use fixed port for nowThomas Müller2015-09-291-5/+6
| * Test user creationThomas Müller2015-09-292-45/+110
| * require autoload.phpThomas Müller2015-09-291-6/+1
| * Adding phpunit for the assertionsThomas Müller2015-09-291-0/+1
| * Adding missing filesThomas Müller2015-09-292-0/+94
| * First integration tests for provisioning apiThomas Müller2015-09-295-0/+59
* | Merge pull request #19424 from owncloud/use-jsqueezeThomas Müller2015-09-293-60/+3
|\ \ | |/ |/|
| * Update 3rdparty submoduleThomas Müller2015-09-291-0/+0
| * User upstream class SeparatorFilterThomas Müller2015-09-282-58/+1
| * Suer JSqueezeFilter instead of JSMinFilterThomas Müller2015-09-281-2/+2
* | Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabledThomas Müller2015-09-291-1/+2
|\ \
| * | Allow ajax requests on public webdav interfaceVincent Petry2015-09-221-1/+2
* | | Merge pull request #19418 from owncloud/fix-parsehashqueryThomas Müller2015-09-291-3/+1
|\ \ \
| * | | Consider both hash params and query when parsing URLVincent Petry2015-09-281-3/+1
* | | | Merge pull request #19367 from owncloud/lock-transaction-no-logThomas Müller2015-09-291-4/+0
|\ \ \ \
| * | | | remove warning when trying to get a lock while in transactionRobin Appelman2015-09-251-4/+0
* | | | | Merge pull request #19411 from owncloud/files-sidebar-shareloadspinnerThomas Müller2015-09-292-5/+28
|\ \ \ \ \
| * | | | | Show loading spinner for first fetch of sharesVincent Petry2015-09-282-5/+28
| | |/ / / | |/| | |
* | | | | Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeuploadThomas Müller2015-09-292-22/+64
|\ \ \ \ \
| * | | | | Show conflict dialog before upload when possibleVincent Petry2015-09-282-22/+64
| |/ / / /
* | | | | Merge pull request #19409 from owncloud/files-sidebar-hiding-tabsThomas Müller2015-09-294-18/+136
|\ \ \ \ \
| * | | | | Hide sidebar tab headers conditionallyVincent Petry2015-09-284-18/+136
| |/ / / /
* | | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-imagesThomas Müller2015-09-291-1/+1
|\ \ \ \ \
| * | | | | Fix CSP for images for legacy appsOlivier Paroz2015-09-281-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #19431 from phil-davis/r2Lukas Reschke2015-09-293-3/+3
|\ \ \ \ \
| * | | | | Session closed exception wordingPhil Davis2015-09-293-3/+3
|/ / / / /
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-09-2918-4/+32
|/ / / /
* | | | Merge pull request #19408 from owncloud/fix-trashbin-checkboxRobin Appelman2015-09-281-1/+1
|\ \ \ \
| * | | | fix checkbox in trashbinHendrik Leppelsack2015-09-281-1/+1
* | | | | Merge pull request #19413 from owncloud/share-nopermission-linkVincent Petry2015-09-282-30/+13
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Still show share link when recipient but no share permissionVincent Petry2015-09-282-30/+13
|/ / / /
* | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversionThomas Müller2015-09-283-25/+54
|\ \ \ \
| * | | | Repair mime types only when upgrading from OC 8.0Vincent Petry2015-09-233-25/+54
* | | | | Merge pull request #19404 from owncloud/files-sidebar-sorttabsThomas Müller2015-09-286-3/+31
|\ \ \ \ \
| * | | | | Fix tabs order in files sidebarVincent Petry2015-09-286-3/+31
* | | | | | Merge pull request #19402 from owncloud/public-recognizeauthsessionThomas Müller2015-09-281-1/+4
|\ \ \ \ \ \
| * | | | | | Allow public auth to recognize sesssionVincent Petry2015-09-281-1/+4
| |/ / / / /
* | | | | | Merge pull request #19401 from owncloud/files-actionsorderThomas Müller2015-09-284-0/+50
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix order of actions in the files actions menuVincent Petry2015-09-284-0/+50
| |/ / / /
* | | | | Merge pull request #19318 from owncloud/tarstreamerThomas Müller2015-09-283-63/+158
|\ \ \ \ \
| * | | | | Updating submoduleThomas Müller2015-09-281-0/+0
| * | | | | Updating TarStreamer to v0.1-beta3Thomas Müller2015-09-281-0/+0
| * | | | | Adding ownCloud/TarStreamerThomas Müller2015-09-282-1/+1
| * | | | | Uniform behavour for tar and zipVictor Dubiniuk2015-09-281-1/+6
| * | | | | More correctionsVictor Dubiniuk2015-09-282-11/+7