summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add resource and room interfacesGeorg Ehrke2018-06-254-0/+250
| | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* [tx-robot] updated from transifexNextcloud bot2018-06-2538-2/+132
|
* [tx-robot] updated from transifexNextcloud bot2018-06-2438-22/+106
|
* [tx-robot] updated from transifexNextcloud bot2018-06-23190-176/+210
|
* Merge pull request #9967 from ↵Roeland Jago Douma2018-06-222-31/+22
|\ | | | | | | | | nextcloud/replace-wd-host-directly-in-behat-yml-instead-of-through-behat-params Replace "wd_host" directly in "behat.yml" instead of through "BEHAT_PARAMS"
| * Fix documentationDaniel Calviño Sánchez2018-06-221-2/+2
| | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * Set "wd_host" directly in "behat.yml" instead of through "BEHAT_PARAMS"Daniel Calviño Sánchez2018-06-222-29/+20
|/ | | | | | | | | | | | | | | | | | | | | | | | | | The "wd_host" parameter of Selenium2 sessions specify the URL used by the Selenium driver to connect with the Selenium server. Thus, when the Selenium server is at a different host or port than the default one (for example, when run on Drone) the "wd_host" parameter must be set for each of the Selenium2 sessions defined in "behat.yml". The "BEHAT_PARAMS" environment variable, which extends the "behat.yml" configuration file, was used for that. However, this required adding to the "BEHAT_PARAMS" in "run-local.sh" each new session added to "behat.yml", including those added in the acceptance tests of apps. To address that limitation, this commit introduces a simulated variable, "selenium.server"; just before the acceptance tests are run the "selenium.server" variable in the "wd_host" parameter is replaced in the "behat.yml" file used by the acceptance tests. Note that the file that is modified is the one inside the Docker container used to run the acceptance tests, so the original file is not touched. Note that a simulated variable is needed because Behat does not support overridding nor setting configuration parameters with environment variables. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* Merge pull request #9955 from nextcloud/bug/noid/onedrive_propfindRoeland Jago Douma2018-06-221-1/+1
|\ | | | | Request a valid property for DAV opendir
| * Request a valid property for DAV opendirRoeland Jago Douma2018-06-211-1/+1
| | | | | | | | | | | | | | | | Apperently Sabre and Onedrive are not friends when requesting a single 404 property. I need to dig deeper on why this is. Anyways requesting a valid property makes it work like a charm. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9965 from ↵Morris Jobke2018-06-221-1/+1
|\ \ | | | | | | | | | | | | nextcloud/bugfix/8402/do-not-log-if-user-was-deleted-already Use info log level to inform about a deleted user and thus the verification is not needed anymore
| * | Use info log level to inform about a deleted user and thus the verification ↵Morris Jobke2018-06-221-1/+1
| | | | | | | | | | | | | | | | | | is not needed anymore Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #9964 from ↵Morris Jobke2018-06-222-2/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/typo-tripl-dot-instead-of-ellipsis Use ellipsis instead of triple dot
| * | | Use ellipsis instead of triple dotJoas Schilling2018-06-222-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #9962 from nextcloud/polish-user-listJulius Härtl2018-06-228-3/+34
|\ \ \ \ | | | | | | | | | | Added icons to users list and improved design
| * | | | removed debugJohn Molakvoæ (skjnldsv)2018-06-223-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Added icons to users list and improved designJohn Molakvoæ (skjnldsv)2018-06-228-3/+36
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | [tx-robot] updated from transifexNextcloud bot2018-06-22244-554/+614
| | | |
* | | | Merge pull request #9921 from nextcloud/resetpassword-login-prefillRoeland Jago Douma2018-06-213-11/+8
|\ \ \ \ | | | | | | | | | | prefill userid for login after password reset
| * | | | prefill userid for login after password resetRobin Appelman2018-06-213-11/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #9954 from nextcloud/search-form-preventdefaultsMorris Jobke2018-06-211-3/+7
|\ \ \ \ \ | |_|_|/ / |/| | | | Prevent search form submit
| * | | | Prevent search form submitJohn Molakvoæ (skjnldsv)2018-06-211-3/+7
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #9578 from nextcloud/smb-3.0.0Morris Jobke2018-06-2134-438/+844
|\ \ \ \ | | | | | | | | | | update icewind/smb to 3.0.0
| * | | | use DAV instead of SMB for deletion testsRobin Appelman2018-06-211-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SMB storages can't be constructed on drone because of missing dependencies Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | update icewind/smb to 3.0.0Robin Appelman2018-06-2134-433/+840
| | |/ / | |/| | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Merge pull request #9868 from nextcloud/user-backend-tableRoeland Jago Douma2018-06-211-9/+13
|\ \ \ \ | | | | | | | | | | make table name configurable for db user backend
| * | | | make table name configurable for db user backendRobin Appelman2018-06-191-9/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #9925 from nextcloud/select-only-visible-filesMorris Jobke2018-06-211-5/+33
|\ \ \ \ \ | |_|_|/ / |/| | | | Select only searched files
| * | | | Remove debugJohn Molakvoæ (skjnldsv)2018-06-211-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Fix folder selectionJohn Molakvoæ (skjnldsv)2018-06-201-2/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Properly parse deselection and improved detectionJohn Molakvoæ (skjnldsv)2018-06-201-9/+28
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | IE11 compatibilityJohn Molakvoæ (skjnldsv)2018-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Select only searched filesJohn Molakvoæ (skjnldsv)2018-06-201-4/+13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #9951 from nextcloud/navigation-accessibilityJohn Molakvoæ2018-06-211-11/+30
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix navigation keyboard accessibility
| * | | | Fix navigation keyboard accessibilityJan-Christoph Borchardt2018-06-211-11/+30
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #9946 from ↵John Molakvoæ2018-06-212-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/files-external-settings-layout Fix files_external settings layout
| * | | | Fix files_external setings layoutJulius Härtl2018-06-212-7/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #9941 from nextcloud/browserstackMorris Jobke2018-06-211-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | Add browserstack logo
| * | | | Add browserstack to tools we useRoeland Jago Douma2018-06-201-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #9518 from ↵Roeland Jago Douma2018-06-2123-478/+1133
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/5986/public_share_controller_middleware Public share middleware & controller
| * | | | Fix index.php linksRoeland Jago Douma2018-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix acceptance testRoeland Jago Douma2018-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix direct access to authen pageRoeland Jago Douma2018-06-202-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update token on regeneration for public loginRoeland Jago Douma2018-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add AuthPublicShareControllerTestRoeland Jago Douma2018-06-202-1/+157
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add PublicShareControllerTestsRoeland Jago Douma2018-06-202-1/+103
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add PublicShareMiddlewareTestRoeland Jago Douma2018-06-202-1/+288
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update SharingCheckMiddlewareTestRoeland Jago Douma2018-06-201-89/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * They are handled now by the overal sharing public page middleware Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix ShareControllerTestRoeland Jago Douma2018-06-202-242/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed tests that are now handled by the middleware * Updated tests Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix PublicPreviewControllerTestsRoeland Jago Douma2018-06-201-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Don't allow public share pages if link sharing is disabledRoeland Jago Douma2018-06-202-26/+27
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>