]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #3917 from michaelletzgus/html5-fix_dup-IDs
Morris Jobke [Mon, 20 Mar 2017 07:51:20 +0000 (01:51 -0600)]
Merge pull request #3917 from michaelletzgus/html5-fix_dup-IDs

Fix duplicate id "apps-management"

7 years agoMerge pull request #3931 from nextcloud/downstream-27295
Roeland Jago Douma [Mon, 20 Mar 2017 07:48:10 +0000 (08:48 +0100)]
Merge pull request #3931 from nextcloud/downstream-27295

Don't store empty groupids

7 years agoMerge pull request #3930 from nextcloud/downstream-27227
Morris Jobke [Mon, 20 Mar 2017 07:35:17 +0000 (01:35 -0600)]
Merge pull request #3930 from nextcloud/downstream-27227

Added functions to add files in local_storage

7 years agoMerge pull request #3934 from nextcloud/downstream-27246
Morris Jobke [Mon, 20 Mar 2017 07:34:49 +0000 (01:34 -0600)]
Merge pull request #3934 from nextcloud/downstream-27246

Update the occ:encrypt-all prompt

7 years agoMerge pull request #3935 from nextcloud/downstream-27293
Morris Jobke [Mon, 20 Mar 2017 07:31:20 +0000 (01:31 -0600)]
Merge pull request #3935 from nextcloud/downstream-27293

log where a resource was not found

7 years agoMerge pull request #3936 from nextcloud/downstream-27253
Christoph Wurst [Mon, 20 Mar 2017 07:31:01 +0000 (08:31 +0100)]
Merge pull request #3936 from nextcloud/downstream-27253

Add extensionpoint to sharedialogview

7 years agoMerge pull request #3942 from nextcloud/downstream-27264
Morris Jobke [Mon, 20 Mar 2017 07:12:11 +0000 (01:12 -0600)]
Merge pull request #3942 from nextcloud/downstream-27264

Clear onpopstate handlers after unit tests

7 years agoMerge pull request #3933 from nextcloud/downstream-27258
Morris Jobke [Mon, 20 Mar 2017 07:10:16 +0000 (01:10 -0600)]
Merge pull request #3933 from nextcloud/downstream-27258

Add percentage to user's quota info

7 years agoMerge pull request #3932 from nextcloud/downstream-27273
Morris Jobke [Mon, 20 Mar 2017 07:09:39 +0000 (01:09 -0600)]
Merge pull request #3932 from nextcloud/downstream-27273

trigger event on input autofill

7 years agoMerge pull request #3938 from nextcloud/downstream-27201
Morris Jobke [Mon, 20 Mar 2017 07:09:14 +0000 (01:09 -0600)]
Merge pull request #3938 from nextcloud/downstream-27201

Defining App "cron" for "Invalidating tokens older than" message

7 years agoMerge pull request #3919 from michaelletzgus/layout-fix_avatar
Christoph Wurst [Mon, 20 Mar 2017 07:07:12 +0000 (08:07 +0100)]
Merge pull request #3919 from michaelletzgus/layout-fix_avatar

Fix avatar and caret position

7 years agoClear onpopstate handlers after unit tests 3942/head
Vincent Petry [Mon, 27 Feb 2017 09:06:53 +0000 (10:06 +0100)]
Clear onpopstate handlers after unit tests

Fixes issue when running Karma tests in Firefox.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoDefining App "cron" for "Invalidating tokens older than" message #27167 (#27201) 3938/head
Martin [Wed, 22 Feb 2017 16:24:27 +0000 (17:24 +0100)]
Defining App "cron" for "Invalidating tokens older than" message #27167 (#27201)

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd extensionpoint to sharedialogview 3936/head
Felix Heidecke [Fri, 24 Feb 2017 14:45:47 +0000 (15:45 +0100)]
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>
7 years agolog where a resource was not found 3935/head
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 09:50:54 +0000 (10:50 +0100)]
log where a resource was not found

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdded functions to add files in local_storage 3930/head
Sergio Bertolin [Wed, 1 Mar 2017 10:10:30 +0000 (10:10 +0000)]
Added functions to add files in local_storage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd percentage to user's quota info 3933/head
David Toledo [Mon, 27 Feb 2017 12:41:05 +0000 (13:41 +0100)]
Add percentage to user's quota info

