summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* Fix and tests for MailPluginTobia De Koninck2017-12-161-1/+138
| | | | Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
* Test fixes 2John Molakvoæ (skjnldsv)2017-12-141-3/+3
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Test fixesJohn Molakvoæ (skjnldsv)2017-12-141-2/+2
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Use cached app listMorris Jobke2017-12-141-0/+1
| | | | | | Followup to #7264 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Add testsRoeland Jago Douma2017-12-131-1/+5
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* allow 'Nextcloud' in the user agent string of AndroidBjoern Schiessle2017-12-121-0/+14
| | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #6651 from nextcloud/remote-cloud-clientRoeland Jago Douma2017-12-113-0/+307
|\ | | | | Add api clients for talking to remote clouds
| * Add some more tests for ocs remote apiRobin Appelman2017-12-083-53/+232
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * refuse to use http if we know a remote has httpsRobin Appelman2017-12-081-0/+128
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #7324 from nextcloud/no-sorters-no-instancesRoeland Jago Douma2017-12-111-41/+99
|\ \ | | | | | | don't create sorter instances when none was requested
| * | don't create sorter instances when none was requestedArthur Schiwon2017-11-281-41/+99
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #7427 from nextcloud/fix-white-color-in-emailsMorris Jobke2017-12-115-5/+29
|\ \ \ | | | | | | | | Fix email buttons for white theme
| * | | Fix email buttons for white themeMorris Jobke2017-12-115-5/+29
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #6876 from nextcloud/always_img_avatarMorris Jobke2017-12-082-13/+39
|\ \ \ \ | | | | | | | | | | Always generate avatar
| * | | | Fix testsRoeland Jago Douma2017-11-292-13/+39
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #7426 from nextcloud/Abijeet-masterMorris Jobke2017-12-082-29/+33
|\ \ \ \ \ | |_|_|_|/ |/| | | | Allows adding of hex color to the theme-color
| * | | | Allows adding of hex color to the theme-colorAbijeet2017-12-082-29/+33
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7158. Adds a # on the color if missing. Increased maxlength, added hash:true for jscolor, and adding a # if not present on the change event. Since the input element now allows a hex code, changed values to hexcode. In addition, added a function to get RGB array from hex or rgb values. Calling it in both methods and using it to perform comparison. Also changed the way we were determining whether the jscolor component had loaded. Changed the control to use data-jscolor rather than defining opts in the class. Signed-off-by: Abijeet <abijeetpatro@gmail.com>
* | | | Merge pull request #7115 from nextcloud/fix-flowMorris Jobke2017-12-081-2/+10
|\ \ \ \ | |/ / / |/| | | Fix flow
| * | | fix testsBjoern Schiessle2017-12-081-8/+0
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | Fix flowMario Danic2017-11-091-2/+18
| | | | | | | | | | | | | | | | Signed-off-by: Mario Danic <mario@lovelyhq.com>
* | | | use formal version of German if default_language is set to 'de_DE'Bjoern Schiessle2017-11-301-2/+42
| |/ / |/| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Fix current access list test and add one for $currentAccess === falseJoas Schilling2017-11-281-2/+113
| |/ |/| | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #7305 from nextcloud/log-level-for-log-extendingMorris Jobke2017-11-271-4/+4
|\ \ | | | | | | Pass log level to log reporters
| * | Pass log level to log reportersMorris Jobke2017-11-271-4/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #7210 from nextcloud/pg10Morris Jobke2017-11-271-17/+18
|\ \ \ | |/ / |/| | add postgresql 10 compatibility to dbal
| * | add postgresql10 compatibility to dbalRobin Appelman2017-11-221-17/+18
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #7295 from nextcloud/remove-unused-methodLukas Reschke2017-11-271-16/+1
|\ \ \ | | | | | | | | Remove unused mimetype detection method in OC_Image
| * | | Remove unused mimetype detection method in OC_ImageMorris Jobke2017-11-271-16/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7264 from nextcloud/cache-fetched-appsLukas Reschke2017-11-274-24/+52
|\ \ \ \ | | | | | | | | | | Cache fetched apps in update check
| * | | | Make isUpdateAvailable non-staticMorris Jobke2017-11-252-2/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Get the Installer via DIMorris Jobke2017-11-253-22/+41
| |/ / / | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* / / / Adjust tests for added lastCheck timeLukas Reschke2017-11-271-0/+1
|/ / / | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* / / Use basename() instead of self implementationMorris Jobke2017-11-231-18/+0
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Fix testsRoeland Jago Douma2017-11-173-9/+67
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #6840 from nextcloud/feature/5282/calendar_apiMorris Jobke2017-11-161-0/+214
|\ \ | | | | | | Calendar API for apps
| * | implement CalendarManagerGeorg Ehrke2017-11-091-0/+214
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | check if the user still exists before we try to cleanup the previewsBjoern Schiessle2017-11-141-1/+10
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #7013 from nextcloud/forgot-passwordJan-Christoph Borchardt2017-11-141-1/+1
|\ \ \ | | | | | | | | Directly show "Forgot password?" link, fix #6808
| * | | Fix acceptance testJohn Molakvoæ (skjnldsv)2017-11-081-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #7166 from nextcloud/enhancement/crash-report-contextMorris Jobke2017-11-141-4/+4
|\ \ \ \ | | | | | | | | | | Pass the exception context to the crash reporter
| * | | | Pass the exception context to the crash reporterChristoph Wurst2017-11-141-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should allow better reports as often the app id is passed as context. While this is not used right now, I'd like to have this for NC13 as adding it later will break the interface for existing apps Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpathMorris Jobke2017-11-142-0/+292
|\ \ \ \ \ | |/ / / / |/| | | | {J,CS}SResourceLocator: account for symlinks in app path
| * | | | tests: change helper scopeKyle Fazzari2017-11-082-46/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be the only way to have the same helpers used between tests in a manner that works for both standalone phpunit and autotest.sh. Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
| * | | | JSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-072-0/+287
| |/ / / | | | | | | | | | | | | Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
* | / / Add a mechanism to register crach reportersChristoph Wurst2017-11-142-12/+103
| |/ / |/| | | | | | | | | | | | | | | | | | | | This adds a crash reporter registry, which is meant for third party apps to hook into the error logging/reporting chain. This way, external tools like Sentry can be used to track and aggregate system crashes. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-099-15/+15
| |/ |/| | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6220 from nextcloud/cached-mount-info-filepathLukas Reschke2017-11-091-0/+4
|\ \ | | | | | | Allow getting the filepath when getting cached mounts by fileid
| * | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-10-271-0/+4
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Theming: theme flow redirection pageJulius Härtl2017-11-081-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+5
|\ \ \ | |_|/ |/| | Enhance calendar invitation emails