Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | reset encryptionVersion to '1' if a file was stream copied, because this ↵ | Bjoern Schiessle | 2018-04-03 | 1 | -7/+8 |
| | | | | | | means that we basically write the file from scratch Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org> | ||||
* | Merge pull request #9015 from nextcloud/backport-apps-versions | Morris Jobke | 2018-04-03 | 1 | -6/+22 |
|\ | | | | | [stable13] Use app version to generate scss filename | ||||
| * | Use app version to generate scss filename | John Molakvoæ (skjnldsv) | 2018-03-28 | 1 | -6/+22 |
| | | | | | | | | | | | | Fixed scsscacher tests Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-03 | 2 | -0/+2 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-04-02 | 2 | -2/+6 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-31 | 2 | -2/+8 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-22 | 2 | -2/+70 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-21 | 2 | -2/+2 |
| | |||||
* | the FN is optional, carrying the displayname if present | Arthur Schiwon | 2018-03-20 | 1 | -5/+11 |
| | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de> | ||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-17 | 4 | -2/+16 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-13 | 2 | -0/+2 |
| | |||||
* | Merge pull request #8745 from nextcloud/stable13-8716 | Morris Jobke | 2018-03-09 | 4 | -18/+22 |
|\ | | | | | [13] Remove base url from global cache prefix | ||||
| * | Actually clear cache values for all base urls | Julius Härtl | 2018-03-09 | 3 | -10/+20 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Use JSCombiner from server container when searching for JS files | Julius Härtl | 2018-03-09 | 1 | -7/+1 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | Move base url from global cache prefix to frontend related ones | Julius Härtl | 2018-03-09 | 1 | -3/+3 |
| | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | Merge pull request #8749 from ↵ | Morris Jobke | 2018-03-09 | 1 | -5/+14 |
|\ \ | | | | | | | | | | | | | nextcloud/backport/8596/sharee-email-matches-not-limited [stable13] Sharee email matches not limited | ||||
| * | | Fix calculation if there are more results | Joas Schilling | 2018-03-09 | 1 | -1/+5 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Add the users result only when non empty so tests stay the same | Joas Schilling | 2018-03-09 | 1 | -1/+3 |
| | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | | Also array_slice wide email matches of local users | Joas Schilling | 2018-03-09 | 1 | -4/+7 |
| |/ | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #8746 from nextcloud/8705_13 | Julius Härtl | 2018-03-09 | 1 | -1/+8 |
|\ \ | | | | | | | [stable13] Check if the cached js file exists | ||||
| * | | Check if the cached js file exists | Roeland Jago Douma | 2018-03-09 | 1 | -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-13 | Morris Jobke | 2018-03-09 | 1 | -0/+4 |
|\ \ | |/ |/| | [13] disable part files for object stores | ||||
| * | disable part files for object stores | Robin Appelman | 2018-03-08 | 1 | -0/+4 |
| | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-09 | 4 | -0/+16 |
|/ | |||||
* | Fix undefined index problem | michaelletzgus | 2018-03-06 | 1 | -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 Douma | 2018-03-06 | 1 | -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 compatibility | Joas Schilling | 2018-03-06 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
| * | Filter out the current user when searching for emails too | Joas Schilling | 2018-03-06 | 1 | -2/+9 |
| | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* | | Merge pull request #8688 from nextcloud/13-8557 | Roeland Jago Douma | 2018-03-06 | 1 | -1/+5 |
|\ \ | | | | | | | [stable13] Fix check if theming defaults instance is available | ||||
| * | | Fix check if theming defaults instance is available | Morris Jobke | 2018-03-06 | 1 | -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_13 | Morris Jobke | 2018-03-06 | 1 | -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 storage | Joas Schilling | 2018-03-06 | 1 | -0/+1 |
| |/ | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com> | ||||
* / | Don't use double quotes in MySQL queries | Robin Müller | 2018-03-06 | 1 | -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_13 | Roeland Jago Douma | 2018-03-06 | 1 | -1/+3 |
|\ | | | | | [stable13] Use proper lanugage in langauge code | ||||
| * | Use proper lanugage in langauge code | Roeland Jago Douma | 2018-03-05 | 1 | -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 transifex | Nextcloud bot | 2018-03-06 | 2 | -0/+2 |
| | | |||||
* | | Display the proper language strings in setttings | Roeland Jago Douma | 2018-03-05 | 1 | -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_13 | Joas Schilling | 2018-03-05 | 2 | -1/+38 |
|\ | | | | | [stable13] AppData hardening | ||||
| * | Hardening of SimpleFile getContent | Roeland Jago Douma | 2018-03-02 | 2 | -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-8372 | Joas Schilling | 2018-03-05 | 1 | -11/+13 |
|\ \ | | | | | | | [13] Properly encapsulate require_once for app.php | ||||
| * | | Add throws annotation | Julius Härtl | 2018-03-02 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
| * | | Properly encapsulate require_once for app.php | Julius Härtl | 2018-03-02 | 1 | -11/+12 |
| |/ | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-05 | 2 | -0/+10 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-04 | 6 | -16/+32 |
|/ | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-02 | 10 | -0/+54 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2018-03-01 | 14 | -0/+58 |
| | |||||
* | Merge pull request #8099 from nextcloud/7873_13 | Roeland Jago Douma | 2018-02-28 | 1 | -2/+8 |
|\ | | | | | [stable13] Don't perform CSRF check on OCS routes with Bearer auth | ||||
| * | Don't perform CSRF check on OCS routes with Bearer auth | Roeland Jago Douma | 2018-02-08 | 1 | -2/+8 |
| | | | | | | | | | | | | Fixes #5694 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> | ||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-02-28 | 16 | -2/+42 |
| | | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2018-02-27 | 4 | -2/+16 |
| | |