mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
37,633 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

6543 Commits

Author SHA1 Message Date
Julius Haertl 7b5d5d19a8
Replace #222 with #333 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 51c6fcda10
Remove unused old #999 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 52fdec8600
Merge colors 
- #fafafa/#f8f8f8/#f5f5f5 to #f8f8f8
- #f0f0f0/#eeeeee/#e8e8e8 to #eeeeee

Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl 14d73d07aa
Remove rgb color values 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl bea61d063a
Simplify colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl e2d7ac1c3a
SCSS colors in tooltip.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl 6c59377b95
SCSS colors in styles.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl 29028927d1
SCSS colors in share.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl 78d1e7685f
SCSS colors in multiselect.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:06 +01:00
Julius Haertl 128c271c73
SCSS colors in inputs.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl 35a805a6f3
SCSS colors in icons.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl 5dac3805b0
SCSS colors in apps.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl 34bf2b5616
SCSS colors in header.scss 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl 2d1f886c6a
Add variables of existing colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Julius Haertl 2bd06e0d37
Add variables.scss and import it for each scss file 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:05 +01:00
Lukas Reschke ac1aff7d92 Merge pull request #3950 from nextcloud/downstream-27149 
Forbid to upload part files via web UI
 2017-03-20 11:44:57 +01:00
Morris Jobke 8b670b41f1 Merge pull request #3952 from nextcloud/downstream-27209 
Log files:scan exception, add InterruptedException
 2017-03-20 03:22:58 -06:00
Vincent Petry b8a8f43fce
Log files:scan exception, add InterruptedException 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:24:28 -06:00
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
Felix Heidecke 11f838f9e4
Add ignore_files to config, 
test files against ignore_files list on upload

fix typo and indentation

Move blacklist declaration to lib/public/Files/FileInfo.php,

Rename *ignored to *blacklisted

Mocked blacklist_files for testing

Mocked blacklist_files for testing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 01:17:12 -06: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