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

7074 Commits

Author SHA1 Message Date
Morris Jobke 12c5c336ad Merge pull request #4077 from nextcloud/better-navigation-management 
Register the app management in the normal way
 2017-03-26 15:48:19 -06:00
Morris Jobke 96d4e1cab5 Merge pull request #4068 from nextcloud/use-eval-instead-of-get-script 
Use eval instead of $.script
 2017-03-26 15:13:03 -06:00
Joas Schilling 75eee315a3
Use false because null crashes the cache 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 22:43:19 +02:00
Lukas Reschke 0d6e5dfbb9 Merge pull request #4075 from nextcloud/search-hover-feedback 
add hover feedback for search, and opacity on use
 2017-03-26 22:31:57 +02:00
Morris Jobke e1ad305e0b
Fix pop over menu opacity 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-26 14:09:22 -06:00
Morris Jobke 7dd5d7363e Merge pull request #4074 from nextcloud/replace-name-with-icon 
replace name in top right with icon for less noise
 2017-03-26 13:02:47 -06:00
Morris Jobke 84b5521981 Merge pull request #4069 from nextcloud/fix-emptycontent-font-color 
fix emptycontent font color lightness
 2017-03-26 12:59:58 -06:00
Joas Schilling 433958e2e3
Move app management to the settings menu 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 20:26:05 +02:00
Lukas Reschke 3c1d76c282
Cleanup code as suggested by @icewind1991 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 19:45:36 +02:00
Joas Schilling 054e161eb5
Manage the right side menu via the navigation manager as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 19:40:41 +02:00
Joas Schilling ec330c7ac4
Register the app management in the normal way 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 19:08:51 +02:00
Jan-Christoph Borchardt 068e2b3c30 add hover feedback for search, and opacity on use 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-26 18:34:09 +02:00
Jan-Christoph Borchardt 2048e3e201 replace name in top right with icon for less noise 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-26 18:15:34 +02:00
Joas Schilling 2961c735e3
Make sure blob columns are correctly converted as parameters 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-26 17:11:57 +02:00
Lukas Reschke fea2108710
Make async 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 15:26:10 +02:00
Jan-Christoph Borchardt 8654139b3c fix emptycontent font color lightness 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-03-26 15:19:41 +02:00
Lukas Reschke 980ef89dbf
Fix callback 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 14:17:01 +02:00
Lukas Reschke 12a019d328
Use eval instead of $.script 
Fixes https://github.com/nextcloud/server/issues/4067

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-26 14:12:44 +02:00
Roeland Jago Douma 62827dd1da
use moments.js min in core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-26 10:25:15 +02:00
Roeland Jago Douma 68eaa1f1d2
[js] Bump momentjs 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-26 10:25:09 +02:00
Roeland Jago Douma 329cee85d1
Update bundled core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-26 09:35:08 +02:00
Roeland Jago Douma a847bad4aa
[js] Bump DOMPurify 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-26 09:34:32 +02:00
Morris Jobke f3917cfea1 Merge pull request #4053 from nextcloud/bump-zxcvbn 
[3rdparty] Bump zxcvbn
 2017-03-26 00:04:40 -06:00
Nextcloud bot 0981f9a18a
[tx-robot] updated from transifex 2017-03-26 01:07:03 +00:00
Roeland Jago Douma b572cf8ec0
[3rdparty] Bump zxcvbn 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-25 20:56:20 +01:00
Nextcloud bot 4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Morris Jobke 2f7669179e Merge pull request #4043 from nextcloud/merge-js-for-template-prepend 
Merge JS for template prepend
 2017-03-24 15:42:08 -06:00
Lukas Reschke 6a4fde11e6
Merge login JS 
Removes 2 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 21:18:24 +01:00
Lukas Reschke 4f73911bab Merge pull request #4041 from nextcloud/merge-systemtags-js 
Merge systemtags JS
 2017-03-24 21:12:42 +01:00
Lukas Reschke 6a470e5935
Merge JS for template prepend 
Shaves off 14 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:37:13 +01:00
Lukas Reschke 4d68324ba6
Merge sharing backend JS 
Removes 8 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:17:38 +01:00
Lukas Reschke a9c3692a9a
Merge systemtags JS 
Shaves off 7 requests.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-24 20:08:27 +01:00
Joas Schilling 4174d75f86
Throw a nice HintException when the apps are missing 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-24 15:02:49 +01:00
Joas Schilling bc11c7ba97
Allow to use short URLs for calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-24 11:52:42 +01:00
Joas Schilling 34f0ad4ebe
Allow to push a non-query URL to the browser history 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-24 11:51:58 +01:00
Roeland Jago Douma 8e89ad21a2
[PoC] JS Combiner 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-24 10:58:10 +01:00
Lukas Reschke e5f9675a79 Merge pull request #4026 from nextcloud/appmenu-fix 
Fix appmenu issues
 2017-03-24 10:54:33 +01:00
Lukas Reschke f94bc6f8bb Merge pull request #4013 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-24 10:49:57 +01:00
Julius Härtl 22c58a6610
Fix appmenu issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-24 10:19:42 +01:00
Roeland Jago Douma df4d1f7b78 Merge pull request #4022 from nextcloud/downstream-27105 
Remove auto-focus on certain input fields
 2017-03-24 10:01:06 +01:00
Roeland Jago Douma 34632de102 Merge pull request #4025 from nextcloud/downstream-27292 
Update karma
 2017-03-24 08:44:42 +01:00
Morris Jobke 1397b84777 Merge pull request #3928 from nextcloud/downstream-17978 
Adjust 4 byte MySQL code to upstream
 2017-03-23 23:45:43 -06:00
Vincent Petry ab37577182
Properly clear heartbeat interval 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:37:24 -06:00
Vincent Petry 46a32045d7
Update karma, use sinon from npm 
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>
 2017-03-23 23:35:41 -06:00
Felix Heidecke a9dc3239b3
Remove auto-focus on certain input fields 
* 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>
 2017-03-23 17:34:50 -06:00
Morris Jobke 8a4466f9ae
Improve error message of charset convert script and behaviour 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 15:36:22 -06:00
Roeland Jago Douma eda98ed3df
Merge vendor js 
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>
 2017-03-23 13:40:23 +01:00
Roeland Jago Douma 17cf8dc450 Merge pull request #3997 from nextcloud/backport-27353 
Update davclient.js to 0.1.1
 2017-03-23 08:36:23 +01:00
Nextcloud bot 39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Vincent Petry b1c98404d0
Update davclient.js to 0.1.1 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-22 17:58:52 -06:00
Nextcloud bot d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00:00
Roeland Jago Douma 4518a28924 Revert "Bundle vendor js" 2017-03-22 17:01:54 +01:00
Roeland Jago Douma ec3f5aa6e2 Merge pull request #3795 from nextcloud/bundle_vendor_js 
Bundle vendor js
 2017-03-22 13:34:21 +01:00
Roeland Jago Douma d83b15cd85 Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip 
Remove tooltip of delete button for systemtags
 2017-03-22 09:24:40 +01:00
