summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add the users result only when non empty so tests stay the sameJoas Schilling2018-03-091-1/+3
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Also array_slice wide email matches of local usersJoas Schilling2018-03-091-4/+7
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #8738 from ↵Roeland Jago Douma2018-03-091-7/+31
|\ | | | | | | | | nextcloud/stable13-8728-better-handling-of-invisible-elements-in-acceptance-tests [stable13] Better handling of invisible elements in acceptance tests
| * Add automatic handling of NoSuchElement exceptionsDaniel Calviño Sánchez2018-03-091-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | NoSuchElement exceptions are sometimes thrown instead of StaleElementReference exceptions. This can happen when the Selenium2 driver for Mink performs an action on an element through the WebDriver session instead of directly through the WebDriver element. In that case, if the element with the given ID does not exist, a NoSuchElement exception would be thrown instead of a StaleElementReference exception, so those cases are handled like StaleElementReference exceptions. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Add automatic handling of MoveTargetOutOfBounds exceptionsDaniel Calviño Sánchez2018-03-091-3/+17
|/ | | | | | | | | | | | | | | | | | MoveTargetOutOfBounds exceptions are sometimes thrown instead of ElementNotVisible exceptions. This can happen when the Selenium2 driver for Mink moves the cursor on an element using the "moveto" method of the Webdriver session, for example, before clicking on an element. In that case, if the element is not visible, "moveto" would throw a MoveTargetOutOfBounds exception instead of an ElementNotVisible exception, so those cases are handled like ElementNotVisible exceptions. Note that MoveTargetOutOfBounds exceptions could be thrown too if the element was visible but "out of reach"; there is no problem in handling those cases as if the element was not visible, as the exception will be thrown again anyway once it is verified that the element is indeed visible. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2018-03-09148-172/+316
|
* Merge pull request #8686 from ↵Roeland Jago Douma2018-03-062-75/+179
|\ | | | | | | | | nextcloud/backport/8298/fix-activities-for-end2end-encryption [stable13] Fix activities for end2end encryption
| * Fix unit testJoas Schilling2018-03-061-0/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Catch exception when the parent is deleted as wellJoas Schilling2018-03-061-2/+27
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Do a recursion instead of an endless loopJoas Schilling2018-03-061-1/+1
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix problem with deleted filesJoas Schilling2018-03-061-5/+14
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Fix path handling for activitiesJoas Schilling2018-03-061-7/+20
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Add special handling for e2e encryptionJoas Schilling2018-03-061-1/+108
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * Extract duplicated logic into a methodJoas Schilling2018-03-061-80/+24
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8693 from nextcloud/13-8173Roeland Jago Douma2018-03-061-3/+5
|\ \ | | | | | | [stable13] Fix undefined index problem
| * | Fix undefined index problemmichaelletzgus2018-03-061-3/+5
|/ / | | | | | | | | | | | | | | Nextcloud 13RC4, error in logfile, triggered by "occ config:list": Invalid argument supplied for foreach() at lib/private/AppConfig.php#297 PHP Undefined index: workflowengine at lib/private/AppConfig.php#297 Fix: Check if index exists in array before using it.
* | Merge pull request #8687 from ↵Roeland Jago Douma2018-03-061-2/+9
|\ \ | | | | | | | | | | | | nextcloud/backport/8328/filter-out-the-current-user-by-email-too [stable13] Filter out the current user when searching for emails too
| * | PHP 5.6 compatibilityJoas Schilling2018-03-061-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Filter out the current user when searching for emails tooJoas Schilling2018-03-061-2/+9
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8688 from nextcloud/13-8557Roeland Jago Douma2018-03-061-1/+5
|\ \ | | | | | | [stable13] Fix check if theming defaults instance is available
| * | Fix check if theming defaults instance is availableMorris Jobke2018-03-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | The check in URLGenerator.php#169 and Server.php#945 are different and thus the DI container could return a \OC_Defaults object which does not provide the wanted method caising a PHP error. Fixes #8420 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #8685 from ↵Morris Jobke2018-03-063-8/+5
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/backport/8664/add-missing-settings-page-title-again [stable13] Set the correct active navigation entry
| * | | Set the correct active navigation entryJoas Schilling2018-03-063-8/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8683 from nextcloud/8474_13Morris Jobke2018-03-061-0/+1
|\ \ \ \ | | | | | | | | | | [stable13] Log exceptions that happen when writing the app store reply to storage
| * | | | Log exceptions that happen when writing the app store reply to storageJoas Schilling2018-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #8667 from nextcloud/8158_13Morris Jobke2018-03-061-7/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable13] Use a more widely available method to test s3 settings
| * | | | | Use a more widely available method to test s3 settingsRobin Appelman2018-03-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #8678 from nextcloud/7707_13Morris Jobke2018-03-062-4/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [stable13] generate different UIDs for Birthday, Anniversary and Death event
| * | | | | generate different UIDs for Birthday, Anniversary and Death eventGeorg Ehrke2018-03-062-4/+5
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | Merge pull request #8680 from nextcloud/8391_13Morris Jobke2018-03-061-2/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | [stable13] Don't use double quotes in MySQL queries
| * | | | Don't use double quotes in MySQL queriesRobin Müller2018-03-061-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 #8676 from nextcloud/8297_13Roeland Jago Douma2018-03-061-1/+1
|\ \ \ \ | | | | | | | | | | [stable13] Fix example regex for user agent matching
| * | | | Fix example regex for user agent matchingJoas Schilling2018-03-061-1/+1
| | |/ / | |/| | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #8673 from nextcloud/stable13-8634Morris Jobke2018-03-062-6/+59
|\ \ \ \ | |_|/ / |/| | | [stable13] do not create empty userid when attribute does not have allowed chars
| * | | do not create empty userid when attribute does not have allowed charsArthur Schiwon2018-03-052-6/+59
| |/ / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #8668 from nextcloud/8217_13Roeland Jago Douma2018-03-061-1/+3
|\ \ \ | | | | | | | | [stable13] Use proper lanugage in langauge code
| * | | Use proper lanugage in langauge codeRoeland Jago Douma2018-03-051-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Fixes #8180 The _ is not valid in language codes use - instead. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #8675 from nextcloud/stable13-8601Roeland Jago Douma2018-03-061-7/+5
|\ \ \ | | | | | | | | [13] Remove too restrict check for background image/color
| * | | Remove to restrict check for background image/colorJulius Härtl2018-03-061-7/+5
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | [tx-robot] updated from transifexNextcloud bot2018-03-06258-488/+560
| | |
* | | Merge pull request #8669 from nextcloud/8218_13blizzz2018-03-051-1/+1
|\ \ \ | |/ / |/| | [stable13] Display the proper language strings in setttings
| * | Display the proper language strings in setttingsRoeland Jago Douma2018-03-051-1/+1
|/ / | | | | | | | | | | Since this was moved to lib, we have to the lib language files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8610 from ↵Roeland Jago Douma2018-03-052-55/+426
|\ \ | | | | | | | | | | | | nextcloud/stable13-8588-fix-breadcrumbs-width-calculation [stable13] Fix breadcrumbs width calculation
| * | Update comments in testsDaniel Calviño Sánchez2018-03-011-3/+4
| | | | | | | | | | | | | | | | | | | | | Menu and home are not always visible; home is always visible, but menu is shown only when needed. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Improve documentation of "getTotalWidth"Daniel Calviño Sánchez2018-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "getTotalWidth" is not more accurate; it is simply not clamped. Moreover, "width/outerWidth" could be used in tests too, and also even if "getTotalWidth" could be used in tests while others not that would not be something to be stated in the API documentation, but in a comment. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Do not show the crumbs again after hiding themDaniel Calviño Sánchez2018-03-011-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After the changes in the previous commit "_showCrumb" no longer shows the menu, only the same crumb that was hidden by the last call to "_hideCrumb". Therefore, if the crumb was hidden because it did not fit there is no need to try to show it again, as it will still not fit. Moreover, the calculated width for a hidden element is not always accurate; in some cases the calculated width is lower than the actual width (it happens, for example, when using a background image like the "Share" icon), which causea the crumb to be shown even if there is not enough room, which in the end causes the siblings to overflow the contents. No unit tests for this one, though; you will have to trust me on this, sorry ;-) Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix menu visibilityDaniel Calviño Sánchez2018-03-012-10/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crumb for the menu was shown like any other crumb when calling "_showCrumb", but it was also shown when other crumbs were hidden without taking into account the available width. This caused several related problems, like the breadcrumbs taking too much space when the menu was sometimes shown after the rest of the crumbs were adjusted to the available width, or the menu being shown instead of the last crumb even if there was room for it when the available width was increased. Now the menu is always hidden before starting the resizing of the crumbs to ensure that whether it was previously shown or not does not affect the result. In a similar way, the menu will no longer be shown by "_showCrumb", as it is not a regular crumb that has to be shown simply if there is enough room. The menu is now shown as soon as any other crumb is hidden; this ensures that the menu width will be taken into account in further width checks. As when _updateMenu" is called it no longer needs to take care of showing the menu this fixes the issue revealed when fixing the test setup in the previous commit. Finally, this implicitly fixes the failure in the breadcrumbs tests when run on Firefox, as it was caused by the menu interfering in the calculations of the other crumbs when increasing the width. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Fix setup to test the breadcrumbs menuDaniel Calviño Sánchez2018-03-011-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "Shows only items not in the breadcrumb" test was failing when run on Firefox, but not on PhantomJS. This was caused by the differences in the starting width between both browsers and an incorrect setup of the test (the width set for the crumbs was overriden when the breadcrumbs were rendered again, and the breadcrumb was resized to 300 from an indeterminate initial width). Now the crumbs are rendered and then its width, padding and margin are set to a known value. Then it is resized to 1000px, which ensures that there will be enough room for all the crumbs and thus the menu will be hidden, and finally it is resized to 300, which causes the middle crumb to be hidden and the menu to be shown. Note, however, that the test now always fails, no matter if it is run on PhantomJS or on Firefox; if the menu crumb is hidden when "_updateMenu" is called it will show it, but it will also wrongly try to add the menu itself to the menu. As the "crumb-id" of the menu crumb is "-1" this causes the last regular crumb to be added to the menu. This will be fixed with other related issues in the next commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Take padding and margins of crumbs into accountDaniel Calviño Sánchez2018-03-012-2/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | When calculating the total width of the crumbs only its padding was taken into account; now the margin is too. In a similar way, before showing a crumb only its width was taken into account; now its padding and margin are taken into account too. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Use hard-coded values for paddings and marginsDaniel Calviño Sánchez2018-03-011-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the resize tests do not depend on the values set in the CSS files. Note that this change causes a test to fail with Firefox, but not with PhantomJS. This is due to a difference in the starting width used by Firefox and by PhantomJS, and it will be fixed in a following commit. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 09:49:55 +0000