* Add percentage to user's quota info

Fixes https://github.com/owncloud/core/issues/24011

* Do not show percentage if the quota is Unlimited

* translate quota

* correct condition and remove print_unescaped

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoownC -> Nextc 3934/head
Morris Jobke [Mon, 20 Mar 2017 03:58:12 +0000 (21:58 -0600)]
ownC -> Nextc

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate the occ:encrypt-all prompt
Matthew Setter [Fri, 24 Feb 2017 11:36:27 +0000 (12:36 +0100)]
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>
7 years agotest setTagGroups with empty groupids 3931/head
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 13:17:20 +0000 (14:17 +0100)]
test setTagGroups with empty groupids

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agodon't store empty groupids
Jörn Friedrich Dreyer [Thu, 2 Mar 2017 10:36:20 +0000 (11:36 +0100)]
don't store empty groupids

gives an exception on oracle and shouldn't be added in the first place

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agotrigger event on input autofill 3932/head
Felix Heidecke [Mon, 27 Feb 2017 21:49:42 +0000 (22:49 +0100)]
trigger event on input autofill

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 20 Mar 2017 01:07:43 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3907 from nextcloud/port-more-db-stuff
Morris Jobke [Sun, 19 Mar 2017 22:29:50 +0000 (16:29 -0600)]
Merge pull request #3907 from nextcloud/port-more-db-stuff

Use SystemConfig instead of AllConfig for DB stuff

7 years agoUse SystemConfig instead of AllConfig for DB stuff 3907/head
Morris Jobke [Fri, 17 Mar 2017 22:37:48 +0000 (16:37 -0600)]
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>
7 years agoMerge pull request #3927 from nextcloud/minor-fixes
Morris Jobke [Sun, 19 Mar 2017 21:49:38 +0000 (15:49 -0600)]
Merge pull request #3927 from nextcloud/minor-fixes

Namespace and array syntax fixes

7 years agoNamespace and array syntax fixes 3927/head
Morris Jobke [Sun, 19 Mar 2017 20:52:54 +0000 (14:52 -0600)]
Namespace and array syntax fixes

* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3906 from nextcloud/shares-circles-2
Roeland Jago Douma [Sun, 19 Mar 2017 19:45:55 +0000 (20:45 +0100)]
Merge pull request #3906 from nextcloud/shares-circles-2

Support Circles

7 years agoFix duplicate id "apps-management" 3917/head
Michael Letzgus [Sun, 19 Mar 2017 15:17:26 +0000 (16:17 +0100)]
Fix duplicate id "apps-management"

Change CSS from #apps-management to .apps-management

Signed-off-by: Michael Letzgus <michaelletzgus@users.noreply.github.com>
7 years agoFix avatar and caret position 3919/head
Michael Letzgus [Sun, 19 Mar 2017 14:19:11 +0000 (15:19 +0100)]
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>
7 years agoMerge pull request #3913 from cwickert/master
Roeland Jago Douma [Sun, 19 Mar 2017 13:08:34 +0000 (14:08 +0100)]
Merge pull request #3913 from cwickert/master

DummyGetResponsePlugin: ownCloud -> Nexcloud

7 years agoFix duplicate id "apps-management"
Michael Letzgus [Sun, 19 Mar 2017 11:23:20 +0000 (12:23 +0100)]
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 19 Mar 2017 01:08:20 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoDummyGetResponsePlugin: ownCloud -> Nexcloud 3913/head
Christoph Wickert [Sat, 18 Mar 2017 11:59:25 +0000 (12:59 +0100)]
DummyGetResponsePlugin: ownCloud -> Nexcloud