Roeland Jago Douma 2337e11d88
Bump core.js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:39 +01:00
Roeland Jago Douma 98a14909e1
Bundle more default vendor js 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 08:49:03 +01:00
Roeland Jago Douma 7195a9323d
Merge vendor js 
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>
 2017-03-22 08:48:10 +01:00
Christoph Wurst c6c5896474 Merge pull request #3980 from nextcloud/fix-app-menu-triangle 
Fix position of triangle in app menu
 2017-03-22 08:43:45 +01:00
Morris Jobke c3f08ab151
Remove tooltip of delete button for systemtags 
* fixes #3967

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 21:49:25 -06:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Morris Jobke 6d35827bf6
Fix position of triangle in app menu 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:48:13 -06:00
Morris Jobke 3329f44a76
Address comments 
* 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>
 2017-03-21 16:42:42 -06:00
Morris Jobke 713f684a8b
Adding tests for 4 byte unicode characters 
* 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>
 2017-03-21 16:42:12 -06:00
Nextcloud bot fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00:00
Lukas Reschke 21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Lukas Reschke 29039eb608 Merge pull request #3951 from nextcloud/menu-firefox-fixes 
Fix new app menu on firefox
 2017-03-20 13:15:43 +01:00
Roeland Jago Douma 376e6f0884 Merge pull request #3915 from michaelletzgus/html5-fix_autocapitalize 
Fix value of attribute "autocapitalize"
 2017-03-20 13:13:32 +01:00
Julius Haertl 7381a2ec5c
Replace old color occurences with calculations 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 322ecdca63
Make remaining colors depending on $color-main-text and $color-main-background 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 9f259d4c7a
Remove legacy CSS 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl c7de67e44a
Merge color tones aaaaaa, bebebe, cccccc in bbbbbb 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 58a9d1b0f2
Remove grey tints 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Julius Haertl 5b3a1a558e
Remove separate error colors 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 8ff3db1be8
Extra variable for loading icons 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 33ee6e8d37
Merge #666 and #777 to #555 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
Julius Haertl 19ce6372ad
Use one box-shadow color 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2017-03-20 12:49:07 +01:00
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
Julius Härtl c994e7afcd
Fix filter for app icons on firefox 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 08:27:11 +01:00
Julius Härtl d3592e9180
Fix popover position on firefox 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 08:27:11 +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
Michael Letzgus 98187bf942 Fix value of attribute "autocapitalize" 
Change <input> attribute "autocapitalize" from value "off" to "none" regarding to apples dev guide:

https://developer.apple.com/library/content/documentation/AppleApplications/Reference/SafariHTMLRef/Articles/Attributes.html#//apple_ref/doc/uid/TP40008058-autocapitalize

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
 2017-03-18 16:06:57 +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
Nextcloud bot 0dd0242d2f
[tx-robot] updated from transifex 2017-03-13 01:08:19 +00:00
Nextcloud bot 37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Ko- 0024b67aaf Check that set_time_limit is not disabled before calling it 
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
 2017-03-11 17:04:21 +01:00
Nextcloud bot 456cd81a20
[tx-robot] updated from transifex 2017-03-11 01:07:48 +00:00
Morris Jobke c1be2d80ad
Fix login page, because only guest.css is loaded now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-10 14:43:14 -06:00
Nextcloud bot 8904fb1cf3
[tx-robot] updated from transifex 2017-03-10 01:08:01 +00:00
Morris Jobke 0c22a66967
Add more styles to the server.scss 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-09 15:36:03 -06:00
Roeland Jago Douma f2cf85fad2
[PoC] combine 2 scss files! 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-09 20:42:34 +01:00
Nextcloud bot 98c56f9adb
[tx-robot] updated from transifex 2017-03-08 01:07:47 +00:00
Christoph Wurst 920f611332
Apply text input styling to 'tel' inputs too 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-03-07 08:51:41 +01:00
Roeland Jago Douma be45d6aac9
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-06 21:26:04 +01:00
Christoph Wurst b15c11b93b
Use button instead of simple links 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-03-06 11:00:58 +01:00
Christoph Wurst 511df0ec99
Move log out and back codes link into 2fa box for better readability 
Fixes https://github.com/nextcloud/server/issues/2538

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-03-06 10:48:26 +01:00
Nextcloud bot 15673bc601
[tx-robot] updated from transifex 2017-03-06 01:07:58 +00:00
Nextcloud bot badb45fce4
[tx-robot] updated from transifex 2017-03-04 01:07:41 +00:00
Roeland Jago Douma 835b49d941
Make sure copy tooltip remains when we have no social providers 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-03 13:36:20 +01:00
Roeland Jago Douma fd71b8bde8
Move social buttons to menu 
* If there are social sharing buttons move them and the copy action to a
menu
* If there are no social sharing buttons just leave the copy action
where it is directly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-03 13:27:06 +01:00
Roeland Jago Douma a85327fe87
Add social sharing 
* Add socialshare manager
* Add social share field under link share

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-03 10:19:41 +01:00
Nextcloud bot b55ce43ba5
[tx-robot] updated from transifex 2017-03-03 01:07:45 +00:00
Nextcloud bot 53195b156c
[tx-robot] updated from transifex 2017-03-02 16:48:52 +00:00
Nextcloud bot aecec74a04
[tx-robot] updated from transifex 2017-03-01 01:07:42 +00:00
Lukas Reschke b5a6f03362 Merge pull request #3643 from nextcloud/replace-deprecated-tipsy 
Replace deprecated $.tipsy(...) by $.tooltip(...)
 2017-02-28 10:49:14 +01:00
Morris Jobke 413d671d9e Merge pull request #3635 from individual-it/fix_quota_validation 
better quota validation
 2017-02-28 00:27:51 -06:00
Artur Neumann 9790fe7f5d make values with white spaces possible 
a user might enter values with white spaces, and that should be possible
and valid

Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-02-28 08:25:34 +05:45
Artur Neumann f1fccaca06 better quota validation 
this fixes #3634

1. fixed computerFileSize to be more picky about incorrect values
2. more tests for computerFileSize
3. use computerFileSize to validate user quota

Signed-off-by: Artur Neumann <info@individual-it.net>
 2017-02-28 07:38:11 +05:45
Nextcloud bot 7fc3129f0c
[tx-robot] updated from transifex 2017-02-28 01:07:54 +00:00
Christoph Wurst 3e7e49884e Replace deprecated $.tipsy(...) by $.tooltip(...) 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-27 22:25:05 +01:00
Roeland Jago Douma 0195740147 Merge pull request #3618 from nextcloud/fix-install-page-warning 
Remove not needed rule for .warning
 2017-02-27 15:11:56 +01:00
Nextcloud bot f3a7b7eaa3
[tx-robot] updated from transifex 2017-02-27 01:19:49 +00:00
Nextcloud bot 0beef8f4e1
[tx-robot] updated from transifex 2017-02-26 01:24:13 +00:00
Marcin Czarnecki 9f1fbc2c98 Update: feedback before redirect 
Signed-off-by: marncz <M.Czarnecki1@uni.brighton.ac.uk>
 2017-02-25 19:16:22 +00:00
