]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #4025 from nextcloud/downstream-27292
Roeland Jago Douma [Fri, 24 Mar 2017 07:44:42 +0000 (08:44 +0100)]
Merge pull request #4025 from nextcloud/downstream-27292

Update karma

7 years agoMerge pull request #3928 from nextcloud/downstream-17978
Morris Jobke [Fri, 24 Mar 2017 05:45:43 +0000 (23:45 -0600)]
Merge pull request #3928 from nextcloud/downstream-17978

Adjust 4 byte MySQL code to upstream

7 years agoMerge pull request #3889 from nextcloud/downstream-26950
Morris Jobke [Fri, 24 Mar 2017 05:45:28 +0000 (23:45 -0600)]
Merge pull request #3889 from nextcloud/downstream-26950

Sharing dialog: make autocomplete sorting case insensitive

7 years agoalso install sinon 4025/head
Morris Jobke [Fri, 24 Mar 2017 05:42:54 +0000 (23:42 -0600)]
also install sinon

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoProperly clear heartbeat interval
Vincent Petry [Thu, 2 Mar 2017 09:11:56 +0000 (10:11 +0100)]
Properly clear heartbeat interval

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate karma, use sinon from npm
Vincent Petry [Thu, 2 Mar 2017 09:11:23 +0000 (10:11 +0100)]
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>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 24 Mar 2017 01:08:00 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3879 from nextcloud/downstream-26915
Morris Jobke [Thu, 23 Mar 2017 22:12:24 +0000 (16:12 -0600)]
Merge pull request #3879 from nextcloud/downstream-26915

Added integration tests for sharees using v2.php

7 years agoMerge pull request #4007 from nextcloud/backport-27155
Morris Jobke [Thu, 23 Mar 2017 21:56:18 +0000 (15:56 -0600)]
Merge pull request #4007 from nextcloud/backport-27155

Change showTemporary notifications for closable ones

7 years agofix sorting in the backend 3889/head
Morris Jobke [Wed, 22 Mar 2017 23:11:09 +0000 (17:11 -0600)]
fix sorting in the backend

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoImprove error message of charset convert script and behaviour 3928/head
Morris Jobke [Thu, 23 Mar 2017 21:36:22 +0000 (15:36 -0600)]
Improve error message of charset convert script and behaviour

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3953 from nextcloud/downstream-27027
Morris Jobke [Thu, 23 Mar 2017 21:26:43 +0000 (15:26 -0600)]
Merge pull request #3953 from nextcloud/downstream-27027

Ignore NoUserException for shares from ghosts

7 years agoMerge pull request #3850 from nextcloud/search-order
Morris Jobke [Thu, 23 Mar 2017 21:25:27 +0000 (15:25 -0600)]
Merge pull request #3850 from nextcloud/search-order

Fix search ordering

7 years agoFix search ordering 3850/head
Robin Appelman [Wed, 15 Mar 2017 13:46:23 +0000 (14:46 +0100)]
Fix search ordering

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3965 from nextcloud/downstream-27343
Morris Jobke [Thu, 23 Mar 2017 21:20:53 +0000 (15:20 -0600)]
Merge pull request #3965 from nextcloud/downstream-27343

Providing --path option to transfer-ownership

7 years agoMerge pull request #3998 from nextcloud/backport-27032
Roeland Jago Douma [Thu, 23 Mar 2017 20:59:39 +0000 (21:59 +0100)]
Merge pull request #3998 from nextcloud/backport-27032

Use the expected method depending on the target being a file or folder

7 years agoadded quit option in commentstabview.js 4007/head
noveens [Tue, 14 Feb 2017 20:26:00 +0000 (01:56 +0530)]
added quit option in commentstabview.js

added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4001 from nextcloud/backport-27389
Morris Jobke [Thu, 23 Mar 2017 19:00:49 +0000 (13:00 -0600)]
Merge pull request #4001 from nextcloud/backport-27389

Ensure that FileInfo return values as required by its phpdoc.

7 years agoMerge pull request #4000 from nextcloud/backport-27216
Lukas Reschke [Thu, 23 Mar 2017 18:28:49 +0000 (19:28 +0100)]
Merge pull request #4000 from nextcloud/backport-27216

