aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-05-0910-4/+16
|
* [tx-robot] updated from transifexNextcloud bot2017-05-08138-170/+314
|
* Merge pull request #4745 from nextcloud/improve-textLukas Reschke2017-05-081-2/+2
|\ | | | | Improve readability of verify text
| * Improve readability of verify textMorris Jobke2017-05-081-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #4692 from nextcloud/unify-sharing-messagesMorris Jobke2017-05-082-44/+16
|\ | | | | don't mention the owner of a file in case of a re-share by mail.
| * don't mention the owner of a file in case of a re-share by mail. The ↵Bjoern Schiessle2017-05-082-44/+16
| | | | | | | | | | | | recipient doesn't care about the owner and probably don't even know it Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | Merge pull request #4718 from ↵Morris Jobke2017-05-083-78/+493
|\ \ | | | | | | | | | | | | nextcloud/handle-stalled-or-invisible-elements-automatically-in-acceptance-tests Handle stale or invisible elements automatically in acceptance tests
| * | Add automatic handling of common command failures of Mink elementsDaniel Calviño Sánchez2017-05-063-2/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commands executed on Mink elements may fail for several reasons. ElementWrapper is introduced to automatically handle some of those situations, like StaleElementReference exceptions and ElementNotVisible exceptions. StaleElementReference exceptions are thrown when the command is executed on an element that is no longer attached to the DOM. When that happens the ElementWrapper finds again the element and executes the command again on the new element. ElementNotVisible exceptions are thrown when the command requires the element to be visible but the element is not. When that happens the ElementWrapper waits for the element to be visible before executing the command again. These changes are totally compatible with the current acceptance tests. They just make the tests more robust, but they do not change their behaviour. In fact, this should minimize some of the sporadic failures in the acceptance tests caused by their concurrent nature with respect to the web browser executing the commands. However, the ElementWrapper is not a silver bullet; it handles the most common situations, but it does not handle every possible scenario. For example, the acceptance tests would still fail sporadically if an element can become staled several times in a row (uncommon) or if it does not become visible before the timeout expires (which could still happen in a loaded system even if the components under test work right, but obviously it is not possible to wait indefinitely for them). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Extract element finding to a command objectDaniel Calviño Sánchez2017-05-062-78/+178
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Make internal find methods staticDaniel Calviño Sánchez2017-05-061-8/+10
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | Add missing type hintsDaniel Calviño Sánchez2017-05-061-3/+3
| | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Merge pull request #4621 from nextcloud/fix_readonly_shared_calendar_proppatchMorris Jobke2017-05-083-2/+11
|\ \ \ | | | | | | | | fix PROPPATCH requests to read-only shared calendars
| * | | fix PROPPATCH requests to read-only shared calendarsGeorg Ehrke2017-05-083-2/+11
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #4675 from nextcloud/fix_4651Morris Jobke2017-05-089-246/+478
|\ \ \ \ | | | | | | | | | | Create a photo cache to speedup the contactsmenu
| * | | | Fix initRoeland Jago Douma2017-05-082-2/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Fix ImageExportPluginTestRoeland Jago Douma2017-05-082-129/+115
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | No more XSSRoeland Jago Douma2017-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Clear cache on vcard change/deleteRoeland Jago Douma2017-05-083-8/+31
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Request proper size for contacts menuRoeland Jago Douma2017-05-083-73/+9
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Cache the carddav photo endpointRoeland Jago Douma2017-05-084-19/+281
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Always dispatch Carddav eventsRoeland Jago Douma2017-05-083-33/+58
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #4733 from nextcloud/fix-browser-dav-rootRobin Appelman2017-05-081-4/+3
|\ \ \ \ \ | | | | | | | | | | | | fix error when browsing the dav root
| * | | | | fix error when browsing the dav rootRobin Appelman2017-05-081-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | Merge pull request #4695 from nextcloud/reset-verify-stateLukas Reschke2017-05-081-0/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | reset verification state if max tries are reached
| * | | | | | reset verification state if max tries are reachedBjoern Schiessle2017-05-041-0/+15
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | | Merge pull request #4741 from nextcloud/bump-to-beta2Lukas Reschke2017-05-081-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Increase version to beta2
| * | | | | | Increase version to beta2Lukas Reschke2017-05-081-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4727 from stffabi/IncreaseDeviceEntropyLukas Reschke2017-05-084-8/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | Increase device password entropy.
| * | | | | | Increase device password entropy. Use lower- and upper-case characters and ↵Fabrizio Steiner2017-05-084-8/+15
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | digits, but exclude ambiguous characters. The number of digits has also been increased to 25. Signed-off-by: Fabrizio Steiner <fabrizio.steiner@gmail.com>
* | | | | | Merge pull request #4734 from nextcloud/allow-specifying-logo-mimetypeLukas Reschke2017-05-085-15/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add function to request SVG or regular fallback image
| * | | | | | Add function to request SVG or regular fallback imageLukas Reschke2017-05-085-15/+33
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4647 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4740 from nextcloud/external-moved-to-appstoreLukas Reschke2017-05-081-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | External has been moved to appstore
| * | | | | | External has been moved to appstoreLukas Reschke2017-05-081-1/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed with Joas. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | | Merge pull request #4738 from nextcloud/check-if-nextcloud-is-installedLukas Reschke2017-05-081-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Check if Nextcloud is installed
| * | | | | Check if Nextcloud is installedLukas Reschke2017-05-081-1/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/4735 Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | | | Merge pull request #4716 from nextcloud/user-settings-dropdownRobin Appelman2017-05-082-63/+283
|\ \ \ \ \ | | | | | | | | | | | | polish user actions dropdown
| * | | | | polish user actions dropdownRobin Appelman2017-05-062-63/+283
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #4556 from nextcloud/downstream-ldap-78Lukas Reschke2017-05-081-30/+10
|\ \ \ \ \ | | | | | | | | | | | | LDAP: only use proxy classes as backend
| * | | | | Use proxy classesJuan Pablo Villafáñez2017-04-271-30/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #4514 from nextcloud/automatic-mysql-4byte-detectionLukas Reschke2017-05-086-14/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | Automatic mysql 4byte detection
| * | | | | | Fix docsJoas Schilling2017-05-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Fix autoloadingJoas Schilling2017-04-282-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | config.sample.php doc update for MySQL 4-Byte unicodeMartin2017-04-281-5/+8
| | | | | | |
| * | | | | | MySQL 4 byte is now detected during setup in any case.Thomas Müller2017-04-282-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | config.sample.php was updated to explicitly state that there detection in place to set mysql.utf8mb4
| * | | | | | Add console command to migrate the charsetThomas Müller2017-04-283-29/+62
| | | | | | |
| * | | | | | Fix mysql settingsThomas Müller2017-04-281-5/+3
| | | | | | |
| * | | | | | During setup of a mysql database we try to detect if charset 'utf8mb4' can ↵Thomas Müller2017-04-281-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | be used
* | | | | | | Merge pull request #4617 from nextcloud/theming-plain-backgroundLukas Reschke2017-05-088-20/+157
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Theming app: Add plain background color option
| * | | | | | | Adjust login button color and remove borderJulius Härtl2017-05-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | | Fix tests for theming backgroundColorJulius Härtl2017-05-083-6/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>