Nextcloud bot 556b958af2
[tx-robot] updated from transifex 2017-02-25 01:25:07 +00:00
Morris Jobke 8a7b8f966e Merge pull request #3489 from nextcloud/give-hint-about-opcache 
Show info in admin settings about PHP opcache if disabled
 2017-02-24 13:10:47 -06:00
Morris Jobke fb15553378
Remove not needed rule for .warning 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-24 11:04:48 -06:00
Joas Schilling 5e9a2c29b3 Merge pull request #3603 from nextcloud/update-icon 
Bring back checkmark icon on successful update
 2017-02-24 09:58:05 +01:00
Joas Schilling b26568133f Merge pull request #3605 from nextcloud/single-user 
Clean up single user mode
 2017-02-24 08:52:26 +01:00
Morris Jobke 1d0710ce3f
Bring back checkmark icon on successful update 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-24 00:06:21 -06:00
Nextcloud bot 97b6c1496e
[tx-robot] updated from transifex 2017-02-24 01:21:37 +00:00
Lukas Reschke bc2f23a0fc Merge pull request #2602 from nextcloud/resize-the-controls-after-the-sidebar-slided-in 
Increase debounce time to make sure controls are resized after the sidebar disappeared
 2017-02-23 15:46:06 +01:00
Morris Jobke cee8853658
Show info in admin settings about PHP opcache if disabled 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-22 23:45:48 -06:00
Morris Jobke 9533f4e5ed
Clean up single user mode 
Single user mode basically disables WebDAV, OCS and cron execution. Since
we heavily rely on WebDAV and OCS also in the web UI it's basically useless.
An admin only sees a broken interface and can't even change any settings nor
sees any files. Also sharing is not possible.

As this is at least the case since Nextcloud 9 and we haven't received any
reports for this it seems that this feature is not used at all so I removed it.

The encryption commands now rely on the well tested maintenance mode.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-22 23:02:31 -06:00
Nextcloud bot 54317e80c0
[tx-robot] updated from transifex 2017-02-23 01:18:48 +00:00
Björn Schießle 621f920d68 Merge pull request #3567 from nextcloud/autocomplete-settings 
some sharing settings
 2017-02-22 16:30:21 +01:00
Bjoern Schiessle 11e5a3dcf4
fix typo 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-02-22 16:28:42 +01:00
Nextcloud bot a08dfd9951
[tx-robot] updated from transifex 2017-02-22 01:12:24 +00:00
Morris Jobke 577adf0794 Merge pull request #3568 from nextcloud/fix-pdfviewer-margin 
fix bottom margin of shared pdfviewer links
 2017-02-21 17:44:07 -06:00
Morris Jobke 8e3d0fecd2
Use intval() for validation of config options 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-21 17:22:06 -06:00
Morris Jobke 3284efd199
Improve the UX for sharing settings 
* shows a info when list is potentially truncated
* shows a warning when characters length is not enough

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-21 17:07:07 -06:00
Jan-Christoph Borchardt afed96ea79 fix bottom margin of shared pdfviewer links 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-02-21 20:09:20 +01:00
Nextcloud bot d754227b4c
[tx-robot] updated from transifex 2017-02-21 01:08:46 +00:00
Morris Jobke 89233af487
Fix thumbnail size of search results 
* fixes #3466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-20 12:48:40 -06:00
Lukas Reschke 24fc7dc30f Merge pull request #3257 from nextcloud/updated-guest-checkboxes 
Fix checkboxes on login
 2017-02-20 13:06:47 +01:00
Nextcloud bot c1bb89d65b
[tx-robot] updated from transifex 2017-02-17 01:07:58 +00:00
John Molakvoæ f25c89461c Merge pull request #2287 from nextcloud/registrationEmail 
Send password/activation link to new user
 2017-02-16 07:16:45 +01:00
Morris Jobke 2e88bec14b
Fix setup issue and refine error messages 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-15 17:45:38 -06:00
blizzz 19fc68cbdc Merge pull request #2606 from temparus/master 
Add preLoginValidation hook
 2017-02-15 21:47:47 +01:00
John Molakvoæ (skjnldsv) 4dec5a7646
Fix checkboxes on login 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-15 17:16:34 +01:00
Nextcloud bot 41276f720b
[tx-robot] updated from transifex 2017-02-15 01:07:29 +00:00
Jan-Christoph Borchardt d47f423e8b add screensharing icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-02-14 20:58:49 +01:00
Jan-Christoph Borchardt 9f74858537 Merge pull request #3341 from nextcloud/transparent-white-checkbox 
Transparent white checkbox
 2017-02-14 19:32:39 +01:00
Morris Jobke c5dffc465c Merge pull request #3472 from nextcloud/enable-avatars-always 
Always enable avatars
 2017-02-14 09:22:02 -06:00
Nextcloud bot 7113af3f91
[tx-robot] updated from transifex 2017-02-14 01:07:20 +00:00
Morris Jobke 200a28255e
Always enable avatars 
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-13 17:53:33 -06:00
Nextcloud bot 88047aaea7
[tx-robot] updated from transifex 2017-02-13 01:07:10 +00:00
Nextcloud bot f9d94edb0f
[tx-robot] updated from transifex 2017-02-12 01:07:26 +00:00
Nextcloud bot 01b3da612b
[tx-robot] updated from transifex 2017-02-11 01:07:23 +00:00
blizzz 354bbd50a7 Merge pull request #3371 from m3ntalsp00n/reload_countdown 
showUpdate funciton allows updated messages
 2017-02-10 14:47:33 +01:00
Björn Schießle f33760c7f1 Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table 
Update the email in the accounts table as well
 2017-02-09 12:10:45 +01:00
Joas Schilling ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name 
oc_token should be nc_token
 2017-02-09 10:07:59 +01:00
Nextcloud bot 3c4b539fdf
[tx-robot] updated from transifex 2017-02-09 01:07:10 +00:00
Joas Schilling 460b667f80
Update the email in the accounts table as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-08 13:52:55 +01:00
Joas Schilling f5c42fe0c4 Merge pull request #3403 from nextcloud/rename-dbpassword-toggle 
Rename database password toggle
 2017-02-08 12:16:53 +01:00
m3ntalsp00n 01963b4d72 Fix indentation and l10n compliance. 
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
 2017-02-08 16:55:31 +10:00
Nextcloud bot 1aba2d9ed8
[tx-robot] updated from transifex 2017-02-08 01:07:09 +00:00
Morris Jobke f1c4f4c020
Rename database password toggle 
* otherwise submitting the form with the password show will be overwritten
* see 2c9d7eeb76/core/Controller/SetupController.php (L59)
* seems to be a legacy fallback
* fixes #3381

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-07 16:59:12 -06:00
Nextcloud bot 5e4bbb394c
[tx-robot] updated from transifex 2017-02-07 01:08:50 +00:00
Sandro Lutz 9b6f99ab08 Update license header 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-07 01:25:39 +01:00
Morris Jobke 5157f16d28 Merge pull request #3352 from nextcloud/public-page-guest-css-loader 
Fix public page css fallback loading
 2017-02-06 18:15:56 -06:00