allow configuring authType for DAV backend

7 years agoMake deleting a group compatible with ocs v2 3879/head
Joas Schilling [Thu, 23 Mar 2017 18:24:02 +0000 (19:24 +0100)]
Make deleting a group compatible with ocs v2

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix type hints and doc blocks 4001/head
Joas Schilling [Thu, 23 Mar 2017 16:52:47 +0000 (17:52 +0100)]
Fix type hints and doc blocks

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoset cache to failedcache when shared storage init fails 3953/head
Robin Appelman [Thu, 23 Mar 2017 14:01:23 +0000 (15:01 +0100)]
set cache to failedcache when shared storage init fails

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3995 from nextcloud/files_scan_appdata
Lukas Reschke [Thu, 23 Mar 2017 11:28:55 +0000 (12:28 +0100)]
Merge pull request #3995 from nextcloud/files_scan_appdata

Add files:scanAppData command

7 years agoMerge pull request #3948 from nextcloud/downstream-27271
Lukas Reschke [Thu, 23 Mar 2017 10:57:34 +0000 (11:57 +0100)]
Merge pull request #3948 from nextcloud/downstream-27271

Tooltip in trashbin with previous location

7 years agoMerge pull request #3978 from nextcloud/scss_deps_memcache
Lukas Reschke [Thu, 23 Mar 2017 10:56:35 +0000 (11:56 +0100)]
Merge pull request #3978 from nextcloud/scss_deps_memcache

Cache SCSS dependency file in memcache

7 years agoMerge pull request #3989 from nextcloud/files-external-save-button
Lukas Reschke [Thu, 23 Mar 2017 10:55:36 +0000 (11:55 +0100)]
Merge pull request #3989 from nextcloud/files-external-save-button

replace autosave with a save button for external storage configuration

7 years agoMerge pull request #3994 from nextcloud/only_init_backbone_once
Lukas Reschke [Thu, 23 Mar 2017 10:54:54 +0000 (11:54 +0100)]
Merge pull request #3994 from nextcloud/only_init_backbone_once

Only initialize backbone once

7 years agoMerge pull request #3997 from nextcloud/backport-27353
Roeland Jago Douma [Thu, 23 Mar 2017 07:36:23 +0000 (08:36 +0100)]
Merge pull request #3997 from nextcloud/backport-27353

Update davclient.js to 0.1.1

7 years agoMerge pull request #3999 from nextcloud/backport-27262
Morris Jobke [Thu, 23 Mar 2017 06:25:59 +0000 (00:25 -0600)]
Merge pull request #3999 from nextcloud/backport-27262

Updated UI messages relating to the encryption functionality

7 years agoEnsure that FileInfo return values as required by its phpdoc.
Piotr M [Tue, 14 Mar 2017 23:59:48 +0000 (00:59 +0100)]
Ensure that FileInfo return values as required by its phpdoc.

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

7 years agoallow configuring authType for DAV backend 4000/head
Jörn Friedrich Dreyer [Wed, 22 Feb 2017 20:47:49 +0000 (21:47 +0100)]
allow configuring authType for DAV backend

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdated UI messages relating to the encryption functionality 3999/head
Matthew Setter [Mon, 27 Feb 2017 09:16:57 +0000 (10:16 +0100)]
Updated UI messages relating to the encryption functionality

The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse the expected method depending on the target being a file or folder 3998/head
Juan Pablo Villafáñez [Wed, 25 Jan 2017 16:21:20 +0000 (17:21 +0100)]
Use the expected method depending on the target being a file or folder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate davclient.js to 0.1.1 3997/head
Vincent Petry [Fri, 10 Mar 2017 07:06:03 +0000 (08:06 +0100)]
Update davclient.js to 0.1.1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoimprove file transfer code 3965/head
Morris Jobke [Wed, 22 Mar 2017 23:39:08 +0000 (17:39 -0600)]
improve file transfer code

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agofix path for files from root folder 3948/head
Morris Jobke [Wed, 22 Mar 2017 23:17:37 +0000 (17:17 -0600)]
fix path for files from root folder

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUse proper name and code style 3995/head
Morris Jobke [Wed, 22 Mar 2017 21:59:55 +0000 (15:59 -0600)]
Use proper name and code style

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoOnly initialize backbone once 3994/head
Roeland Jago Douma [Wed, 22 Mar 2017 19:03:04 +0000 (20:03 +0100)]
Only initialize backbone once

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Mar 2017 21:14:04 +0000 (21:14 +0000)]
[tx-robot] updated from transifex

