summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Get l10n within NewUserMailHelper to ensure it always uses the new user's ↵zulan2018-10-156-115/+41
| | | | | | | | | language. Some related tests had to be changed because they relied on internals, see also from the PHPUnit documentation: "Exercise caution when using [the at] matcher as it can lead to brittle tests which are too closely tied to specific implementation details." Signed-off-by: Zulan <git@zulan.net>
* Merge pull request #11337 from nextcloud/feature/noid/add-test-for-11134Morris Jobke2018-09-241-0/+27
|\ | | | | Add simple unit test for findLanguageFromLocale
| * Add simple unit test for findLanguageFromLocaleDaniel Kesselberg2018-09-231-0/+27
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #11222 from nextcloud/gs-and-samlblizzz2018-09-241-1/+1
|\ \ | | | | | | make the server ready to use global scale with SAML as auth back-end
| * | add back-end as parameter to the pre-login hookBjoern Schiessle2018-09-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for the Global Scale setup to allow the master node to perform different operations during login, depending on the user management. Because in case of SAML, the authentication at the idp happens at the master node. Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #11342 from ↵Joas Schilling2018-09-242-241/+139
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.1.1 Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotification
| * | | Bump webpack-cli from 3.1.0 to 3.1.1 in /apps/updatenotificationdependabot[bot]2018-09-242-241/+139
|/ / / | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.1.0 to 3.1.1. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/commits/v3.1.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | / [tx-robot] updated from transifexNextcloud bot2018-09-246-112/+112
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-09-2322-42/+298
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-2244-150/+466
| |
* | [tx-robot] updated from transifexNextcloud bot2018-09-2152-80/+186
| |
* | Merge pull request #11228 from nextcloud/fix/11144/empty-favorite-namesJoas Schilling2018-09-202-5/+70
|\ \ | | | | | | Fixes empty favorite names for trailing slashes
| * | Fixes empty favorite names for trailing slashesMichael Weimann2018-09-192-5/+70
| | | | | | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-2018-0/+22
| | |
* | | Merge pull request #11292 from ↵blizzz2018-09-191-2/+0
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/revert/9442/do-not-apcu-cache-the-autoloader Revert "Use APCu caching of composer"
| * | | Revert "Use APCu caching of composer"Joas Schilling2018-09-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 948ab8a4d06b3821ab94c11a3a04c820e60d6c8a. For details why see https://github.com/nextcloud/server/issues/11290
* | | | Merge pull request #11134 from nextcloud/locale-template-fixJoas Schilling2018-09-193-2/+34
|\ \ \ \ | | | | | | | | | | Use user locale as default in the template
| * | | | Fix since tagJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fallback to $lang if no $locale matchJohn Molakvoæ (skjnldsv)2018-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | TypehintJohn Molakvoæ (skjnldsv)2018-09-102-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Since requirementJohn Molakvoæ (skjnldsv)2018-09-101-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix public l10nJohn Molakvoæ (skjnldsv)2018-09-101-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Use user locale as default in the templateJohn Molakvoæ (skjnldsv)2018-09-103-2/+33
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #10847 from nextcloud/fix-icons-cacherJoas Schilling2018-09-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix icons cacher regex for compressed output
| * | | | | Fix icons cacher regex for compressed outputJohn Molakvoæ (skjnldsv)2018-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-194-0/+4
| | | | | |
* | | | | | Merge pull request #11171 from ↵Joas Schilling2018-09-191-10/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/shared-by-info-for-room-shares-without-names Better shared-by info for conversations without names
| * | | | | Better shared-by info for conversations without namesJoas Schilling2018-09-111-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | | Merge pull request #11268 from ↵blizzz2018-09-191-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/include-empty-directories-in-the-default-state-of-acceptance-tests Include empty directories in the default state of acceptance tests
| * | | | | | Include empty directories in the default state of acceptance testsDaniel Calviño Sánchez2018-09-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before each scenario of the acceptance tests is run the Nextcloud server is reset to a default state. To do this the full directory of the Nextcloud server is commited to a local Git repository and then reset to that commit when needed. Unfortunately, Git does not support including empty directories in a commit. Due to this, when the default state was restored, it could happen that the file cache listed an empty directory that did not exist because it was not properly restored (for example, "data/appdata_*/css/icons"), and that in turn could lead to an error when the directory was used. Currently the only way to force Git to include an empty directory is to add a dummy file to the directory (so it will no longer be empty, but that should not be a problem in the affected directories, even if the dummy file is not included in the file cache); although Git FAQ suggests using a ".gitignore" file a ".keep" file was used instead, as it conveys better its purpose. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | Merge pull request #11041 from ↵Joas Schilling2018-09-193-11/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/noid/get_permission_of_storage_for_shares Check the permission of the underlying storage
| * | | | | | | Update test now that we check permissions properlyRoeland Jago Douma2018-09-061-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we actually check thepermissions properly we have to update the tests. * We checked an invalid path * We checked from wrong permissions (files never have CREATE permissions for example) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Properly check share permissionsRoeland Jago Douma2018-09-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isCreatable only works on folders isUpdatable if the file is not there but it is a part file also has to be checked on the folder Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Fix shared cacheRoeland Jago Douma2018-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | Check the permission of the underlying storageRoeland Jago Douma2018-09-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else shares might expose more permissions than the storage actually providers. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-1914-0/+44
| | | | | | | |
* | | | | | | | Merge pull request #11262 from nextcloud/drone-postgres-db-nameblizzz2018-09-181-1/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use a dummy database name for the default postgres database name
| * | | | | | | | use a dummy database name for the default postgres database nameRobin Appelman2018-09-171-1/+3
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason the docker image does not setup the permissions correctly, by using a different name the nextcloud installer will create the database instead with the correct permissions Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #11258 from nextcloud/fix-contacts-menu-on-mentionsblizzz2018-09-182-8/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Fix contacts menu on mentions
| * | | | | | | | Fix position of contacts menu shown on mentionsDaniel Calviño Sánchez2018-09-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no default CSS rules for the contacts menu, as its position depends on the element on which it is shown. Note, however, that if no explicit rules are provided the contacts menu on mentions is affected by the rules for the contacts menu on shares from the sharing tab. The contacts menu is now positioned to show the tip of the arrow horizontally aligned with the center of the avatar, and with the top of the menu slightly below the bottom border of the mention. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | | | | Fix contacts menu not triggered on certain areas of a mentionDaniel Calviño Sánchez2018-09-151-8/+7
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The contacts menu was triggered only when the avatar or the name of the user were clicked. Due to this, clicking on certain (small) areas of a mention (like the right end, or the space between the avatar and the name) did not show the contacts menu. Now the contacts menu is shown when any area of the mention is clicked. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | Merge pull request #11257 from ↵blizzz2018-09-181-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/prevent-comment-being-composed-from-overlapping-the-submit-button Prevent comment being composed from overlapping the submit button
| * | | | | | | | Prevent comment being composed from overlapping the submit buttonDaniel Calviño Sánchez2018-09-061-0/+3
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The submit button is placed in the text area using absolute positioning, so it is not taken into account when calculating the text layout. Due to this it is necessary to add an explicit padding to the right of the text area to prevent the text from overlapping the submit button. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | | | Merge pull request #11245 from ↵blizzz2018-09-181-5/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/8288/userldap-getusername-on-null Check if user is null before getUsername
| * | | | | | | Check if user is null before getUsernameDaniel Kesselberg2018-09-161-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2018-09-184-2/+4
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #11251 from ↵Joas Schilling2018-09-172-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.4.2 Bump vue-loader from 15.4.1 to 15.4.2 in /apps/updatenotification
| * | | | | | | Bump vue-loader from 15.4.1 to 15.4.2 in /apps/updatenotificationdependabot[bot]2018-09-172-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.4.1 to 15.4.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | | | | | | Merge pull request #11252 from ↵Joas Schilling2018-09-172-186/+153
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.19.0 Bump webpack from 4.17.2 to 4.19.0 in /apps/updatenotification
| * | | | | | | | Bump webpack from 4.17.2 to 4.19.0 in /apps/updatenotificationdependabot[bot]2018-09-172-186/+153
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.17.2 to 4.19.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.17.2...v4.19.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-22 02:30:51 +0000