Commit Graph

6524 Commits

Author SHA1 Message Date
Morris Jobke daa7e11095 Merge pull request #3947 from nextcloud/downstream-27323
Disable empty password for user::resetpassword command using CLI
2017-03-20 01:53:28 -06:00
Morris Jobke e446d22359 Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs
Fix duplicate id "apps-management"
2017-03-20 01:51:20 -06:00
Morris Jobke 5979f48134 Merge pull request #3934 from nextcloud/downstream-27246
Update the occ:encrypt-all prompt
2017-03-20 01:34:49 -06:00
Christoph Wurst 313173dd45 Merge pull request #3936 from nextcloud/downstream-27253
Add extensionpoint to sharedialogview
2017-03-20 08:31:01 +01:00
Morris Jobke 24a8604426 Merge pull request #3942 from nextcloud/downstream-27264
Clear onpopstate handlers after unit tests
2017-03-20 01:12:11 -06:00
Christoph Wurst 8f3cb5b01c Merge pull request #3919 from michaelletzgus/layout-fix_avatar
Fix avatar and caret position
2017-03-20 08:07:12 +01:00
Sujith H a860ee3a45
Disable empty password for user::resetpassword command using CLI
Fixes issue: https://github.com/owncloud/core/issues/25206

Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:01:12 -06:00
Vincent Petry 703f2e6a61
Clear onpopstate handlers after unit tests
Fixes issue when running Karma tests in Firefox.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 23:15:21 -06:00
Felix Heidecke f198d77388
Add extensionpoint to sharedialogview
Write method overriding extension

Add a list of unknowns while inputting a search term

Rename OCA.Share extension point

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:40:36 -06:00
Morris Jobke 0f2ee20885
ownC -> Nextc
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:02:21 -06:00
Matthew Setter d4058b73c2
Update the occ:encrypt-all prompt
The message isn't as clear, nor as succinct, as it could be.
Given that, this commit seeks to address both those points.
This commit was prompted by https://github.com/owncloud/documentation/pull/2835.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:02:14 -06:00
Morris Jobke edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 15:53:49 -06:00
Roeland Jago Douma ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2
Support Circles
2017-03-19 20:45:55 +01:00
Michael Letzgus 14f465879c Fix duplicate id "apps-management"
Change CSS from #apps-management to .apps-management

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 16:17:26 +01:00
Michael Letzgus 0df6172036 Fix avatar and caret position
* Avatar image was not vertcially aligned
* The caret was below the avatar
* The surrounding <div> exceeded the title bar

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 15:19:11 +01:00
Michael Letzgus 0b6ff1706f Fix duplicate id "apps-management"
Make duplicate id "apps-management" a class since IDs must be unique:

https://www.w3.org/TR/2011/WD-html5-20110525/elements.html#the-id-attribute
https://api.jquery.com/id-selector/

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
2017-03-19 12:36:29 +01:00
Nextcloud bot 9e1e7dac47
[tx-robot] updated from transifex 2017-03-18 01:07:50 +00:00
Maxence Lange 69694012ab shares-circles
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
Joas Schilling 0c0ce25b3c Merge pull request #3881 from nextcloud/downstream-26842
Backbone Webdav Adapter MKCOL support
2017-03-17 13:53:04 +01:00
Roeland Jago Douma 7a3acff782 Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution
Harden JS by disabling jQuery eval
2017-03-17 08:31:12 +01:00
Vincent Petry 6488ed3cff
Backbone Webdav Adapter MKCOL support
Usually Backbone collections cannot be created and just simply exists.
But in the Webdav world they need to be creatable.

This enhancement makes it possible to use a Backbone Model to represent
such collections and when creating it, it will use MKCOL instead of PUT.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:08:48 -06:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Lukas Reschke 39afcbd49f Merge pull request #3679 from nextcloud/socialsharing
Add social sharing
2017-03-16 23:08:47 +01:00
Lukas Reschke 148e7abb51
Harden JS by disabling jQuery eval
Disable execution of eval in jQuery. We do require an allowed eval CSP
configuration at the moment for handlebars et al. But for jQuery there is
not much of a reason to execute JavaScript directly via eval.

This thus mitigates some unexpected XSS vectors. As example try to insert
`$('.fileinfo').html('<a href="asd"><script>alert(1)</script></a>');`
with and without this patch in your browsers JS console when the file list
is opened.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 23:03:02 +01:00
Morris Jobke cd4ebe2777 Merge pull request #3008 from nextcloud/appmenu-experiment
Show apps in header
2017-03-16 13:03:41 -06:00
Lukas Reschke 6c8d48b0f6
Harden t() with DOMPurify
This mitigates issues where developers pass untrusted user-input through t() which may lead to XSS issues.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-16 14:17:42 +01:00
Roeland Jago Douma bb2ec51bbb
Fix unit tests of master
Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-16 12:46:02 +01:00
Roeland Jago Douma 57c1be8633 Merge pull request #3802 from Ko-/master
Check that set_time_limit is not disabled before calling it
2017-03-16 12:27:26 +01:00
Julius Haertl b8ef616455
Fix html formating issues
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 780400302c
Rebuild menu to keep order of icons correct
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 25e18b840b
Reduce device width and hide app name when menu is open
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 1d6fba03f4
Make enabling/disabling apps work with the new menu
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl efc681dcfe
Fix positioning of popovermenu
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl f58f8f6f47
Fix popover positioning after window resize
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 267b89f5c7
Cleanup SCSS for app menu and fix mobile view
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:10 +01:00
Julius Haertl 7eae6690ad
Make app management icon act like a normal app icon
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl 61dc78e6dc
Fix menu issues
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl a630e4629f
Generate seperate menu list for header bar
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Julius Haertl 42feab59d5
Show app icons in the header
Signed-off-by: Julius Haertl <jus@bitgrid.net>
2017-03-16 11:55:09 +01:00
Ko- 786ee72146 Add warning on admin screen when set_time_limit is unavailable 2017-03-16 11:48:28 +01:00
Roeland Jago Douma 4d207680f2 Merge pull request #3624 from marncz/master
Update.js: countdown feedback before redirect
2017-03-16 07:56:51 +01:00
Nextcloud bot 2fafdb39ac
[tx-robot] updated from transifex 2017-03-16 01:07:36 +00:00
Roeland Jago Douma 5ed45fc8e6 Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Remove single quotes around search query like in user search
2017-03-15 15:05:15 +01:00
Joas Schilling 0fe45966a0
Remove single quotes around search query like in user search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-15 12:53:44 +01:00
Marcin Czarnecki 1a3617cdd6 Spacing
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
2017-03-15 06:35:40 +00:00
Morris Jobke 13aae43d89
Fix layout of sharing buttons
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-14 22:52:28 -06:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Marcin Czarnecki df2670ca3c Update: feedback before redirect
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
2017-03-14 20:36:17 +00:00
Nextcloud bot 8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Joas Schilling beb3f92c4d
Remove the double password confirmation on changing cron
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-13 15:52:16 +01:00