Signed-off-by: Christoph Wickert <cwickert@suse.de>
7 years agoMerge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error
Lukas Reschke [Sat, 18 Mar 2017 09:47:57 +0000 (10:47 +0100)]
Merge pull request #3899 from nextcloud/issue-3662-not-sending-is-an-error

Fail when the test mail could not be sent

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Mar 2017 01:07:50 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url
Lukas Reschke [Fri, 17 Mar 2017 23:01:17 +0000 (00:01 +0100)]
Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url

Always suggest the overwrite.cli.url

7 years agoshares-circles 3906/head
Maxence Lange [Fri, 17 Mar 2017 19:48:33 +0000 (18:48 -0100)]
shares-circles

Signed-off-by: Maxence Lange <maxence@nextcloud.com>
7 years agoMerge pull request #3904 from nextcloud/revert-3893-downstream-27069
Morris Jobke [Fri, 17 Mar 2017 18:06:46 +0000 (12:06 -0600)]
Merge pull request #3904 from nextcloud/revert-3893-downstream-27069

Revert "Add integration test for trashbin"

7 years agoRevert "Add integration test for trashbin" 3904/head
Morris Jobke [Fri, 17 Mar 2017 18:06:16 +0000 (12:06 -0600)]
Revert "Add integration test for trashbin"

7 years agoMerge pull request #3887 from nextcloud/downstream-26379
Morris Jobke [Fri, 17 Mar 2017 15:16:19 +0000 (09:16 -0600)]
Merge pull request #3887 from nextcloud/downstream-26379

Add CleanupRemoteStorages command

7 years agoMerge pull request #3892 from nextcloud/downstream-27101
Joas Schilling [Fri, 17 Mar 2017 12:56:36 +0000 (13:56 +0100)]
Merge pull request #3892 from nextcloud/downstream-27101

Redirect unlink to rmdir

7 years agoMerge pull request #3881 from nextcloud/downstream-26842
Joas Schilling [Fri, 17 Mar 2017 12:53:04 +0000 (13:53 +0100)]
Merge pull request #3881 from nextcloud/downstream-26842

Backbone Webdav Adapter MKCOL support

7 years agoFail when the test mail could not be sent 3899/head
Joas Schilling [Fri, 17 Mar 2017 12:45:25 +0000 (13:45 +0100)]
Fail when the test mail could not be sent

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlways suggest the overwrite.cli.url 3898/head
Joas Schilling [Fri, 17 Mar 2017 12:34:23 +0000 (13:34 +0100)]
Always suggest the overwrite.cli.url

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3883 from nextcloud/downstream-26968
blizzz [Fri, 17 Mar 2017 10:33:50 +0000 (11:33 +0100)]
Merge pull request #3883 from nextcloud/downstream-26968

Ignore exception when deleting keys of deleted user

7 years agoMerge pull request #3878 from nextcloud/downstream-26303
Joas Schilling [Fri, 17 Mar 2017 10:10:21 +0000 (11:10 +0100)]
Merge pull request #3878 from nextcloud/downstream-26303

Fixed failing test which was ignoring a required (not null) column

7 years agoCleanup test 3892/head
Joas Schilling [Fri, 17 Mar 2017 09:59:53 +0000 (10:59 +0100)]
Cleanup test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix unit test
Joas Schilling [Fri, 17 Mar 2017 09:39:08 +0000 (10:39 +0100)]
Fix unit test

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3893 from nextcloud/downstream-27069
Roeland Jago Douma [Fri, 17 Mar 2017 09:10:00 +0000 (10:10 +0100)]
Merge pull request #3893 from nextcloud/downstream-27069

Add integration test for trashbin

7 years agoMerge pull request #3885 from nextcloud/downstream-26529
Joas Schilling [Fri, 17 Mar 2017 09:06:58 +0000 (10:06 +0100)]
Merge pull request #3885 from nextcloud/downstream-26529

