summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use a proper wait for create of the containerRoeland Jago Douma2018-02-192-4/+28
| | | | | | * Also create a test file so we know for sure it all works Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* use more precise method for waiting for swiftRobin Appelman2018-02-191-3/+29
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* fix controller testRobin Appelman2018-02-193-3/+5
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* adjust swift external storage to new openstack sdkRobin Appelman2018-02-194-198/+150
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* adjust swift object storage to new openstack sdkRobin Appelman2018-02-192-212/+184
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* switch from rackspace/php-opencloud to php-opencloud/openstackRobin Appelman2018-02-191-0/+0
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #8158 from nextcloud/s3-minioRoeland Jago Douma2018-02-191-7/+4
|\ | | | | Use a more widely available method to test s3 settings
| * Use a more widely available method to test s3 settingsRobin Appelman2018-02-081-7/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #8424 from nextcloud/fix/update-appRoeland Jago Douma2018-02-192-2/+2
|\ \ | | | | | | Fix updating an app
| * | Fix updating an upChristoph Wurst2018-02-192-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | OC_App has been made strict recently and the updater code was not compatible to this. This adds the array to string conversion of the Nextcloud version and fixes a typo in OC_App (sstring -> string) Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #8426 from ↵Roeland Jago Douma2018-02-191-1/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/refactor/notification-showTempoary-unused-var Remove unused var in OC.Notification.showTemporary
| * | | Remove unused var in OC.Notification.showTemporaryChristoph Wurst2018-02-191-1/+0
|/ / / | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #8334 from nextcloud/lib-strict-typingRoeland Jago Douma2018-02-191-6/+9
|\ \ \ | | | | | | | | Make lib/autoloader.php strictly typed and p…
| * | | Make lib/autoloader.php strictly typed and properly type hintedMorris Jobke2018-02-131-6/+9
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #8366 from nextcloud/remove-disable-caching-headersRoeland Jago Douma2018-02-196-13/+16
|\ \ \ \ | |_|/ / |/| | | Use normal header() calls instead of private method calls
| * | | Use normal header() calls instead of private method callsMorris Jobke2018-02-196-13/+16
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-02-1926-48/+102
| | |
* | | [tx-robot] updated from transifexNextcloud bot2018-02-1816-0/+16
| | |
* | | Merge pull request #8411 from nextcloud/add-strict-types-to-oc_appMorris Jobke2018-02-178-98/+81
|\ \ \ | | | | | | | | Add strict types to OC_App
| * | | Add remaining type hints, that were already okayMorris Jobke2018-02-171-33/+34
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Always return a string in OC_App::getCurrentApp and no booleanMorris Jobke2018-02-171-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Use empty array as group list in OC_App::enableMorris Jobke2018-02-172-4/+4
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Refactor dependencies in setAppTypesMorris Jobke2018-02-171-6/+8
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix app version to be always string and neither array nor nullMorris Jobke2018-02-175-23/+6
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | OC_App::loadApps now only accepts an array as type listMorris Jobke2018-02-173-12/+9
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Migrate to short array syntaxMorris Jobke2018-02-171-18/+18
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2018-02-1728-10/+324
| | | |
* | | | Merge pull request #8232 from ↵Morris Jobke2018-02-1638-428/+1790
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema Validate appinfo against appstore schema
| * | | | App manager is not needed anymoreJoas Schilling2018-02-162-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix info.xml files of shipped appsJoas Schilling2018-02-1622-233/+330
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Validate the info.xml against the appstore schema fileJoas Schilling2018-02-1616-195/+1461
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #8391 from coder-hugo/feature/mysql_ansi_quotesMorris Jobke2018-02-161-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Don't use double quotes in MySQL queries
| * | | | | Don't use double quotes in MySQL queriesRobin Müller2018-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MySQL databases with the ANSI_QUOTES mode enabled treat " as an identifier quote (see https://dev.mysql.com/doc/refman/5.7/en/sql-mode.html#sqlmode_ansi_quotes). So for such databases the 'occ upgrade' fails with an error message like this: ... unknown column 'oc_*' in where clause. This fix replaces the doulbe quotes with single quotes that should be always used in MySQL queries to quote literal strings. Signed-off-by: Robin Müller <robin.mueller@1und1.de>
* | | | | | Merge pull request #8396 from nextcloud/fix-typo-in-build-matrix-of-drone-ymlMorris Jobke2018-02-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typo in build matrix of ".drone.yml"
| * | | | | | Fix typo in build matrix of .drone.ymlDaniel Calviño Sánchez2018-02-161-1/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #8382 from ↵Morris Jobke2018-02-163-34/+41
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/make-acceptance-tests-for-comments-more-consistent-with-the-others Make acceptance tests for comments more consistent with the others
| * | | | | Take into account the comment message when looking for itDaniel Calviño Sánchez2018-02-152-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of checking that the list contains one comment it is now checked that a comment with certain message is visible. This makes the step (and the locator) more reusable in future tests and also simplifies the code. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Adjust timeouts in the step to create a new commentDaniel Calviño Sánchez2018-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on the previous steps the new comment field may be already shown or not when the step to create a new comment is executed. Therefore, the timeout was increased from 2 to the "standard" 10 seconds used in other tests. If the new comment field was found there is no need to use a timeout when looking for the new comment button; it is either there or not, it will not appear after some time. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Move locators above step definitionsDaniel Calviño Sánchez2018-02-151-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The locators are moved above the step definitions for consistency with other context files; besides that I made some minor adjustments for consistency too in the locator descriptions and identation, and moved the locators for ".newCommentRow" descendants together. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add acceptance tests for comments to DroneDaniel Calviño Sánchez2018-02-151-0/+9
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* / | | | [tx-robot] updated from transifexNextcloud bot2018-02-1612-8/+22
|/ / / /
* | | | Merge pull request #8095 from nextcloud/webapps-capabilitiesMorris Jobke2018-02-1511-47/+291
|\ \ \ \ | | | | | | | | | | Expose navigation entries as API endpoint
| * | | | Update phpDoc comments and add more type hintingJulius Härtl2018-02-152-7/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Also rewrite icon urlJulius Härtl2018-02-122-4/+22
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Deprecate static methods and use Navigation managerJulius Härtl2018-02-123-3/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Update autoloaderRoeland Jago Douma2018-02-122-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Move to OCS endpointJulius Härtl2018-02-123-21/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Allow requesting absolute URLsJulius Härtl2018-02-122-11/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They might be useful when requesting the navigation from the clients Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add tests for NavigationControllerJulius Härtl2018-02-122-2/+79
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Add getAll to public INavigationManagerJulius Härtl2018-02-122-1/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>