Sandro Lutz fa1d607bfa Merge remote-tracking branch 'nextcloud/master' 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-07 00:15:30 +01:00
Sandro Lutz ff3fa538e4 Add missing use statement for PublicEmitter 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-07 00:12:19 +01:00
John Molakvoæ (skjnldsv) 5383cc6170
TOTP css 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-06 22:26:01 +01:00
Nextcloud bot fa96b9e356
[tx-robot] updated from transifex 2017-02-06 01:07:04 +00:00
Nextcloud bot e4a74568e6
[tx-robot] updated from transifex 2017-02-05 01:07:05 +00:00
m3ntalsp00n dd9ee2db6f fix tests, longer wait time, update notification stub 
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
 2017-02-04 18:51:52 +10:00
m3ntalsp00n fd40613d8e showUpdate funciton allows updated messages 
Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
 2017-02-04 15:47:09 +10:00
Christoph Wurst 5e728d0eda oc_token should be nc_token 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-02 21:56:44 +01:00
Nextcloud bot b946ec9d6c
[tx-robot] updated from transifex 2017-02-02 01:07:05 +00:00
Sandro Lutz 20f878b014 Fix typo for UserManager variable 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:54:00 +01:00
Sandro Lutz 6feff0ceba Add check if UserManager is of type PublicEmitter before calling preLogin hook 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:53:50 +01:00
Sandro Lutz e30d28f7eb Change where preLogin hook gets called 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:53:42 +01:00
Sandro Lutz 6ab0a3215d Remove preLoginValidation hook 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:53:29 +01:00
Sandro Lutz e14d50eb1f Fix indentation 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:50:47 +01:00
Sandro Lutz 4ebcd5ac0b Add preLoginValidation hook 
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
 2017-02-01 21:50:25 +01:00
John Molakvoæ (skjnldsv) 61442e2c33
Various fixes guest css 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-01 18:10:52 +01:00
John Molakvoæ (skjnldsv) 2c9d7eeb76
Fix public page css fallback loading 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-02-01 18:03:51 +01:00
Nextcloud bot 1952560ac7
[tx-robot] updated from transifex 2017-02-01 01:06:57 +00:00
John Molakvoæ (skjnldsv) 8d5bb0b908
Transparent white checkbox 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-31 19:29:30 +01:00
Morris Jobke 5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store 
Login credential store
 2017-01-30 19:30:04 -06:00
Nextcloud bot 9a13fac418
[tx-robot] updated from transifex 2017-01-31 01:07:05 +00:00
Morris Jobke 5618287b68 Merge pull request #3282 from nextcloud/header-menu-arrow-up 
Merge similar properties and standardize the arrow to the menu class
 2017-01-30 17:23:10 -06:00
Christoph Wurst 9a036a2ae3 Merge pull request #3260 from nextcloud/various-scss-fixes 
Various scss fixes
 2017-01-30 11:34:39 +01:00
Nextcloud bot f4de328695
[tx-robot] updated from transifex 2017-01-29 01:06:55 +00:00
Nextcloud bot b614547ff8
[tx-robot] updated from transifex 2017-01-28 01:06:59 +00:00
Nextcloud bot a5aeddc810
[tx-robot] updated from transifex 2017-01-27 01:07:18 +00:00
Morris Jobke 382e20f573 Merge pull request #3249 from nextcloud/add-clear-search-button 
Add clear search button
 2017-01-26 15:42:52 -06:00
John Molakvoæ (skjnldsv) 07cbdbff52
Blue shadow fix 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-26 20:35:22 +01:00
John Molakvoæ (skjnldsv) 9513e7a14b
Blue left shadow fix #3288 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-26 20:26:15 +01:00
Lukas Reschke 43315e27f4 Merge pull request #3163 from nextcloud/issue-3148-wrong-page-title-on-non-nonce-browser 
Use correct theming when returning the defaults
 2017-01-26 18:44:48 +01:00
John Molakvoæ (skjnldsv) 3017bae892
Merge similar properties and apply arrow to menu class 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-26 15:50:18 +01:00
John Molakvoæ (skjnldsv) 7b4b45306b
Js magic to reset search 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-26 15:33:05 +01:00
Morris Jobke 694fa879fb Merge pull request #3255 from nextcloud/fix-password-form 
fix personal page password form layout
 2017-01-25 19:19:26 -06:00
Nextcloud bot 05e3aa491a
[tx-robot] updated from transifex 2017-01-26 01:07:15 +00:00
Morris Jobke d319d6f9d4 Merge pull request #3258 from nextcloud/you-get-a-copyright-you-get-a-copyright-everybody-gets-a-copyright 
Copyright of scss files
 2017-01-25 19:00:55 -06:00
John Molakvoæ (skjnldsv) 4f78c06391
Removed invalid authors 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 18:27:41 +01:00
Björn Schießle ffe2543a57 Merge pull request #3232 from nextcloud/add-profile-data-to-provisioning-api 
add data from the users profile to the provisioning api
 2017-01-25 15:44:36 +01:00
John Molakvoæ (skjnldsv) 4e91759825
No more height css calc for app-navigation children 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:39:54 +01:00
Björn Schießle 5873a0a7d4 Merge pull request #3231 from nextcloud/allow-editing-public-links 
allow editing single files shared as public link
 2017-01-25 15:35:57 +01:00
John Molakvoæ (skjnldsv) 87fd41dba2
Fix popover conflicts with app-navigation li (color & opacity) 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:22:51 +01:00
John Molakvoæ (skjnldsv) 179bd5824f
Border radius fix on popover 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 15:13:38 +01:00
John Molakvoæ (skjnldsv) bf6505f30c
Everyone gets a copyright! 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 14:13:28 +01:00
Jan-Christoph Borchardt 3384b2f53c fix personal page password form layout 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-25 12:05:43 +01:00
Jan-Christoph Borchardt 8c732e376b properly compress close-white.svg 2017-01-25 11:28:43 +01:00
Bjoern Schiessle 5086335643
unify endpoints form core and the the provisioning api 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-25 11:20:35 +01:00
John Molakvoæ (skjnldsv) 5834ab1ffd
Scour opt 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 09:19:49 +01:00
John Molakvoæ (skjnldsv) d0e88e328c
Add clear search button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-25 09:15:37 +01:00
John Molakvoæ 5d985deb4d Merge pull request #3215 from nextcloud/fix-search-border 
Fix #3205
 2017-01-25 08:04:41 +01:00
Nextcloud bot c3e57d228f
[tx-robot] updated from transifex 2017-01-25 01:10:00 +00:00
Morris Jobke 8f5c62c99f Merge pull request #3204 from nextcloud/remove-button-shadow 
remove button shadow effect, fix #3203
 2017-01-24 13:34:12 -06:00
Morris Jobke fa5cb9c875 Merge pull request #3227 from nextcloud/fix-avatar-user-menu-header 
Fixed menu arrow, padding and avatar position, fix #3217
 2017-01-24 13:30:04 -06:00
Christoph Wurst ca6f5735b1 Merge pull request #3226 from nextcloud/header-app-menu-flex-fix 
Fix header layout issue on narrow screens #3225
 2017-01-24 18:15:22 +01:00
Morris Jobke e09bba5e36 Merge pull request #3151 from nextcloud/navigation-icons 
add icons to navigation of personal & admin settings
 2017-01-24 10:56:31 -06:00