7 years agoAdd files:scanAppData command
Roeland Jago Douma [Wed, 22 Mar 2017 20:30:44 +0000 (21:30 +0100)]
Add files:scanAppData command

Fixes https://github.com/nextcloud/server/issues/3041

Add a dedicated command to scan the special appdata dir

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix tests 3978/head
Roeland Jago Douma [Wed, 22 Mar 2017 12:26:18 +0000 (13:26 +0100)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoCache SCSS dependency file in memcache
Roeland Jago Douma [Tue, 21 Mar 2017 20:53:20 +0000 (21:53 +0100)]
Cache SCSS dependency file in memcache

Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3497 from nextcloud/mount-shared-last
Morris Jobke [Wed, 22 Mar 2017 19:12:54 +0000 (13:12 -0600)]
Merge pull request #3497 from nextcloud/mount-shared-last

mount shared mounts last

7 years agoMerge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo
Roeland Jago Douma [Wed, 22 Mar 2017 19:10:05 +0000 (20:10 +0100)]
Merge pull request #3990 from nextcloud/remove-owncloud-root-cert-as-per-todo

Remove the ownCloud Root Authority file as well

7 years agoMerge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js
Morris Jobke [Wed, 22 Mar 2017 18:11:45 +0000 (12:11 -0600)]
Merge pull request #3992 from nextcloud/revert-3795-bundle_vendor_js

Revert "Bundle vendor js"

7 years agoFix autoloader
Morris Jobke [Wed, 22 Mar 2017 18:08:41 +0000 (12:08 -0600)]
Fix autoloader

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoadd integration test to ensure that shares dont overwrite external storages 3497/head
Robin Appelman [Wed, 22 Mar 2017 17:00:12 +0000 (18:00 +0100)]
add integration test to ensure that shares dont overwrite external storages

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agomount shared mounts last
Robin Appelman [Wed, 15 Feb 2017 14:00:21 +0000 (15:00 +0100)]
mount shared mounts last

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoRevert "Bundle vendor js" 3992/head
Roeland Jago Douma [Wed, 22 Mar 2017 16:01:54 +0000 (17:01 +0100)]
Revert "Bundle vendor js"

7 years agoMerge pull request #3977 from nextcloud/di_ng2
blizzz [Wed, 22 Mar 2017 14:36:52 +0000 (15:36 +0100)]
Merge pull request #3977 from nextcloud/di_ng2

Make DI work for all apps

7 years agoRemove the cert as well 3990/head
Joas Schilling [Wed, 22 Mar 2017 14:17:19 +0000 (15:17 +0100)]
Remove the cert as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoreplace autosave with a save button for external storage configuration 3989/head
Robin Appelman [Wed, 22 Mar 2017 13:32:26 +0000 (14:32 +0100)]
replace autosave with a save button for external storage configuration

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3795 from nextcloud/bundle_vendor_js
Roeland Jago Douma [Wed, 22 Mar 2017 12:34:21 +0000 (13:34 +0100)]
Merge pull request #3795 from nextcloud/bundle_vendor_js

Bundle vendor js

7 years agoMerge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo
Roeland Jago Douma [Wed, 22 Mar 2017 11:33:24 +0000 (12:33 +0100)]
Merge pull request #3983 from nextcloud/remove-owncloud-root-cert-as-per-todo

Remove ownCloud Root Authority as per todo

7 years agoRegister the namespace with the autoloading to allow reverse recovery 3977/head
Joas Schilling [Wed, 22 Mar 2017 10:50:58 +0000 (11:50 +0100)]
Register the namespace with the autoloading to allow reverse recovery

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAlso cache the namespace from appinfo
Joas Schilling [Wed, 22 Mar 2017 10:50:31 +0000 (11:50 +0100)]
Also cache the namespace from appinfo

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd the AppContainer
Roeland Jago Douma [Wed, 22 Mar 2017 10:24:16 +0000 (11:24 +0100)]
Add the AppContainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't do a recursive search
Joas Schilling [Wed, 22 Mar 2017 09:33:30 +0000 (10:33 +0100)]
Don't do a recursive search

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agobuildAppNamespace already has the fallback
Joas Schilling [Wed, 22 Mar 2017 09:13:14 +0000 (10:13 +0100)]
buildAppNamespace already has the fallback

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip
Roeland Jago Douma [Wed, 22 Mar 2017 08:24:40 +0000 (09:24 +0100)]
Merge pull request #3982 from nextcloud/hide-systemtag-delete-tooltip

Remove tooltip of delete button for systemtags

7 years agoHandlebars is already loaded by core.js 3795/head
Roeland Jago Douma [Wed, 22 Mar 2017 08:01:47 +0000 (09:01 +0100)]
Handlebars is already loaded by core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoWhen debug don't load the bundled file
Roeland Jago Douma [Wed, 22 Mar 2017 07:58:28 +0000 (08:58 +0100)]
When debug don't load the bundled file

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoRemove ownCloud Root Authority as per todo 3983/head
Joas Schilling [Wed, 22 Mar 2017 07:54:40 +0000 (08:54 +0100)]
Remove ownCloud Root Authority as per todo

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoNo need to exit
Roeland Jago Douma [Wed, 22 Mar 2017 07:52:49 +0000 (08:52 +0100)]
No need to exit

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBump core.js
Roeland Jago Douma [Wed, 22 Mar 2017 07:49:39 +0000 (08:49 +0100)]
Bump core.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd CI step to verify merged vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 09:45:27 +0000 (10:45 +0100)]
Add CI step to verify merged vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBundle more default vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:48:53 +0000 (09:48 +0100)]
Bundle more default vendor js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge vendor js
Roeland Jago Douma [Fri, 10 Mar 2017 08:34:29 +0000 (09:34 +0100)]
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>
7 years agoMerge pull request #3972 from nextcloud/merge-some-more-css
Roeland Jago Douma [Wed, 22 Mar 2017 07:46:10 +0000 (08:46 +0100)]
Merge pull request #3972 from nextcloud/merge-some-more-css

