Commit Graph

37872 Commits

Author SHA1 Message Date
Georg Ehrke fc044caab1 Merge pull request #4072 from nextcloud/move-x-frame-options-into-php
Move X-Frame-Options into PHP
2017-03-27 15:05:22 +02:00
Roeland Jago Douma f4c9e44403 Merge pull request #4073 from nextcloud/secure-drop
Rename File drop to Secure drop
2017-03-27 14:39:32 +02:00
Roeland Jago Douma 16b02a0fa9 Merge pull request #4064 from nextcloud/update-moment
Update momentjs
2017-03-27 14:10:54 +02:00
Nextcloud bot d9ebc2626f
[tx-robot] updated from transifex 2017-03-27 00:07:55 +00:00
Olivier Paroz 5a6c7877f6
Rename File drop to Secure drop
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 16:13:35 -06:00
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 8d3c461151
Allow to specify the id
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 23:07:54 +02:00
Morris Jobke 3ba114dbbc Merge pull request #4065 from nextcloud/bump_scss
[3rdparty] Bump SCSSphp
2017-03-26 15:03:19 -06:00
Roeland Jago Douma 272d6a1f44
[3rdparty] Bump SCSSphp
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-26 15:02:53 -06:00
Joas Schilling 918f6fd10b
Make sure help is always after users
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 22:32:12 +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 900f11fd91
Fix order as @jancborchardt requested
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 14:30:21 -06:00
Joas Schilling 0564392cb9
Fix the tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:26:45 +02:00
Joas Schilling 0229c16e5f
Don't use the dropdown for one item only
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:23:18 +02:00
Joas Schilling e0b040d623
Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02: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 7cc5130e82
Allow apps to register a setting via info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 20:37:39 +02: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
Christoph Wurst f154b1d32c Merge pull request #4063 from nextcloud/bump_dompurify
Bump dompurify
2017-03-26 18:35:14 +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
Lukas Reschke bff6c8aafc
Move X-Frame-Options into PHP
The public calendar view should be embeddable and we can't do that if the .htaccess sets a global X-Frame-Options.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-26 17:26:11 +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 ec6853a2a6 Merge pull request #3895 from nextcloud/create-notification-when-update-server-not-reachable
Create a notification when the update server couldn't be reached for …
2017-03-26 12:10:09 +02:00
Joas Schilling 27e3a977aa
Fix unit test
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:59 +02:00
Morris Jobke 2249c77a06
Also remove failure notification if no update is available
* error happened and vanished the notification should also
  vanish even if no update is available

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-26 10:59:58 +02:00
Joas Schilling 3668673d7b
Create a notification when the update server couldn't be reached for some days
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 10:59:58 +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
Roeland Jago Douma 28b6929111 Merge pull request #4049 from nextcloud/fix-installation-again
Don't run JSCombiner when not installed
2017-03-25 19:22:38 +01:00
Lukas Reschke d81cdcbe88
Don't run JSCombiner when not installed
When the instance is not installed don't run the JSCombiner as the appdata folder does not yet exist.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-25 15:25:06 +01:00
Nextcloud bot 4ea79a5bbe
[tx-robot] updated from transifex 2017-03-25 01:07:45 +00:00
Morris Jobke ea8b61b61c Merge pull request #4037 from nextcloud/downstream-27421
Use authType BASIC for Sabre client in integration tests
2017-03-24 17:30:24 -06: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
Morris Jobke 8aedebff22 Merge pull request #4044 from nextcloud/merge-login-js
Merge login JS
2017-03-24 15:38:29 -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