Bjoern Schiessle 92d7dd4781
allow editing single files shared as public link 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-24 13:41:27 +01:00
Nextcloud bot 30e9d67ee9
[tx-robot] updated from transifex 2017-01-24 01:07:14 +00:00
Jan-Christoph Borchardt 38f684aadf fix positioning details of icons in navigation 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-24 01:00:00 +01:00
John Molakvoæ (skjnldsv) c30cf00ec3
Fixed menu arrow, padding and avatar position, fix #3217 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 00:25:09 +01:00
John Molakvoæ (skjnldsv) d992af82b2
Fix #3225 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-24 00:03:45 +01:00
Morris Jobke 1bc3a26042
Fix white flashing of search background 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-23 12:54:20 -06:00
John Molakvoæ (skjnldsv) 15134af5f3
Fix #3205 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-23 12:54:20 -06:00
Marius Blüm a460acb823
Increase debounce time to make sure controls are resized after the sidebar disappeared 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2017-01-23 11:49:16 -06:00
Jan-Christoph Borchardt 1936b56103 remove button shadow effect, fix #3203 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-23 09:23:03 +01:00
Christoph Wurst ac6d501657
fix appname position 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:08:10 +01:00
Christoph Wurst bfc4590c28
fix searchbox position 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:08:10 +01:00
Christoph Wurst 47c63e6a3e
fix public sharing buttons 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:08:10 +01:00
Christoph Wurst bfa50a4444
more cleanup 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:06:45 +01:00
Christoph Wurst 7c824a6177
fix scss 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:03:05 +01:00
Christoph Wurst b590658221
use less space for the left part of the header 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:03:05 +01:00
Christoph Wurst 202509251c
Use flexbox for header and rearrange some elements 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-23 09:03:03 +01:00
John Molakvoæ 7eec5e0c27 Merge pull request #3190 from nextcloud/fix-sharing-popover 
Fix #3174
 2017-01-22 20:40:48 +01:00
Morris Jobke 0d6e3ca86b Merge pull request #3187 from nextcloud/inputs-scss-optimisation 
Inputs.scss rewritting and optimisation
 2017-01-22 11:41:49 -06:00
Lukas Reschke bde1150d04 Merge pull request #3004 from nextcloud/fix-installation-css 
Fixed installation page
 2017-01-22 18:28:33 +01:00
John Molakvoæ (skjnldsv) 08361e61d2
App navigation utils buttons shadow fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:57:10 +01:00
John Molakvoæ (skjnldsv) 17f8067db5
Fix Navigation menu shadow and added rules for icon in button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:30:38 +01:00
John Molakvoæ (skjnldsv) 6a617fa721
Fixed public share header buttons 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 17:25:02 +01:00
John Molakvoæ (skjnldsv) 913834be86
Fix download button on public share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:47:58 +01:00
John Molakvoæ (skjnldsv) 56b9203bf9
Select2 search input fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:42:03 +01:00
John Molakvoæ (skjnldsv) ba8a9a9cd2
Login and authenticate inputs fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:38:07 +01:00
John Molakvoæ (skjnldsv) 7fd2257141
Disabled state fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:37:23 +01:00
John Molakvoæ (skjnldsv) 94a5290366
White checkmark fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 16:30:13 +01:00
John Molakvoæ (skjnldsv) 466298d121
Fix login 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-22 05:45:49 +01:00
John Molakvoæ (skjnldsv) 9619584383
Fixed strengthify wrapper 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:47:20 +01:00
John Molakvoæ (skjnldsv) da4c6ab326
Fixed multiselect focus 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:33:43 +01:00
John Molakvoæ (skjnldsv) 7882976a14
Remove quota focus and unwanted state classes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:25:48 +01:00
John Molakvoæ (skjnldsv) a4c74d5992
Fixed show password 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:19:34 +01:00
John Molakvoæ (skjnldsv) f40e5b73f7
Fix #3174 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:06:57 +01:00
John Molakvoæ (skjnldsv) 9689e46d99
Removed old svg and added new ones 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:06:42 +01:00
John Molakvoæ (skjnldsv) f68ff25cc0
Going back to svg for the checkmark and the mixed mark 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 19:05:20 +01:00
John Molakvoæ (skjnldsv) 05f3990616
Inputs.scss rewritting and optimisation, fix #3121 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-21 18:17:53 +01:00
Nextcloud bot d0c6179ec1
[tx-robot] updated from transifex 2017-01-21 01:07:47 +00:00
Nextcloud bot 48a3f2a8a2
[tx-robot] updated from transifex 2017-01-20 01:07:41 +00:00
Joas Schilling 246affb1a0
Use correct theming when returning the defaults 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-19 16:55:09 +01:00
Joas Schilling c3985aba70
Add the icon for the default sections 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-19 10:42:21 +01:00
Bjoern Schiessle 927d3865a0
add brute force protection to password reset to make it harder to guess user logins 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-19 10:12:45 +01:00
John Molakvoæ 2cfedb3623 Merge pull request #3150 from nextcloud/highlight-active-navigation 
highlight active navigation entry better, fix #2096
 2017-01-19 06:47:30 +01:00
Lukas Reschke 5809164163 Merge pull request #3050 from nextcloud/header-scss-optimisation 
Header scss optimisation
 2017-01-19 02:25:26 +01:00
Jan-Christoph Borchardt ad1385a8e1 highlight active navigation entry better, fix #2096 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2017-01-19 01:49:54 +01:00
Bjoern Schiessle cdf01feba7
add action to existing brute force protection 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-18 15:25:16 +01:00
Nextcloud bot 4bbd52b3f9
[tx-robot] updated from transifex 2017-01-18 01:07:38 +00:00
Björn Schießle 61c68d4ebe Merge pull request #3114 from nextcloud/menuitem-fix 
Add menuitem to popover menu
 2017-01-17 11:12:49 +01:00
Joas Schilling aea1b72f54 Merge pull request #1594 from nextcloud/markdown-support-for-app-descriptions 
Markdown support for app descriptions
 2017-01-17 11:11:16 +01:00
Christoph Wurst 012708e1ba Merge pull request #3023 from nextcloud/issue-2915-filter-out-sensitive-appconfigs 
Filter out sensitive appconfig values
 2017-01-17 11:01:42 +01:00
John Molakvoæ 75587cf135 Add menuitem to popover menu 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-17 10:11:08 +01:00
Christoph Wurst 86a5d5b399
fix show-more-icon position 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-17 09:23:59 +01:00
Nextcloud bot b1a82969e6
[tx-robot] updated from transifex 2017-01-17 01:07:54 +00:00
Nextcloud bot 203436b16b
[tx-robot] updated from transifex 2017-01-16 01:15:50 +00:00
Lukas Reschke 6a047a045a
Apply DOMPurify over HTML 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-13 18:58:18 +01:00
Joas Schilling e7a2151c4d
Add marked 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-13 18:33:42 +01:00
John Molakvoæ 8d8aff1bce Merge pull request #3024 from nextcloud/apps-scss-optimisation 
Apps scss optimisation
 2017-01-13 16:31:16 +01:00