Merge some CSS files using our SCSS compiler

7 years agoMerge pull request #3980 from nextcloud/fix-app-menu-triangle
Christoph Wurst [Wed, 22 Mar 2017 07:43:45 +0000 (08:43 +0100)]
Merge pull request #3980 from nextcloud/fix-app-menu-triangle

Fix position of triangle in app menu

7 years agoRemove tooltip of delete button for systemtags 3982/head
Morris Jobke [Wed, 22 Mar 2017 03:49:25 +0000 (21:49 -0600)]
Remove tooltip of delete button for systemtags

* fixes #3967

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

7 years agoMerge pull request #3974 from nextcloud/fix-reshare-activity-message
Morris Jobke [Tue, 21 Mar 2017 22:55:15 +0000 (16:55 -0600)]
Merge pull request #3974 from nextcloud/fix-reshare-activity-message

Fix reshare with user activity message

7 years agoFix reshare with user activity message 3974/head
Joas Schilling [Tue, 21 Mar 2017 15:57:36 +0000 (16:57 +0100)]
Fix reshare with user activity message

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix position of triangle in app menu 3980/head
Morris Jobke [Tue, 21 Mar 2017 22:48:13 +0000 (16:48 -0600)]
Fix position of triangle in app menu

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAddress comments
Morris Jobke [Tue, 21 Mar 2017 22:08:05 +0000 (16:08 -0600)]
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>
7 years agoAdjust tests as well
Morris Jobke [Mon, 20 Mar 2017 08:29:30 +0000 (02:29 -0600)]
Adjust tests as well

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdding tests for 4 byte unicode characters
Morris Jobke [Thu, 30 Jul 2015 08:57:16 +0000 (10:57 +0200)]
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>
7 years agofix path 3972/head
Morris Jobke [Tue, 21 Mar 2017 21:33:28 +0000 (15:33 -0600)]
fix path

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMake DI work for all apps
Roeland Jago Douma [Tue, 21 Mar 2017 19:53:37 +0000 (20:53 +0100)]
Make DI work for all apps

