summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use master key for public links as wellVincent Petry2017-03-242-23/+35
|
* Add tests for null userVincent Petry2017-03-241-1/+5
|
* Fix public link for master keyVincent Petry2017-03-241-1/+1
| | | | | In public link mode there is no session, so the code should use the public key instead.
* Merge pull request #3825 from nextcloud/federation-fixesBjörn Schießle2017-03-246-65/+121
|\ | | | | create correct VCard and return correct error codes
| * fix testsBjoern Schiessle2017-03-242-8/+28
| | | | | | | | | | | | calling getAbsoluteBundlePath() in the constructor makes other tests fail Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * Load cert file before syncing addressbooks and contactsJoas Schilling2017-03-241-16/+31
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * use right format for avatarsBjoern Schiessle2017-03-242-5/+5
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * don't add empty values to the vcardBjoern Schiessle2017-03-243-40/+56
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * only execute code if exception was thrown by the corresponding controllerBjoern Schiessle2017-03-242-3/+7
| | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * fix the way we create a new vcard to avoid to have multiple UIDsBjoern Schiessle2017-03-241-1/+2
|/ | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directoriesJoas Schilling2017-03-241-0/+6
|\ | | | | Fix workflow engine mimetype detection when creating a directory
| * Fix workflow engine mimetype detection when creating a directoryJoas Schilling2017-03-231-0/+6
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #4026 from nextcloud/appmenu-fixLukas Reschke2017-03-241-1/+2
|\ \ | | | | | | Fix appmenu issues
| * | Fix appmenu issuesJulius Härtl2017-03-241-1/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #4013 from nextcloud/bundle_vendor_jsLukas Reschke2017-03-247-15/+42691
|\ \ \ | | | | | | | | Bundle vendor js
| * | | Handlebars is already loaded by core.jsRoeland Jago Douma2017-03-231-2/+0
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add CI step to verify merged vendor jsRoeland Jago Douma2017-03-232-0/+33
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Merge vendor jsRoeland Jago Douma2017-03-234-13/+42658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a bunch of javascript we always load from vendors. This combines this into 1 javascript file. Which reduces the number of request by ~10. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #4022 from nextcloud/downstream-27105Roeland Jago Douma2017-03-242-4/+8
|\ \ \ \ | |_|/ / |/| | | Remove auto-focus on certain input fields
| * | | Remove auto-focus on certain input fieldsFelix Heidecke2017-03-232-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove autofocus on input certain input fields if browser is msie * Update sharedialoglinkshareview.js * Update sharedialogview.js Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #4025 from nextcloud/downstream-27292Roeland Jago Douma2017-03-244-5960/+14
|\ \ \ \ | | | | | | | | | | Update karma
| * | | | also install sinonMorris Jobke2017-03-231-1/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Properly clear heartbeat intervalVincent Petry2017-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Update karma, use sinon from npmVincent Petry2017-03-233-5958/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update karma library and use sinon JS library provided by karma-jasmine-sinon instead of local file. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #3928 from nextcloud/downstream-17978Morris Jobke2017-03-2313-39/+256
|\ \ \ \ \ | | | | | | | | | | | | Adjust 4 byte MySQL code to upstream
| * | | | | Improve error message of charset convert script and behaviourMorris Jobke2017-03-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Fix autoloaderMorris Jobke2017-03-222-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Address commentsMorris Jobke2017-03-213-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix URL to documentation * improve logic of UTF8mb4 check * fix connection parameter creation - it's done already in ConnectionFactory::createConnectionParams * remove unused attributes of MDB2SchemaReader Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Adjust tests as wellMorris Jobke2017-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Adding tests for 4 byte unicode charactersMorris Jobke2017-03-2110-20/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * success on SQLite and Postgres * failure on MySQL due to the limited charset that only supports up to 3 bytes Add config option to update charset of mysql to utf8mb4 * fully optional * requires additional options set in the database only disable unicode test on mysql Fixing ctor call Adding docker based unit test execution for mysql utf8mb4 Add mysqlmb4 test configuration to Jenkinsfile fix collation on utf8mb4 Properly setup charset and collation in the doctrine connection Allow files containing 4-byte chars in case the database supports it During setup of a mysql database we try to detect if charset 'utf8mb4' can be used Fix mysql settings Add console command to migrate the charset Set ROW_FORMAT before setting collation to mb4 Also select tables with wrong collation Faster MySQL docker Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #3889 from nextcloud/downstream-26950Morris Jobke2017-03-232-3/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Sharing dialog: make autocomplete sorting case insensitive
| * | | | | fix sorting in the backendMorris Jobke2017-03-234-80/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Sharing dialog: Names sorting is case sensitive #25971Ilja Neumann2017-03-172-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharing dialog: Names sorting is case sensitive: adding tests #25971 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | [tx-robot] updated from transifexNextcloud bot2017-03-24176-430/+452
| |_|/ / / |/| | | |
* | | | | Merge pull request #3879 from nextcloud/downstream-26915Morris Jobke2017-03-238-8/+267
|\ \ \ \ \ | | | | | | | | | | | | Added integration tests for sharees using v2.php
| * | | | | Make deleting a group compatible with ocs v2Joas Schilling2017-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Use proper bash test syntaxMorris Jobke2017-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Fix warningJoas Schilling2017-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | 200 is okJoas Schilling2017-03-201-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Fix deletion of groupsJoas Schilling2017-03-201-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | Strict comparisonsJoas Schilling2017-03-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | add drone configMorris Jobke2017-03-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Added tests using v2.phpSergio Bertolin2017-03-202-2/+246
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #4007 from nextcloud/backport-27155Morris Jobke2017-03-2312-78/+98
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change showTemporary notifications for closable ones
| * | | | | | added quit option in commentstabview.jsnoveens2017-03-2312-78/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added quit option in notif in app.js added quit option in notif in file-upload.js added quit option in notif in fileinfomodel.js added quit option in notif in filelist.js added quit option in notif in filelist.js added quit option in notif in tagsplugin.js added quit option in notif in statusmanager.js added quit option in notif in external.js added quit option in notif in versionstabview.js added quit option in notif in notification.js changes according to the latest review. timeout removed since there is a button to close it translation capability added typo fixed test files updated small errors fixed Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #3953 from nextcloud/downstream-27027Morris Jobke2017-03-232-2/+56
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore NoUserException for shares from ghosts
| * | | | | | | set cache to failedcache when shared storage init failsRobin Appelman2017-03-232-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | return failed cache if the shared storage failed to setupRobin Appelman2017-03-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | also set nonmaskedstorage in error casesRobin Appelman2017-03-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | | | Ignore NoUserException for shares from ghostsVincent Petry2017-03-202-2/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add unit tests for FailedStorage init from SharedStorage Signed-off-by: Morris Jobke <hey@morrisjobke.de>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 22:57:59 +0000