Commit Graph

42477 Commits

Author SHA1 Message Date
Morris Jobke ba7cc279e6
Fix integer overflow in ChunkingPlugin
Avoids errors when the size exceeds MAX_INT because of the cast to int. Better cast it to float to avoid this.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-03-09 10:27:41 +01:00
Joas Schilling a2f3f0a681
Fix calculation if there are more results
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:42 +01:00
Joas Schilling a31439e89d
Add tests for finding own email and user results pagination
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:16:12 +01:00
Joas Schilling 932fcc9859
Add the users result only when non empty so tests stay the same
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:25 +01:00
Joas Schilling 5b6590f1e9
Also array_slice wide email matches of local users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-09 10:15:04 +01:00
Roeland Jago Douma 85ba5adb33
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:36 +01:00
Roeland Jago Douma 2d7d8ca125
Check if the cached js file exists
Fixes #8705

If the file does not exist (for whatever reason). It is never cached. No
matter what the depscache etc tell you.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-03-09 09:44:32 +01:00
Julius Härtl 88e9542d12
Use cache prefix for theming as well
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:52 +01:00
Julius Härtl d4d3cecbf8
Fix tests to use ICacheFactory
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:50 +01:00
Julius Härtl b14e4ec6a6
Actually clear cache values for all base urls
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:07 +01:00
Julius Härtl a098b57817
Use JSCombiner from server container when searching for JS files
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:07 +01:00
Julius Härtl c4539c34c9
Move base url from global cache prefix to frontend related ones
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-09 09:24:06 +01:00
Roeland Jago Douma d1547ee3b0
Merge pull request #8738 from nextcloud/stable13-8728-better-handling-of-invisible-elements-in-acceptance-tests
[stable13] Better handling of invisible elements in acceptance tests
2018-03-09 08:31:49 +01:00
Daniel Calviño Sánchez fc6c290a4f Add automatic handling of NoSuchElement exceptions
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>
2018-03-09 02:17:04 +01:00
Daniel Calviño Sánchez f0cbeecf21 Add automatic handling of MoveTargetOutOfBounds exceptions
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>
2018-03-09 02:17:04 +01:00
Nextcloud bot b593fd1406
[tx-robot] updated from transifex 2018-03-09 01:12:37 +00:00
Robin Appelman 9342f97a28
emit pre-hooks earlier when not using part files
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:09 +01:00
Robin Appelman a95ccf4248
disable part files for object stores
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-03-08 13:09:02 +01:00
Roeland Jago Douma d7a70aba84
Merge pull request #8686 from nextcloud/backport/8298/fix-activities-for-end2end-encryption
[stable13] Fix activities for end2end encryption
2018-03-06 22:44:54 +01:00
Roeland Jago Douma 41f8f68a5a
Merge pull request #8693 from nextcloud/13-8173
[stable13] Fix undefined index problem
2018-03-06 19:27:30 +01:00
michaelletzgus 7e651ffd54
Fix undefined index problem
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.
2018-03-06 18:37:52 +01:00
Roeland Jago Douma a637e0d686
Merge pull request #8687 from nextcloud/backport/8328/filter-out-the-current-user-by-email-too
[stable13] Filter out the current user when searching for emails too
2018-03-06 17:11:49 +01:00
Roeland Jago Douma 56d5eb17fe
Merge pull request #8688 from nextcloud/13-8557
[stable13] Fix check if theming defaults instance is available
2018-03-06 17:11:37 +01:00
Joas Schilling 173388dcd4
PHP 5.6 compatibility
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 14:05:14 +01:00
Morris Jobke 1bdf4f55cb
Merge pull request #8685 from nextcloud/backport/8664/add-missing-settings-page-title-again
[stable13] Set the correct active navigation entry
2018-03-06 13:57:25 +01:00
Morris Jobke 47fa0988d9
Merge pull request #8683 from nextcloud/8474_13
[stable13] Log exceptions that happen when writing the app store reply to storage
2018-03-06 13:39:49 +01:00
Morris Jobke ed8e4cc785
Merge pull request #8667 from nextcloud/8158_13
[stable13] Use a more widely available method to test s3 settings
2018-03-06 13:38:23 +01:00
Morris Jobke 16fa18ab49
Merge pull request #8678 from nextcloud/7707_13
[stable13] generate different UIDs for Birthday, Anniversary and Death event
2018-03-06 13:37:21 +01:00
Morris Jobke eefbcb32ed
Fix check if theming defaults instance is available
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>
2018-03-06 13:24:18 +01:00
Morris Jobke 5f8c773b27
Merge pull request #8680 from nextcloud/8391_13
[stable13] Don't use double quotes in MySQL queries
2018-03-06 13:18:59 +01:00
Joas Schilling 18968e84fc
Filter out the current user when searching for emails too
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:20:24 +01:00
Joas Schilling d16aa27516
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:12 +01:00
Joas Schilling 8f8d7cf9d3
Catch exception when the parent is deleted as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:16:04 +01:00
Joas Schilling 5d8aaf9696
Do a recursion instead of an endless loop
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:57 +01:00
Joas Schilling 7c15b99a49
Fix problem with deleted files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:51 +01:00
Joas Schilling f1e01dbbbc
Fix path handling for activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:45 +01:00
Joas Schilling 737af44b63
Add special handling for e2e encryption
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:36 +01:00
Joas Schilling 0911f3bde1
Extract duplicated logic into a method
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:15:13 +01:00
Joas Schilling e11dab4047
Set the correct active navigation entry
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 12:05:19 +01:00
Roeland Jago Douma 242f0c0b5a
Merge pull request #8676 from nextcloud/8297_13
[stable13] Fix example regex for user agent matching
2018-03-06 11:54:27 +01:00
Morris Jobke 0667a32c83
Merge pull request #8673 from nextcloud/stable13-8634
[stable13] do not create empty userid when attribute does not have allowed chars
2018-03-06 11:30:48 +01:00
Joas Schilling de1f223961
Log exceptions that happen when writing the app store reply to storage
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:29:05 +01:00
Robin Müller 619ee56835
Don't use double quotes in MySQL queries
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>
2018-03-06 11:25:07 +01:00
Georg Ehrke 6171940717
generate different UIDs for Birthday, Anniversary and Death event
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2018-03-06 11:20:53 +01:00
Joas Schilling 02af9b2f6f
Fix example regex for user agent matching
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-03-06 11:16:41 +01:00
Roeland Jago Douma ff7237a098
Merge pull request #8668 from nextcloud/8217_13
[stable13] Use proper lanugage in langauge code
2018-03-06 09:47:20 +01:00
Roeland Jago Douma f4aae102f7
Merge pull request #8675 from nextcloud/stable13-8601
[13] Remove too restrict check for background image/color
2018-03-06 09:46:52 +01:00
Julius Härtl 80842e1611
Remove to restrict check for background image/color
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-03-06 09:08:49 +01:00
Nextcloud bot d3d0d9e11d
[tx-robot] updated from transifex 2018-03-06 01:12:41 +00:00
blizzz 0045e823fe
Merge pull request #8669 from nextcloud/8218_13
[stable13] Display the proper language strings in setttings
2018-03-05 23:46:26 +01:00