summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* create failing test for this caseArthur Schiwon2018-01-056-2/+183
| | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* Merge pull request #7664 from nextcloud/13beta4v13.0.0beta4Morris Jobke2018-01-051-2/+2
|\ | | | | 13.0.0 beta 4
| * 13.0.0 beta 4Morris Jobke2018-01-051-2/+2
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #7477 from nextcloud/date-time-picker-position-fixMorris Jobke2018-01-053-34/+55
|\ | | | | Date time picker position fix & design fixes
| * Fixed default expire date and placeholderJohn Molakvoæ (skjnldsv)2018-01-051-1/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix am-pmJohn Molakvoæ (skjnldsv)2018-01-031-9/+7
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Share datepicker fixJohn Molakvoæ (skjnldsv)2018-01-031-10/+5
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Datepicker design fixJohn Molakvoæ (skjnldsv)2018-01-032-23/+49
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #7710 from nextcloud/theming-fix-scssMorris Jobke2018-01-051-1/+1
|\ \ | | | | | | Fix url rebase when changing the theming color
| * | Fix faulty path in theming scss generationJulius Härtl2018-01-051-1/+1
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2018-01-0538-8/+274
| |
* | Merge pull request #7696 from nextcloud/fix-appmenu-heightMorris Jobke2018-01-041-4/+10
|\ \ | | | | | | Fix small issues with the app menu
| * | Fix popover shadow in app menuJulius Härtl2018-01-041-1/+8
| | | | | | | | | | | | | | | | | | Make sure the app menu popover shadow does overlay the active indicator Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix app menu popover alignmentJulius Härtl2018-01-041-3/+2
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #7702 from nextcloud/composer_updMorris Jobke2018-01-0441-323/+242
|\ \ \ | | | | | | | | Composer updated
| * | | Composer updatedRoeland Jago Douma2018-01-0441-323/+242
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #7698 from nextcloud/fix_7697Morris Jobke2018-01-041-0/+3
|\ \ \ \ | | | | | | | | | | Clear login token once apppassword is generated
| * | | | Clear login token once apppassword is generatedRoeland Jago Douma2018-01-041-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #7697 When using the new login flow a token will be generated since we login. However after that we generate yet another token to return (as we should). However we should kill the current session token as we are done with it. And will never use it again. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #7699 from ↵Morris Jobke2018-01-041-3/+36
|\ \ \ \ | |/ / / |/| | | | | | | | | | | nextcloud/bugfix/7528/drop-owncloud-migrations-table-and-recreate-it Drop the ownCloud migration table instead of reusing it
| * | | Drop the ownCloud migration table instead of reusing itJoas Schilling2018-01-041-3/+36
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #7570 from nextcloud/s3-legacy-authMorris Jobke2018-01-043-1/+222
|\ \ \ \ | | | | | | | | | | add option to use legacy v2 auth with s3
| * | | | add option to use legacy v2 auth with s3Robin Appelman2017-12-193-1/+222
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #7693 from splitt3r/fix-js-type-hintMorris Jobke2018-01-041-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed js typehint for showHtml method
| * | | | | Fixed js typehint for showHtml methodsplitt3r2018-01-041-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexNextcloud bot2018-01-04604-1464/+6824
|/ / / / /
* | | | | Merge pull request #7686 from nextcloud/fix-quota-update-3Roeland Jago Douma2018-01-042-15/+5
|\ \ \ \ \ | | | | | | | | | | | | Fixed quota update on upload and on delete
| * | | | | Fixup! removed unwanted lineJohn Molakvoæ (skjnldsv)2018-01-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | Fixed quota update on upload and on deleteJohn Molakvoæ (skjnldsv)2018-01-032-15/+6
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | Merge pull request #7611 from nextcloud/fix-7445Morris Jobke2018-01-036-47/+44
|\ \ \ \ \ | | | | | | | | | | | | Don't attempt to translate login names to uids when uids are provided
| * | | | | removes invalid tests, adapts another oneArthur Schiwon2018-01-032-37/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | never translate login names when requiring with a user idArthur Schiwon2018-01-033-22/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | where appropriate, the preLoginNameUsedAsUserName hook should be thrown. Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | extend tests for status quoArthur Schiwon2018-01-032-0/+19
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | Merge pull request #7685 from nextcloud/link-to-updateRoeland Jago Douma2018-01-031-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Make update notification open the new update view from apps management
| * | | | Make update notification open the new update view from apps managementJulius Härtl2018-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #7680 from nextcloud/fix-7609Roeland Jago Douma2018-01-035-3/+74
|\ \ \ \ \ | | | | | | | | | | | | format links in comments
| * | | | | Add margin around inline linksMorris Jobke2018-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | format links in commentsArthur Schiwon2018-01-035-3/+73
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #7669 from nextcloud/ie-fix-invertMorris Jobke2018-01-036-33/+47
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix inverted app icons on IE11
| * | | | | | Remove css invert since we are using svg filters for nowJulius Härtl2018-01-032-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Fix height of table rows in apps management on IE11Julius Härtl2018-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Fix icon rendering in apps management for IE11Julius Härtl2018-01-032-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | | Invert app icons on IE11 as wellJulius Härtl2018-01-033-20/+40
| | |/ / / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #7681 from nextcloud/fix-quota-update-2Morris Jobke2018-01-032-0/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update quotas on each upload
| * | | | | | Fix unwanted varJohn Molakvoæ (skjnldsv)2018-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | Update quotas on each uploadJohn Molakvoæ (skjnldsv)2018-01-032-0/+23
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #7533 from ↵Morris Jobke2018-01-0314-121/+351
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | nextcloud/oc-28545-handle-oc-total-length-in-new-chunking [oc] Handle OC-Total-Length in new chunking
| * | | | | Only set X-OC-Mtime when browser provided lastModified on uploadVincent Petry2017-12-151-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Transmit OC-Total-Length in browser as wellThomas Müller2017-12-151-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Add integration tests for length header on new chunkingThomas Müller2017-12-152-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Handle OC-Total-Length in new chunkingThomas Müller2017-12-1511-120/+302
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>