Commit Graph

6718 Commits

Author SHA1 Message Date
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