aboutsummaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #8749 from ↵Morris Jobke2018-03-091-5/+14
|\ | | | | | | | | nextcloud/backport/8596/sharee-email-matches-not-limited [stable13] Sharee email matches not limited
| * Fix calculation if there are more resultsJoas Schilling2018-03-091-1/+5
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * 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 #8746 from nextcloud/8705_13Julius Härtl2018-03-091-1/+8
|\ \ | | | | | | [stable13] Check if the cached js file exists
| * | Check if the cached js file existsRoeland Jago Douma2018-03-091-1/+8
| |/ | | | | | | | | | | | | | | | | 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>
* | Merge pull request #8725 from nextcloud/objectstore-no-part-files-13Morris Jobke2018-03-091-0/+4
|\ \ | |/ |/| [13] disable part files for object stores
| * disable part files for object storesRobin Appelman2018-03-081-0/+4
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-03-094-0/+16
|/
* 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 #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>
* / 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 #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>
* | [tx-robot] updated from transifexNextcloud bot2018-03-062-0/+2
| |
* | 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 #8636 from nextcloud/8289_13Joas Schilling2018-03-052-1/+38
|\ | | | | [stable13] AppData hardening
| * Hardening of SimpleFile getContentRoeland Jago Douma2018-03-022-1/+38
| | | | | | | | | | | | | | if file_get_contents fails remove the file. And traverse up the tree checking if the other folders are there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #8631 from nextcloud/stable13-8372Joas Schilling2018-03-051-11/+13
|\ \ | | | | | | [13] Properly encapsulate require_once for app.php
| * | Add throws annotationJulius Härtl2018-03-021-0/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Properly encapsulate require_once for app.phpJulius Härtl2018-03-021-11/+12
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-03-052-0/+10
| |
* | [tx-robot] updated from transifexNextcloud bot2018-03-046-16/+32
|/
* [tx-robot] updated from transifexNextcloud bot2018-03-0210-0/+54
|
* [tx-robot] updated from transifexNextcloud bot2018-03-0114-0/+58
|
* Merge pull request #8099 from nextcloud/7873_13Roeland Jago Douma2018-02-281-2/+8
|\ | | | | [stable13] Don't perform CSRF check on OCS routes with Bearer auth
| * Don't perform CSRF check on OCS routes with Bearer authRoeland Jago Douma2018-02-081-2/+8
| | | | | | | | | | | | Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2018-02-2816-2/+42
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-274-2/+16
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-232-8/+8
| |
* | Merge pull request #8470 from nextcloud/13-8468Roeland Jago Douma2018-02-211-1/+1
|\ \ | | | | | | [stable13] Use mb_* string methods to extract first character for generated avatars
| * | Use mb_* string methods to extract first character for generated avatarsMorris Jobke2018-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This fixes #8451 where the first character is a non-ASCII character. The `$string[0]` notation only extracted one byte and thus resulting in an invalid code. The `mb_strtoupper` method also allows to convert characters independently from the current locale on the server. See also http://php.net/manual/en/function.mb-strtoupper.php Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | [tx-robot] updated from transifexNextcloud bot2018-02-212-2/+12
| | |
* | | Better result handling of email searchJoas Schilling2018-02-202-0/+4
|/ / | | | | | | | | | | | | 1. Local users should not be returned when searching for empty string 2. The limit of the response should be respected Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #8440 from nextcloud/8428_13Roeland Jago Douma2018-02-201-1/+1
|\ \ | | | | | | [stable13] Use TTF fonts for avatar generation
| * | Avatar generation use ttf (for ancient compatibility)Roeland Jago Douma2018-02-191-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | [tx-robot] updated from transifexNextcloud bot2018-02-204-6/+74
|/ /
* | [tx-robot] updated from transifexNextcloud bot2018-02-192-2/+4
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-174-2/+180
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-148-8/+170
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-142-2/+30
| |
* | [tx-robot] updated from transifexNextcloud bot2018-02-128-8/+92
| |
* | Load guest css on any guest and error pageJulius Härtl2018-02-091-1/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-02-0972-0/+4856
| |