John Molakvoæ 127024d89d Merge pull request #3048 from nextcloud/share-scss-optimisation 
Share scss optimisation
 2017-01-13 16:03:17 +01:00
John Molakvoæ (skjnldsv) ce9c833c5b
App navigation utils button fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-13 15:31:42 +01:00
Joas Schilling 0f792fedef Merge pull request #3060 from nextcloud/cleanup-js-tests 
Cleanup js tests
 2017-01-13 14:47:06 +01:00
Christoph Wurst da28a1612e expect warning to be shown 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:33:12 +01:00
Morris Jobke 622101f2dd Merge pull request #2918 from nextcloud/encryption-recovery-improvements 
create new encryption keys on password reset and backup the old one
 2017-01-13 11:28:43 +01:00
Christoph Wurst 9d56d5e94d add spies for l10n warnings 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-13 11:20:19 +01:00
John Molakvoæ (skjnldsv) 0ec6ea5ace
Copyright and code format 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 19:49:09 +01:00
John Molakvoæ (skjnldsv) 052eb98c18
Header scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 15:18:21 +01:00
John Molakvoæ (skjnldsv) bab09dc5d4
Share scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-12 15:02:14 +01:00
Nextcloud bot 09a46b7bd6
[tx-robot] updated from transifex 2017-01-12 01:07:43 +00:00
John Molakvoæ (skjnldsv) 67c4f3d07c
App-navigation action layout fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 21:01:54 +01:00
Christoph Wurst 140555b786
always allow remembered login 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 19:20:11 +01:00
John Molakvoæ fab82e9780 Merge pull request #3029 from nextcloud/systemtags-scss-optimisation 
Systemtags scss optimisation
 2017-01-11 18:41:14 +01:00
John Molakvoæ (skjnldsv) dda4b3b272
Fix padding if empty button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 18:37:59 +01:00
John Molakvoæ 3463c134a9 Merge pull request #3027 from nextcloud/multiselect-scss-optimisation 
Multiselect scss optimisation
 2017-01-11 18:24:15 +01:00
Morris Jobke b6c00a3f51 Merge pull request #3026 from nextcloud/icons-scss-optimisation 
Icons scss optimisation
 2017-01-11 16:52:27 +01:00
Roeland Jago Douma 96d2f2f124 Merge pull request #3028 from nextcloud/tooltip-scss-optimisation 
Tooltip scss optimisation
 2017-01-11 16:38:18 +01:00
Nextcloud bot c35ea15916
[tx-robot] updated from transifex 2017-01-11 15:20:22 +00:00
John Molakvoæ (skjnldsv) dfee6ffaca
Systemtags scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:38:35 +01:00
John Molakvoæ (skjnldsv) 2899f34c4c
Tooltip scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:33:11 +01:00
John Molakvoæ (skjnldsv) 8317a71fee
Multiselect scss optimisation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:22:19 +01:00
John Molakvoæ (skjnldsv) 2a2d4390c6
Comments and delete icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:16:05 +01:00
John Molakvoæ (skjnldsv) 27a1dadea4
Loader and animation 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:12:39 +01:00
John Molakvoæ (skjnldsv) c87d48700c
Second optimisation and readability 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 735423e399
Copyright 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 3e36899778
Comments and cleanup 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:42 +01:00
John Molakvoæ (skjnldsv) 5b4d5aba41
Quote fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:41 +01:00
John Molakvoæ (skjnldsv) 2d56cceb87
popover menu restructuration & unification 
fix #2798

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-11 14:05:15 +01:00
Joas Schilling ce7836378c
Filter out sensitive appconfig values 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-11 11:42:36 +01:00
Christoph Wurst 243c9c0941
fix coding style and increase code coverage 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-01-11 11:01:54 +01:00
Cornelius Kölbel e077e01bf2
Add a TwoFactorException 
A Two Factor third party App may throw a TwoFactorException()
with a more detailed error message in case the authentication fails.
The 2FA Controller will then display the message of this Exception
to the user.

Working on #26593

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-01-11 11:01:52 +01:00
John Molakvoæ (skjnldsv) ef9e2e4e7d
Added loader and fixed tabs 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 17:57:25 +01:00
John Molakvoæ (skjnldsv) e4b3ba6590
Create unified css file and merge all needed data into this file 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 17:50:29 +01:00
Bjoern Schiessle fcda3a20f4
create new encryption keys on password reset and backup the old one 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-01-10 17:04:32 +01:00
John Molakvoæ (skjnldsv) 96d355984d
Revert styles scss changes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 11:24:06 +01:00
John Molakvoæ (skjnldsv) 67467873c2
Removed jquery scss 
- Switched to setup.css
- Disable scss when displaying the update page
- Improved setup css
- Fixed loading failure of other styles on setup & update page
- Improved scss compiler with an ignore scss compilation option

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-10 11:06:03 +01:00
Nextcloud bot 4f9ff96f79
[tx-robot] updated from transifex 2017-01-09 08:24:58 +00:00
Roeland Jago Douma 6347d97c7f Merge pull request #2512 from nextcloud/cleanup-system-tag-usage 
Only allow admins to delete tags
 2017-01-06 16:17:09 +01:00
Roeland Jago Douma ae934cbdab Merge pull request #2966 from nextcloud/ldif-mime-support 
recognize LDIF (and schema) file types
 2017-01-06 14:42:17 +01:00
Morris Jobke 5e02c7f7bd
Theme update pages via CSS 
* SCSS on-the-fly generation isn't allowed during update
* fallback to plain CSS

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-06 12:36:16 +01:00
Arthur Schiwon 68a0f8e153
recognize LDIF (and schema) file types 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-01-06 12:25:16 +01:00
Roeland Jago Douma 350b7ebc86
Adds CssControllerTests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) e1f018838e
Updated installation css for config error and update 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) a44c5244c3
Removed old css files 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:39 +01:00
John Molakvoæ (skjnldsv) 1c128e9391
Tooltip scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:15 +01:00
John Molakvoæ (skjnldsv) 5b302a9a67
Systemtags scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 59731acf38
Styles scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) f4ac735f98
Share scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 4cda23bb6a
Multiselect scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 62acac9b80
Jquery-ui-fixes scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 03fb2330a1
Inputs scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 6b35525c3c
Icons scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 0b51bd0a32
Header scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) a2c3d6c15a
Apps scss 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
Roeland Jago Douma 1e44a15dd1
No need for the CssManager 
* It is a simple wrapper we can always add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) bd5bcd2d8d
Installation css & template edit 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:14 +01:00
John Molakvoæ (skjnldsv) 763814f057
Css installation page fallback 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
Roeland Jago Douma 95d85ba8eb
Do not add ICssManager to OCP 
We can add it later if needed

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
Roeland Jago Douma 2816177ecb
Code cleanup 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 6380d503af
Css cache folder name fix, route fix and various fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 3b62003c9c
Injection fix and log appname fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
John Molakvoæ (skjnldsv) 1caaa7f4cd
Appdata integration 2 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-01-06 09:42:13 +01:00
Joas Schilling ba7f5105f0 Merge pull request #2797 from nextcloud/issue-2734-sudo-password-with-ldap 
Use login name to fix password confirm with ldap users
 2017-01-05 15:15:04 +01:00