Skip FailedStorage in background scan

7 years agoMerge pull request #3886 from nextcloud/downstream-26995
Joas Schilling [Fri, 17 Mar 2017 09:05:25 +0000 (10:05 +0100)]
Merge pull request #3886 from nextcloud/downstream-26995

Chunking NG: Assemble in natural sort order of files

7 years agoSafer queries 3887/head
Joas Schilling [Fri, 17 Mar 2017 08:59:56 +0000 (09:59 +0100)]
Safer queries

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoBetter output
Joas Schilling [Fri, 17 Mar 2017 08:59:25 +0000 (09:59 +0100)]
Better output

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3894 from nextcloud/downstream-27008
Joas Schilling [Fri, 17 Mar 2017 08:17:36 +0000 (09:17 +0100)]
Merge pull request #3894 from nextcloud/downstream-27008

Integration test check download without saving file locally

7 years agoMerge pull request #3856 from nextcloud/escape-likes-in-database-user-backend
Roeland Jago Douma [Fri, 17 Mar 2017 07:53:10 +0000 (08:53 +0100)]
Merge pull request #3856 from nextcloud/escape-likes-in-database-user-backend

Escape like parameters in database user backend

7 years agoMerge pull request #3870 from nextcloud/add-base-uri-to-csp-policy
Roeland Jago Douma [Fri, 17 Mar 2017 07:39:02 +0000 (08:39 +0100)]
Merge pull request #3870 from nextcloud/add-base-uri-to-csp-policy

Add base-uri to CSP policy

7 years agoMerge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution
Roeland Jago Douma [Fri, 17 Mar 2017 07:31:12 +0000 (08:31 +0100)]
Merge pull request #3874 from nextcloud/harden-js-by-disabling-eval-execution

Harden JS by disabling jQuery eval

7 years agoMerge pull request #3875 from nextcloud/use-new-short-urls
Roeland Jago Douma [Fri, 17 Mar 2017 07:30:07 +0000 (08:30 +0100)]
Merge pull request #3875 from nextcloud/use-new-short-urls

Use cleaner social media URLs

7 years agoAdd CleanupRemoteStorages command
Jörn Friedrich Dreyer [Wed, 12 Oct 2016 10:59:13 +0000 (12:59 +0200)]
Add CleanupRemoteStorages command

cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFixed failing test which was ignoring a required (not null) column (#26303) 3878/head
Philipp Schaffrath [Tue, 10 Jan 2017 11:10:36 +0000 (12:10 +0100)]
Fixed failing test which was ignoring a required (not null) column (#26303)

* Fixed failing test which was ignoring a required (not null) column

* restored test to original, catching DriverException which also catches ConstraintViolationException

* catch ConstraintViolationException again

* removed unnecessary field from this test

* clobfield should be nullable

* clobfield now is nullable

* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does

* this field does not auto increment anymore

* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoBackbone Webdav Adapter MKCOL support 3881/head
Vincent Petry [Thu, 15 Dec 2016 14:11:56 +0000 (15:11 +0100)]
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>
7 years agoIgnore exception when deleting keys of deleted user 3883/head
Vincent Petry [Wed, 18 Jan 2017 16:42:07 +0000 (17:42 +0100)]
Ignore exception when deleting keys of deleted user

Whenever a user was deleted for encryption where the keys are stored in
the home, we can ignore user existence exceptions because it means the
keys are already gone.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoSkip FailedStorage in background scan 3885/head
Vincent Petry [Wed, 2 Nov 2016 17:04:17 +0000 (18:04 +0100)]
Skip FailedStorage in background scan

The background job that scans storages must skip failed storages to
avoid potential exceptions, especially when the failed storage comes
from a shared storage where the source is not accessible.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoChunking NG: Assemble in natural sort order of files 3886/head
Markus Goetz [Fri, 20 Jan 2017 16:46:04 +0000 (17:46 +0100)]
Chunking NG: Assemble in natural sort order of files

For https://github.com/owncloud/client/pull/5476

Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc.

As per the spec "The name of every chunk should be its chunk number."
https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoIntegration test check download without saving file locally 3894/head
Vincent Petry [Tue, 24 Jan 2017 06:32:47 +0000 (07:32 +0100)]
Integration test check download without saving file locally

Use Guzzle stream mode to download the contents instead of using a
temporary local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd drone.yml config 3893/head
Morris Jobke [Fri, 17 Mar 2017 05:54:13 +0000 (23:54 -0600)]
Add drone.yml config

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd integration test for trashbin
Vincent Petry [Wed, 1 Feb 2017 09:54:10 +0000 (10:54 +0100)]
Add integration test for trashbin

Add test for basic deletion.
Add test when deleting from shared folder as recipient.
Add test to check that metadata stays when moving out of shared folder
as recipient.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRedirect unlink to rmdir (#27101)
Vincent Petry [Wed, 8 Feb 2017 14:56:34 +0000 (15:56 +0100)]
Redirect unlink to rmdir (#27101)

Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2824 from nextcloud/ext-storage-expireversions
Morris Jobke [Fri, 17 Mar 2017 05:00:55 +0000 (23:00 -0600)]
Merge pull request #2824 from nextcloud/ext-storage-expireversions

Properly expire ext storage versions (#26601)

7 years agoMerge pull request #3619 from nextcloud/fix-scss-for-apps
Morris Jobke [Fri, 17 Mar 2017 04:51:31 +0000 (22:51 -0600)]
Merge pull request #3619 from nextcloud/fix-scss-for-apps

Fix SCSS usage in apps

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 17 Mar 2017 01:07:41 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoUse cleaner social media URLs 3875/head
Lukas Reschke [Thu, 16 Mar 2017 22:45:49 +0000 (23:45 +0100)]
Use cleaner social media URLs

We now have nice cleaner URLs since a longer time, let's use them.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3679 from nextcloud/socialsharing
Lukas Reschke [Thu, 16 Mar 2017 22:08:47 +0000 (23:08 +0100)]
Merge pull request #3679 from nextcloud/socialsharing

Add social sharing

7 years agoHarden JS by disabling jQuery eval 3874/head
Lukas Reschke [Thu, 16 Mar 2017 22:03:02 +0000 (23:03 +0100)]
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>
7 years agoMerge pull request #3862 from nextcloud/dont-set-the-status-twice
Lukas Reschke [Thu, 16 Mar 2017 21:05:47 +0000 (22:05 +0100)]
Merge pull request #3862 from nextcloud/dont-set-the-status-twice

Don't set the HTTP status twice

7 years agoDon't call function in constructor 3856/head
Lukas Reschke [Thu, 16 Mar 2017 20:59:47 +0000 (21:59 +0100)]
Don't call function in constructor

The constructor is iniitiated already very early in base.php, thus requiring this here will break the setup and some more. For now we probably have to live with a static function call here thus.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdjust integration test 3870/head
Lukas Reschke [Thu, 16 Mar 2017 19:51:40 +0000 (20:51 +0100)]
Adjust integration test

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3008 from nextcloud/appmenu-experiment
Morris Jobke [Thu, 16 Mar 2017 19:03:41 +0000 (13:03 -0600)]
Merge pull request #3008 from nextcloud/appmenu-experiment

Show apps in header

7 years agoAdjust tests to include base-uri
Lukas Reschke [Thu, 16 Mar 2017 17:12:10 +0000 (18:12 +0100)]
Adjust tests to include base-uri

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3863 from nextcloud/additional-hardening-of-t
Roeland Jago Douma [Thu, 16 Mar 2017 14:54:04 +0000 (15:54 +0100)]
Merge pull request #3863 from nextcloud/additional-hardening-of-t

Harden t() with DOMPurify

7 years agoAdd base-uri to CSP policy
Lukas Reschke [Thu, 16 Mar 2017 14:16:20 +0000 (15:16 +0100)]
Add base-uri to CSP policy

As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoHarden t() with DOMPurify 3863/head
Lukas Reschke [Thu, 16 Mar 2017 12:47:27 +0000 (13:47 +0100)]
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>
7 years agoMerge pull request #3860 from nextcloud/fix_master_after_3802
Lukas Reschke [Thu, 16 Mar 2017 13:08:32 +0000 (14:08 +0100)]
Merge pull request #3860 from nextcloud/fix_master_after_3802

Fix unit tests of master

7 years agoDon't set the HTTP status twice 3862/head
Joas Schilling [Thu, 16 Mar 2017 12:35:41 +0000 (13:35 +0100)]
Don't set the HTTP status twice

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix unit tests of master 3860/head
Roeland Jago Douma [Thu, 16 Mar 2017 11:30:21 +0000 (12:30 +0100)]
Fix unit tests of master

Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3802 from Ko-/master
Roeland Jago Douma [Thu, 16 Mar 2017 11:27:26 +0000 (12:27 +0100)]
Merge pull request #3802 from Ko-/master

Check that set_time_limit is not disabled before calling it

7 years agoMerge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invit...
Joas Schilling [Thu, 16 Mar 2017 11:14:32 +0000 (12:14 +0100)]
Merge pull request #3857 from nextcloud/issue-3901-legacy-caldav-endpoint-email-invitations

Fix scheduling plugin on legacy caldav endpoint

7 years agoFix html formating issues 3008/head
Julius Haertl [Fri, 3 Mar 2017 14:09:21 +0000 (15:09 +0100)]
Fix html formating issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoRebuild menu to keep order of icons correct
Julius Haertl [Fri, 3 Mar 2017 14:09:08 +0000 (15:09 +0100)]
Rebuild menu to keep order of icons correct

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoReduce device width and hide app name when menu is open
Julius Haertl [Fri, 3 Mar 2017 12:16:30 +0000 (13:16 +0100)]
Reduce device width and hide app name when menu is open

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake enabling/disabling apps work with the new menu
Julius Haertl [Fri, 3 Mar 2017 12:00:37 +0000 (13:00 +0100)]
Make enabling/disabling apps work with the new menu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix positioning of popovermenu
Julius Haertl [Fri, 3 Mar 2017 12:00:10 +0000 (13:00 +0100)]
Fix positioning of popovermenu

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix popover positioning after window resize
Julius Haertl [Fri, 3 Mar 2017 01:09:49 +0000 (02:09 +0100)]
Fix popover positioning after window resize

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoCleanup SCSS for app menu and fix mobile view
Julius Haertl [Fri, 3 Mar 2017 01:09:24 +0000 (02:09 +0100)]
Cleanup SCSS for app menu and fix mobile view

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMake app management icon act like a normal app icon
Julius Haertl [Wed, 1 Mar 2017 22:57:16 +0000 (23:57 +0100)]
Make app management icon act like a normal app icon

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoFix menu issues
Julius Haertl [Wed, 1 Mar 2017 22:21:38 +0000 (23:21 +0100)]
Fix menu issues

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoGenerate seperate menu list for header bar
Julius Haertl [Wed, 1 Mar 2017 22:04:27 +0000 (23:04 +0100)]
Generate seperate menu list for header bar

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoMove active app to the first slot
Julius Haertl [Wed, 11 Jan 2017 11:34:49 +0000 (12:34 +0100)]
Move active app to the first slot

Signed-off-by: Julius Haertl <jus@bitgrid.net>
7 years agoShow app icons in the header
Julius Haertl [Sun, 18 Dec 2016 14:05:39 +0000 (15:05 +0100)]
Show app icons in the header

Signed-off-by: Julius Haertl <jus@bitgrid.net>