As stated in https://github.com/nextcloud/server/pull/3901#issuecomment-288135309
appid's don't have to match the namespace.

Work around this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3937 from nextcloud/downstream-27234
Morris Jobke [Tue, 21 Mar 2017 19:18:19 +0000 (13:18 -0600)]
Merge pull request #3937 from nextcloud/downstream-27234

fix typo in sftp public key

7 years agoMerge pull request #3975 from nextcloud/remove-dead-code
Morris Jobke [Tue, 21 Mar 2017 19:17:11 +0000 (13:17 -0600)]
Merge pull request #3975 from nextcloud/remove-dead-code

Remove test code

7 years agoRemove test code 3975/head
Lukas Reschke [Tue, 21 Mar 2017 15:59:10 +0000 (16:59 +0100)]
Remove test code

This seems to have been commited by mistake with https://github.com/nextcloud/server/commit/6dbe417c51125419516dd29ebe4e529926c41a0f

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3844 from nextcloud/unshare_event
Joas Schilling [Tue, 21 Mar 2017 15:57:09 +0000 (16:57 +0100)]
Merge pull request #3844 from nextcloud/unshare_event

Unshare event

7 years agoMerge some CSS files using our SCSS compiler
Lukas Reschke [Tue, 21 Mar 2017 15:35:31 +0000 (16:35 +0100)]
Merge some CSS files using our SCSS compiler

This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3968 from nextcloud/fix-branding
Lukas Reschke [Tue, 21 Mar 2017 12:54:58 +0000 (13:54 +0100)]
Merge pull request #3968 from nextcloud/fix-branding

[master] Fix branding and show Nextcloud

7 years ago[master] Fix branding 3968/head
Lukas Reschke [Tue, 21 Mar 2017 11:20:22 +0000 (12:20 +0100)]
[master] Fix branding

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3955 from nextcloud/downstream-27113
Roeland Jago Douma [Tue, 21 Mar 2017 10:27:00 +0000 (11:27 +0100)]
Merge pull request #3955 from nextcloud/downstream-27113

Can we get some faster phpunit execution?

7 years agoMerge pull request #3901 from nextcloud/di_ng
Lukas Reschke [Tue, 21 Mar 2017 10:06:16 +0000 (11:06 +0100)]
Merge pull request #3901 from nextcloud/di_ng

Move Interface Definitions to the ServerContainer

7 years agoCore is also a special app 3901/head
Roeland Jago Douma [Tue, 21 Mar 2017 09:42:33 +0000 (10:42 +0100)]
Core is also a special app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMove a lot of stuff over to the ServerContainer
Roeland Jago Douma [Tue, 21 Mar 2017 09:00:02 +0000 (10:00 +0100)]
Move a lot of stuff over to the ServerContainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix NODB tests etc
Roeland Jago Douma [Mon, 20 Mar 2017 13:53:57 +0000 (14:53 +0100)]
Fix NODB tests etc

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix settings tests
Roeland Jago Douma [Mon, 20 Mar 2017 09:16:56 +0000 (10:16 +0100)]
Fix settings tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdd DI intergration tests
Roeland Jago Douma [Sun, 19 Mar 2017 22:14:47 +0000 (23:14 +0100)]
Add DI intergration tests

* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoExtend DI tests
Roeland Jago Douma [Sun, 19 Mar 2017 21:20:56 +0000 (22:20 +0100)]
Extend DI tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMore elegant handling of recursion
Roeland Jago Douma [Sun, 19 Mar 2017 21:09:47 +0000 (22:09 +0100)]
More elegant handling of recursion

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoPoC of moving the interface classes to the servercontainer
Roeland Jago Douma [Fri, 17 Mar 2017 13:30:46 +0000 (14:30 +0100)]
PoC of moving the interface classes to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate query method for DIContainer
Roeland Jago Douma [Fri, 17 Mar 2017 13:25:35 +0000 (14:25 +0100)]
Update query method for DIContainer

To align with https://github.com/nextcloud/server/issues/2043#issuecomment-287348294
This would mean that AppContainers only hold the AppSpecific services

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Mar 2017 01:08:16 +0000 (01:08 +0000)]
[tx-robot] updated from transifex