Nextcloud bot d9035e2805
[tx-robot] updated from transifex 2017-01-05 13:09:52 +00:00
Joas Schilling 2f21eaaf47
Use login name to fix password confirm with ldap users 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-05 12:17:30 +01:00
Morris Jobke 9dbcc1a177 Merge pull request #2933 from nextcloud/dont-link-to-oc-forum 
Don't link to the oC forum
 2017-01-04 13:22:54 +01:00
Nextcloud bot 2e0cf21f7f
[tx-robot] updated from transifex 2017-01-04 12:09:43 +00:00
Joas Schilling 5533c77b91
Don't link to the oC forum 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-04 12:44:10 +01:00
Roeland Jago Douma fdf10e242d Merge pull request #2850 from nextcloud/downstream-26603 
Fixed size issues on main detail view and disappearing of share recipients (#26603)
 2017-01-02 21:19:43 +01:00
Nextcloud bot 0d24e5d5f9
[tx-robot] updated from transifex 2017-01-02 01:07:33 +00:00
Nextcloud bot 02eb0f7fa4
[tx-robot] updated from transifex 2016-12-31 01:08:36 +00:00
Nextcloud bot fc02564ea6
[tx-robot] updated from transifex 2016-12-30 01:07:28 +00:00
Nextcloud bot 52b734b3e4
[tx-robot] updated from transifex 2016-12-29 01:07:59 +00:00
Robin Appelman 75747c5d2f Merge pull request #2854 from nextcloud/2fa-redirect-url 
Set redirect_url on 2FA challenge page
 2016-12-28 16:28:08 +01:00
Nextcloud bot b399ad2fee
[tx-robot] updated from transifex 2016-12-28 01:07:41 +00:00
Lukas Reschke 2cd92da733 Merge pull request #2821 from nextcloud/added-hint-for-specifying 
Fix #24219: Added hint for specifying a port. (#26860)
 2016-12-27 13:46:29 +01:00
Nextcloud bot bd20139f55
[tx-robot] updated from transifex 2016-12-27 01:07:38 +00:00
Nextcloud bot 3fc4e1b5b9
[tx-robot] updated from transifex 2016-12-26 01:09:23 +00:00
Christoph Wurst eff904473d
Set redirect_url on 2FA challenge page 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2016-12-23 20:53:26 +01:00
Michael Jobst 969c19b2e9
Fixed size issues on main detail view and disappearing of share recipients (#26603) 
* fixed size issues on main detail view and disappearing of share recipients

* Changes due to code comments

* Moved reloadProperties() to FileInfoModel

* Solved Scrutinizer issues

* Bugfix: undefined value used on error

* check if options are set for FileInfoModel.initialize()

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-23 16:56:55 +01:00
Vincent Petry 14256d631c
Use group display name in sharing API + UI 2016-12-22 18:35:32 +01:00
Sourav Badami 3dc562bb7a
Fix #24219: Added hint for specifying a port. (#26860) 
* Added hint for specifying a port.

* Minor changes.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-22 15:55:09 +01:00
Morris Jobke 998f235474 Merge pull request #2563 from nextcloud/fix-password-reset 
fix password reset if encryption is enabled
 2016-12-22 11:18:04 +01:00
Lukas Reschke 091bf07385 Merge pull request #2724 from nextcloud/fix-23591 
[downstream] Report failures for SignApp and SignCore
 2016-12-21 13:03:13 +01:00
Nextcloud bot f50252c7c1
[tx-robot] updated from transifex 2016-12-20 12:02:31 +00:00
Patrick Paysant d4c088cb79
Verify input, add more unit tests 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:20 +01:00
Patrick Paysant ec4bca619d
Add test for unparseable string 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:13 +01:00
Patrick Paysant ff018d48cf
Implements all comments from @PVince81 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:29:05 +01:00
Patrick Paysant 6217393d6a
Adding computerFileSize in OC.Util 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-19 17:28:58 +01:00
Joas Schilling eed0eaeb86
Use a form so firefox doesn't try to save the space as a password 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-19 12:43:31 +01:00
Roeland Jago Douma f54547ff1c Merge pull request #2723 from nextcloud/integrity-exit-code 
[downstream] Return 1 if integrity check is failed. Fixes #22806
 2016-12-19 08:37:43 +01:00
Julius Haertl 1ad3613307
Adjust shadows and fix positioning 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-12-17 20:06:19 +01:00
Victor Dubiniuk 876754a5a5
Check return value for file_put_contents. Add return value to the commands 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:50:58 +01:00
Victor Dubiniuk 93a8eba137
Return 1 if integrity check is failed. Fixes #22806 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-16 17:48:37 +01:00
Lukas Reschke 9aef75cb36 Merge pull request #2398 from nextcloud/fix-2368 
flicker-free permission change in share dialog
 2016-12-16 13:35:33 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Lukas Reschke 49473dee85 Merge pull request #2582 from nextcloud/callback-alos-on-close 
Fire callback also on pure closing of prompt dialog
 2016-12-09 13:44:53 +01:00
Morris Jobke ec52286a0f
Fire callback also on pure closing of prompt dialog 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-09 12:52:46 +01:00
blizzz e3b2832ee1 Merge pull request #2561 from nextcloud/save-timezone-on-login 
Save the timezone on login again
 2016-12-09 10:37:52 +01:00
Nextcloud bot 88d90066ba
[tx-robot] updated from transifex 2016-12-09 01:07:18 +00:00
Joas Schilling 3472f70ffe Merge pull request #2515 from nextcloud/tag-rename-styling 
fix styling of renaming system tags
 2016-12-08 14:05:06 +01:00
Roeland Jago Douma 158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width 
Fix popover width
 2016-12-08 13:49:56 +01:00
Bjoern Schiessle 16bbd3fd7c
fix password reset if encryption is enabled 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-08 12:08:05 +01:00
Joas Schilling 924358ef96
Save the timezone on login again 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-08 10:45:24 +01:00
Arthur Schiwon f29f4d9c3a
fix rendering for mail shares 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon 3ac8d422de
disable checkboxes during save op to avoid race conditions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon 056e59af7e
fix some coding style and stricter comparisons, makes scrutinizer happier 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon 39c2d9e663
also handle can-edit change 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
Arthur Schiwon 2514176e41
flicker-free permission change in share dialog 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-08 10:29:51 +01:00
John Molakvoæ (skjnldsv) 2eca4e65b3
Fix popover margin and width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-07 10:50:54 +01:00
blizzz c776aa9282 Merge pull request #2530 from nextcloud/fix-change-permissions-mail-shares-on-folder 
fix change permission on mail shares of folders
 2016-12-06 22:53:46 +01:00
Joas Schilling 9ea432f88c
Adjust the JS unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-06 17:50:57 +01:00
Joas Schilling b8e9d255d3
Only allow admins to delete tags 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-12-06 16:30:21 +01:00
Arthur Schiwon c2062a93a3
set different permissions if file or folder 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 15:41:10 +01:00
Robin Appelman d9ae68eca6
fix rename input positioning in ff 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-06 15:32:46 +01:00
Arthur Schiwon 02f26751ce
set full edit permissions 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 15:22:33 +01:00
Arthur Schiwon 9c249427d1
fix change permission on mail shares of folders 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2016-12-06 13:44:27 +01:00
John Molakvoæ (skjnldsv) 0abcba25e8
Fix db selection design and fix #2511 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-06 09:56:00 +01:00
Roeland Jago Douma db6359d1e4 Merge pull request #2513 from nextcloud/fix-htaccess-checks 
Properly check the data dir
 2016-12-06 08:57:36 +01:00
Nextcloud bot 2a647f4d3a
[tx-robot] updated from transifex 2016-12-06 01:07:19 +00:00
Morris Jobke a2867c0664
Properly check the data dir 
* fixes #1364

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-05 23:35:35 +01:00
Lukas Reschke 60d1e8e63e
Check for nextcloud version as well 
The code checker didn't consider the "nextcloud" version before, resulting in fails such as https://travis-ci.org/nextcloud/richdocuments/jobs/181470760#L415-L416

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-12-05 22:18:24 +01:00
Robin Appelman fe31b45934
float tooltip over select2 dropdown 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 17:59:16 +01:00
Robin Appelman fccddb8787
fix styling of renaming system tags 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 17:54:38 +01:00
Morris Jobke efa9ac1230 Merge pull request #2508 from nextcloud/systemtags-dropdown-style 
improve systemtags selector styling
 2016-12-05 16:12:30 +01:00
Morris Jobke 8fdfb41b93 Merge pull request #1934 from nextcloud/move-latly-used-tags-to-the-top 
Move lately used tags to the top
 2016-12-05 16:10:33 +01:00
Robin Appelman d6c9cc7e03
improve systemtags selector styling 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-05 14:59:14 +01:00
Morris Jobke 9eb1ea41ce Merge pull request #2428 from justin-sleep/upstream 
Fix #2427 by converting $remember to integer
 2016-12-03 11:10:22 +01:00
Nextcloud bot 181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Lukas Reschke 5a3a776af9 Merge pull request #2482 from nextcloud/fix-loading-icon-size 
Fix loader size to 32px and 16px
 2016-12-02 22:10:15 +01:00
justin-sleep 25a5c655f7 Move integer casting to the top of the chain 
Signed-off-by: justin-sleep <justin@quarterfull.com>
 2016-12-02 14:07:45 -06:00
Morris Jobke 95243f49b6 Merge pull request #2490 from nextcloud/updated-gif-loader 
Fix gif loader to fit css design, fix #1825
 2016-12-02 20:03:35 +01:00
John Molakvoæ (skjnldsv) 890e25f7da
Fix gif loader to fit css design 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 19:38:31 +01:00
John Molakvoæ (skjnldsv) b5392b8642
Fix loader size to 32px and 16px 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 18:04:03 +01:00
John Molakvoæ (skjnldsv) 8a12f0bc8f
Fix unshare delete icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-12-02 17:52:24 +01:00
Morris Jobke db56df1893 Merge pull request #2469 from nextcloud/fix-loading-icon-background 
Remove white background from loading icon
 2016-12-02 15:53:38 +01:00
Robin Appelman bc597b1843 Merge pull request #2448 from nextcloud/errorreload-login 
only reload on errors when logged in
 2016-12-02 14:37:12 +01:00
Robin Appelman e055fbd4da
adjust js tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-02 13:40:23 +01:00
Morris Jobke 0853f0e7a8
Remove white background from loading icon 
* allows to use the loading icon on non-white background (disabled input fields for example)
* fixes #2466

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-12-02 12:39:12 +01:00
Nextcloud bot 1b5ff9f5c7
[tx-robot] updated from transifex 2016-12-02 01:07:35 +00:00
Robin Appelman 8a3b660969
only reload on errors when logged in 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-12-01 23:44:50 +01:00
Lukas Reschke de807fd882 Merge pull request #2416 from nextcloud/cache_all_avatar_responses 
Cache all avatar responses
 2016-12-01 13:48:55 +01:00
Nextcloud bot f075c22c72
[tx-robot] updated from transifex 2016-11-30 14:18:08 +00:00
Roeland Jago Douma f15ea9ec05 Merge pull request #2406 from nextcloud/move-dav-activities-to-new-api 
Move dav activities to new api
 2016-11-30 14:01:58 +01:00
Morris Jobke 86168c8ea7 Merge pull request #1446 from nextcloud/fix-mail-design 
Fix mail design
 2016-11-30 11:31:43 +01:00
Roeland Jago Douma 5c602f3217
Cache all avatar responses 
* Cache for 30 minutes
* Also cache when avatar can't be found

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-30 09:43:36 +01:00
Nextcloud bot 41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Morris Jobke 224c89c1b8 Remove leftovers from #1929 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-30 01:07:00 +01:00
Felix Epp 6aa79cacfd Fix mail header logo [fixes #1326] 
Signed-off-by: Felix A. Epp <work@felixepp.de>
 2016-11-30 01:06:47 +01:00
John Molakvoæ 506c9815ac
Fix #2408 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 18:36:49 +01:00
Morris Jobke 7780e45348 Merge pull request #2388 from nextcloud/share-table-ellipsis 
Fix whitespace between sharee name and icons #2384
 2016-11-29 16:56:16 +01:00
Joas Schilling 9b62302f7d
Add viewbox to the icons 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2016-11-29 15:48:16 +01:00
Joas Schilling f9271ebbd6 Merge pull request #2394 from nextcloud/use-displayname-for-sharee-view 
Use displayname instead of username for sharee view
 2016-11-29 14:30:30 +01:00
Morris Jobke eebef56f4c Merge pull request #2393 from nextcloud/fix-tabheaders-floating 
Fix floating of tabHeader items
 2016-11-29 14:01:33 +01:00
Morris Jobke e7a146bd62
fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2016-11-29 13:40:41 +01:00
John Molakvoæ 1d50cab1c6
Use displayname 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 12:17:27 +01:00
Julius Haertl 5f5a658e15
Fix floating of tabHeader items 
Signed-off-by: Julius Haertl <jus@bitgrid.net>
 2016-11-29 11:14:20 +01:00
John Molakvoæ (skjnldsv) ab751277a1
Fix username width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 10:51:35 +01:00
John Molakvoæ (skjnldsv) 60b65cde2b
Fix ellipsis in breadcrumb fix #2387 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 07:14:18 +01:00
John Molakvoæ (skjnldsv) a984f4b430
Fix #2384 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2016-11-29 07:06:41 +01:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
blizzz cd9d1f589f Merge pull request #2237 from nextcloud/rich-strings-and-icons-for-mention-notifications 
Rich strings and icons for mention notifications
 2016-11-28 18:13:54 +01:00
Morlinest 27cbaad96a Mark all content in search field 
To resolve issue #2310
 2016-11-28 15:06:02 +01:00
Lukas Reschke 183bee9b67 Merge pull request #2342 from nextcloud/filepicker-shadow 
Fix filepicker styling
 2016-11-28 15:00:19 +01:00
Robin Appelman b2b9abfa33
move more sizing logic to css 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2016-11-28 14:05:46 +01:00