summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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>
| * | Add navigation endpointJulius Härtl2018-02-122-0/+61
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Make sure we test the proper order in the NavigationManagerTestJulius Härtl2018-02-121-7/+7
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move navigation processing to the NavigationManagerJulius Härtl2018-02-122-33/+40
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8376 from nextcloud/devgalsMorris Jobke2018-02-151-0/+1
|\ \ \ | | | | | | | | Fix edit tag textbox size
| * | | Fix edit tag textbox sizeAastha Gupta2018-02-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #7586 Signed-off-by: Aastha Gupta <aastha.gupta4104@gmail.com>
* | | | Merge pull request #8372 from nextcloud/encapsulate-app-requireMorris Jobke2018-02-151-11/+13
|\ \ \ \ | |_|_|/ |/| | | Properly encapsulate require_once for app.php
| * | | Add throws annotationJulius Härtl2018-02-151-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Properly encapsulate require_once for app.phpJulius Härtl2018-02-151-11/+12
| |/ / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #8280 from coliff/coliff-email-inputtypeMorris Jobke2018-02-151-1/+1
|\ \ \ | | | | | | | | Correct input type for email
| * | | Correct input type for emailChristian Oliff2018-02-091-1/+1
| | | | | | | | | | | | Correct input type for email
* | | | Merge pull request #8277 from nextcloud/avatars-shared-allJulius Härtl2018-02-151-0/+4
|\ \ \ \ | | | | | | | | | | Show share owner avatars on all file lists
| * | | | Show share owner avatars on all file listsJulius Härtl2018-02-091-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #7754 from pierlon/masterMorris Jobke2018-02-157-2/+56
|\ \ \ \ | |_|/ / |/| | | Add icons to devices/sessions
| * | | Use generic icons for clientsPierre Gordon2018-01-2015-51/+21
| | | | | | | | | | | | | | | | Signed off by: Pierre Gordon <pierregordon@protonmail.com>
| * | | Align icons with textPierre Gordon2018-01-191-0/+1
| | | | | | | | | | | | | | | | Signed off by: Pierre Gordon <pierregordon@protonmail.com>
| * | | Centralize iconsPierre Gordon2018-01-1913-17/+54
| | | | | | | | | | | | | | | | Signed off by: Pierre Gordon <pierregordon@protonmail.com>
| * | | Make icons consistentPierre Gordon2018-01-1910-10/+10
| | | | | | | | | | | | | | | | Signed off by: Pierre Gordon <pierregordon@protonmail.com>
| * | | Add icons to devices/sessionsPierre Gordon2018-01-1913-2/+48
| | | | | | | | | | | | | | | | Signed off by: Pierre Gordon <pierregordon@protonmail.com>
* | | | Merge pull request #8365 from nextcloud/fix-phpdocMorris Jobke2018-02-151-1/+1
|\ \ \ \ | | | | | | | | | | Fix typo in PHPDoc
| * | | | Fix typo in PHPDocMorris Jobke2018-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | [tx-robot] updated from transifexNextcloud bot2018-02-1450-82/+1044
| | | | |
* | | | | Merge pull request #8259 from nextcloud/guzzle6Morris Jobke2018-02-1426-424/+411
|\ \ \ \ \ | | | | | | | | | | | | update guzzlehttp/guzzle to 6.3.0
| * | | | | fix redundant namespaceRobin Appelman2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | adjust post body for new guzzleRobin Appelman2018-02-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Adjust integration tests to new guzzleRobin Appelman2018-02-0917-350/+322
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Adjust dav client to new guzzleRobin Appelman2018-02-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>