aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* update capabilitiesBjoern Schiessle2018-07-021-1/+5
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* check API VersionBjoern Schiessle2018-07-021-1/+5
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* send accept share notification (WIP)Bjoern Schiessle2018-07-0212-38/+186
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* use new API to send a federated share if possibleBjoern Schiessle2018-07-0211-35/+185
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* check if cloud federation api is readyBjoern Schiessle2018-07-023-2/+25
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* add cloud federation api appBjoern Schiessle2018-07-029-0/+1152
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* implement receiving of federated sharesBjoern Schiessle2018-07-027-188/+349
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* start implementing federated sharing 2.0Bjoern Schiessle2018-07-0225-3/+1461
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #10071 from nextcloud/apps-fix-message-translationRoeland Jago Douma2018-07-024-5/+10
|\ | | | | Fix hardcoded messages in app details view
| * Fix hardcoded message in app details viewKevin Ndung'u2018-07-024-5/+10
|/
* Merge pull request #10062 from ↵dependabot[bot]2018-06-302-26/+21
|\ | | | | | | nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.14.0
| * Bump webpack from 4.12.2 to 4.14.0 in /apps/oauth2dependabot[bot]2018-06-302-26/+21
|/ | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #10064 from ↵dependabot[bot]2018-06-302-35/+25
|\ | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.14.0
| * Bump webpack from 4.12.2 to 4.14.0 in /settingsdependabot[bot]2018-06-292-35/+25
| | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #10063 from ↵dependabot[bot]2018-06-302-35/+25
|\ \ | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.14.0
| * | Bump webpack from 4.12.2 to 4.14.0 in /apps/updatenotificationdependabot[bot]2018-06-292-35/+25
| |/ | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #10048 from nextcloud/feature/9760/systemd-loggerblizzz2018-06-3013-20/+145
|\ \ | |/ |/| Systemd Logger
| * use older image for disabled redis testsArthur Schiwon2018-06-301-1/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Try to not run into the white page of death and still log something in the ↵Morris Jobke2018-06-292-5/+21
| | | | | | | | | | | | web server error log Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * whitelist audit.logArthur Schiwon2018-06-291-0/+1
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Applied patch for CI to work per ↵Johannes Ernst2018-06-291-5/+5
| | | | | | | | | | | | https://github.com/nextcloud/server/pull/9760#issuecomment-396888591 Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
| * Added Systemd.log documentation to config.sample.phpJohannes Ernst2018-06-293-11/+29
| | | | | | | | | | | | | | | | Changed name of default system (not systemd) logger from ownCloud to Nextcloud, to be consistent Fixed license per https://github.com/nextcloud/server/pull/9760#discussion_r195026784 Pulled upstream updates Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
| * Added a logger for systemd/journaldJohannes Ernst2018-06-297-3/+93
| | | | | | | | | | | | Added a unit test Signed-off-by: Johannes Ernst <jernst@indiecomputing.com>
* | Merge pull request #10061 from ↵Roeland Jago Douma2018-06-292-26/+21
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.14.0 Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibility
| * | Bump webpack from 4.12.2 to 4.14.0 in /apps/accessibilitydependabot[bot]2018-06-292-26/+21
| | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.2 to 4.14.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.2...v4.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #10041 from liamdennehy/10001/trashbin-defaultsRoeland Jago Douma2018-06-292-10/+57
|\ \ \ | |/ / |/| | Safe default behaviour when no users are specified on trashbin:cleanup
| * | Fix and extend testsRoeland Jago Douma2018-06-291-6/+41
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | trashbin:cleanup exceptions for invalid optionsLiam Dennehy2018-06-281-4/+6
| | | | | | | | | | | | | | | | | | | | | * throw on no parameters provided * throw on --all-users and userid provided Signed-off-by: Liam Dennehy <liam@wiemax.net>
| * | Default behaviour when no users are specified on trashbin:cleanupLiam Dennehy2018-06-281-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | * Add option --all-users to explicitly clean all trashbins * Reject no users on commandline and no --all-users * Warn when --all-users and userids are specified Signed-off-by: Liam Dennehy <liam@wiemax.net>
* | | Merge pull request #10054 from nextcloud/controls-bgMorris Jobke2018-06-291-1/+1
|\ \ \ | | | | | | | | Fix controls background
| * | | Fix controls backgroundJohn Molakvoæ (skjnldsv)2018-06-291-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #10038 from nextcloud/files-scan-home-onlyMorris Jobke2018-06-292-6/+21
|\ \ \ \ | | | | | | | | | | Add option to only scan the home storage
| * | | | Add option to only scan the home storageRobin Appelman2018-06-282-6/+21
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #10053 from nextcloud/feature/7378/password-security-moveMorris Jobke2018-06-299-131/+170
|\ \ \ \ | | | | | | | | | | Move password change to security settings
| * | | | Remove unneeded param from personal settingsJulius Härtl2018-06-291-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix testsJulius Härtl2018-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move user password form to security settingsJulius Härtl2018-06-297-129/+169
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #10028 from nextcloud/feature/noid/settings-papercutsMorris Jobke2018-06-2913-41/+80
|\ \ \ \ \ | |/ / / / |/| | | | Fix some minor settings UI issues
| * | | | Do not hide reset buttonJulius Härtl2018-06-292-3/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix grid layout after rebaseJulius Härtl2018-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Bump autoloader and fix testsJulius Härtl2018-06-293-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Adjust collaborative tags and automated tagging settingsJulius Härtl2018-06-295-26/+65
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Fix padding in devices/sessions listJulius Härtl2018-06-291-0/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | Move social buttons to the personal settingsJulius Härtl2018-06-295-12/+11
|/ / / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #10046 from ↵Morris Jobke2018-06-293-7/+80
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/fix-getting-the-information-of-a-group-share-as-a-sharee Fix getting the information of a group share as a sharee
| * | | Extend integration tests to get the info of a group share as a shareeDaniel Calviño Sánchez2018-06-291-0/+73
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Fix getting the information of group share as a shareeDaniel Calviño Sánchez2018-06-292-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the receiver of a group share modifies it (for example, by moving it to a different folder) the original share is not modified, but a "ghost" share that keeps track of the changes made by that specific user is used instead. By default, the method "getShareById" in the share provider returns the share from the point of view of the sharer, but it can be used too to get the share from the point of view of a sharee by providing the "recipient" parameter (and if the sharee is not found then the share is returned from the point of view of the sharer). The "ShareAPIController" always formats the share from the point of view of the current user, but when getting the information of a specific share the "recipient" parameter was not given, so it was always returned from the point of view of the sharer, even if the current user was a sharee. Now the "recipient" parameter is set to the current user, and thus the information of the share is returned from the point of view of the current user, be it the sharer or a sharee. Note that this special behaviour of "getShareById" happens only with group shares; with other types of shares the share is the same for the sharer and the sharee, and thus the parameter is ignored; it was added for them too just for consistency. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | Merge pull request #10045 from nextcloud/groups-creation-fixesMorris Jobke2018-06-295-12/+14
|\ \ \ \ | | | | | | | | | | Fix new group selection
| * | | | Fix new group selectionJohn Molakvoæ (skjnldsv)2018-06-295-12/+14
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #10049 from nextcloud/fix-code-integrity-check-linkMorris Jobke2018-06-291-1/+1
|\ \ \ \ | | | | | | | | | | Fix code integrity check-warning link