summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* check user detailsArthur Schiwon2018-08-092-2/+29
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* behat integration tests for LDAP, basic setupArthur Schiwon2018-08-094-1/+58
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #10614 from nextcloud/bugfix/noid/fix_including_invalid_fileRoeland Jago Douma2018-08-093-3/+3
|\ | | | | Do not use file as template parameter
| * Do not use file as template parameterRoeland Jago Douma2018-08-093-3/+3
| | | | | | | | | | | | | | | | Using file will overwrite the $file parameter in the template base. Leading to trying to include a file that is the exception message. Which will of course fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10626 from nextcloud/bugfix/noid/quickaccess-spacesRoeland Jago Douma2018-08-091-2/+2
|\ \ | | | | | | Fix quickaccess active indicator for folders with spaces
| * | Fix quickaccess active indicator for folders with spacesJulius Härtl2018-08-091-2/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #10598 from schoonc/patch-1Roeland Jago Douma2018-08-091-2/+0
|\ \ \ | |_|/ |/| | Removed unused variable isFile
| * | Removed unused variable isFileschoonc2018-08-091-2/+0
| |/
* | Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-keyRoeland Jago Douma2018-08-092-6/+38
|\ \ | | | | | | Fix duplicate key violation in 2FA provider registry DAO
| * | Fix double-inserts of the same provider stateChristoph Wurst2018-08-092-8/+21
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Add integration/unit test for the double-insert of same valuesChristoph Wurst2018-08-091-0/+19
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirectRoeland Jago Douma2018-08-094-6/+36
|\ \ | | | | | | Fix login redirection if only one 2FA provider is active
| * | Rename providerset method to get primary providersChristoph Wurst2018-08-083-3/+3
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix login redirection if only one 2FA provider is activeChristoph Wurst2018-08-084-6/+36
| | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/10500. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10604 from nextcloud/release/14/beta3v14.0.0beta3Roeland Jago Douma2018-08-091-2/+2
|\ \ \ | | | | | | | | Nextcloud 14.0.0 beta3
| * | | Nextcloud 14.0.0 beta3Roeland Jago Douma2018-08-091-2/+2
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #10255 from nextcloud/add-support-for-room-sharesBjörn Schießle2018-08-0923-24/+828
|\ \ \ | | | | | | | | Add support for room shares
| * | | Add support for tokens in room sharesDaniel Calviño Sánchez2018-08-082-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tokens will be used to give access to a share to guests in public rooms. Although the token itself is created in the provider of room shares and no changes are needed for that, due to the code structure it is necessary to explicitly call the provider from the manager when getting a room share by token. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Suppress Phan warnings about calling undeclared class methodsDaniel Calviño Sánchez2018-08-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DeletedShareAPIController and ShareAPIController helpers for room shares are defined in Talk, so the classes do not exist when Talk is not installed. Due to this when the object returned by "getRoomShareHelper" is used Phan complains that the class is not declared. This is not a problem, though, because when the class is not available "getRoomShareHelper" throws an exception, which is then caught where that method was called. Therefore now those warnings from Phan are suppressed (it would be better to use "@phan-suppress-next-line" instead, but it is not yet available in our Phan version). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add custom handling for room shares to the resharer informationDaniel Calviño Sánchez2018-08-081-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Like done with group shares, received room shares are described as such in the UI. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add custom handling for room shares to the list of shareesDaniel Calviño Sánchez2018-08-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like done for other types of shares, room shares are now explicitly described as such in the UI. The avatar used is the image provided in the "shareWithAvatar" property of the share. If none is given then the avatar is the first letter of the display name of the room share with a coloured background seeded from the room token. If the display name of the room is empty then no letter is shown in the avatar; no special handling is done in that case. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Log sharing and unsharing with a room in the auditing appDaniel Calviño Sánchez2018-08-081-0/+25
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Transfer room shares too with the "files:transfer-ownership" commandDaniel Calviño Sánchez2018-08-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add room shares to DAV and recent files "share-types" propertyDaniel Calviño Sánchez2018-08-085-1/+26
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add support for room shares to the share owner updaterDaniel Calviño Sánchez2018-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A user can move her own shares into a received share. When that happens she is effectively handing over the ownership of the file, so the share needs to be updated to reflect the new owner. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add room shares to the MountProvider for sharesDaniel Calviño Sánchez2018-08-082-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MountProvider for shares creates mount points for the files shared with the user, which makes possible to use the received shared files and folders as regular files and folders. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add integration test for creating room shares when Talk is not enabledDaniel Calviño Sánchez2018-08-082-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test just ensures that the controller will gracefully reject the creation instead of failing miserably; the integration tests when Talk is enabled are in the Talk repository. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add support for room shares to DeletedShareAPIControllerDaniel Calviño Sánchez2018-08-081-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the DeletedShareAPIController requires explicit handling of each type of share (for example, to format a share for a DataResponse). Room shares are implemented in an external app (Nextcloud Talk), so in order to keep the controller as isolated as possible from room share specifics all that explicit handling is done in a helper class provided by the Talk app. In other cases it is just enough to call the share manager specifying a room share type; note that the share manager is guarded against share types for which there is no provider, so it is not necessary to explicitly check that before passing room shares to the share manager. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add support for room shares to ShareAPIControllerDaniel Calviño Sánchez2018-08-083-15/+547
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, the ShareAPIController requires explicit handling of each type of share (for example, to format a share for a DataResponse). Room shares are implemented in an external app (Nextcloud Talk), so in order to keep the controller as isolated as possible from room share specifics all that explicit handling is done in a helper class provided by the Talk app. In other cases it is just enough to call the share manager specifying a room share type; note that the share manager is guarded against share types for which there is no provider, so it is not necessary to explicitly check that before passing room shares to the share manager. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add support for room shares to the share managerDaniel Calviño Sánchez2018-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room shares are implemented in an external app (Nextcloud Talk), so in order to keep the share manager as isolated as possible from room share specifics all the validity checks are done in the provider of room shares. However, due to the code structure it is necessary to explicitly check for room shares in "generalCreateChecks" to prevent an exception from being thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add provider for room sharesDaniel Calviño Sánchez2018-08-081-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RoomShareProvider is provided by the Talk app, so it is necessary to check whether the app is available or not, and also whether the class itself exists or not (just in case an older version of the app that did not have support yet for room shares is being used). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add comment with IDs of internal share typesDaniel Calviño Sánchez2018-08-081-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add type for room sharesDaniel Calviño Sánchez2018-08-082-0/+2
| |/ / | | | | | | | | | | | | | | | This type represents shares with a Nextcloud Talk conversation. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #10537 from MartB/mselect_fixRoeland Jago Douma2018-08-092-1/+19
|\ \ \ | | | | | | | | Fix multiSelectMenu for public shares #10536
| * | | Fix multiSelectMenu for public shares #10536MartB2018-08-062-1/+19
| | | | | | | | | | | | | | | | Signed-off-by: Martin Böh (MartB) <mart.b@outlook.de>
* | | | Merge pull request #8690 from ↵Roeland Jago Douma2018-08-091-9/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/8565/make-thunderbird-and-outlook-addons-identifyable [Part2] Make thunderbird and outlook addons identifyable
| * | | | Add an option for mail addonsJoas Schilling2018-04-191-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | Fix code errorsJoas Schilling2018-04-191-8/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10597 from nextcloud/fix/10583/guest-icon-pathsRoeland Jago Douma2018-08-093-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Restores the guest icons
| * | | | | Restores the guest iconsMichael Weimann2018-08-083-0/+3
| | |_|_|/ | |/| | |
* | | | | Merge pull request #10599 from nextcloud/fix/app-code-checker-ignore-build-dirRoeland Jago Douma2018-08-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix app code checker to ignore `build` directory
| * | | | | Fix app code checker to ignore `build` directoryChristoph Wurst2018-08-091-1/+1
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #10600 from nextcloud/fix/info-xsd-out-of-syncJulius Härtl2018-08-091-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix info.xsd to sync with the appstore one
| * | | | Fix info.xsd to sync with the appstore oneChristoph Wurst2018-08-091-0/+1
|/ / / / | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #10548 from nextcloud/fix/10430/update_icewind_streamsRoeland Jago Douma2018-08-089-39/+136
|\ \ \ \ | | | | | | | | | | Update icewind/streams
| * | | | Update icewind/streamsRoeland Jago Douma2018-08-069-39/+136
| | |/ / | |/| | | | | | | | | | | | | | | | | | Fixes #10430 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #10397 from nextcloud/encryption-s3-fixBjörn Schießle2018-08-083-3/+28
|\ \ \ \ | |_|_|/ |/| | | make file cache updates more robust
| * | | make file cache updates more robustBjoern Schiessle2018-07-313-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | only update the encrypted version after the write operation is finished and the stream is closed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | Merge pull request #10553 from ↵Roeland Jago Douma2018-08-082-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/10518/disable-oracle-enforcement-for-now Disable Oracle enforcement for now until the following issues are sol…
| * | | | Fix testsRoeland Jago Douma2018-08-081-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 10:22:49 +0000