3adf5fe3fd
Merge pull request #2517 from vector-im/rav/upgrade_olm
...
Bump to olm 2.0.0
2016-10-26 16:50:22 +01:00
de1f7861d6
Bump to olm 2.0.0
2016-10-26 16:20:42 +01:00
5a58c8bda4
Don't include the world in the published packages
...
We ended up including all sorts of stuff in our published packages. Let's take
the opposite approach and include useful stuff rather than exclude unuseful
stuff.
2016-10-26 15:35:54 +01:00
6396c60645
Put a cachebuster in the names of CSS and JS files
...
This means that clients can do better caching of assets, as it will mean we are
no longer reliant on etags to ensure that clients get a fresh version.
We inhibit the cachebuster for `npm start`, so that we don't get millions of
copies of the bundles on dev boxes.
2016-10-26 15:20:59 +01:00
53e5894759
Merge branch 'develop' into rav/webpack_olm
2016-10-26 15:13:57 +01:00
e1919c5ea3
Don't include two copies of the CSS in the tarball
...
Aggregate our CSS into build/components.css instead of vector/components.css, so
that it isn't included in the tarball.
2016-10-26 14:43:42 +01:00
fcf683c8a7
Use webpack to copy olm.js
...
Rather than copying olm.js ourselves in package.json, get webpack to do it for
us by declaring it as a second entry point.
2016-10-26 14:29:21 +01:00
e02e0219a7
Add plugin that makes babel 6 not break everything
2016-10-17 16:28:14 +01:00
d04201d069
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-17 16:28:14 +01:00
82de2ca4ec
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-17 16:28:14 +01:00
f20b2593bc
move babelcheck.js to scripts/
2016-10-17 16:28:14 +01:00
8e0b61ca35
Reminder to restore links + stage2, not stage 0
2016-10-17 16:28:13 +01:00
61a543a694
Add babelcheck.js
...
As per 4bea0c0818
2016-10-17 16:28:13 +01:00
5608e97719
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-17 16:28:13 +01:00
d6f27add66
Upgrade to babel6 and enable some presets.
2016-10-17 16:28:13 +01:00
ea09a25563
Revert "Switch to babel 6"
2016-10-14 18:50:22 +01:00
40ac80a3e9
Replace stage & es2017 with specific plugins
...
Also sort out regenerator runtime as it turns out importing
babel-polyfill in your code is insufficient if using webpack
because it's imported too late, so use both that and
regenerator-runtime. Sigh.
2016-10-14 18:03:22 +01:00
5f747e1a90
Remove transform-runtime
...
We use instance methods (or at least, draft.js does) so we need
babel-polyfill instead.
2016-10-13 10:57:10 +01:00
e6caf9ece4
move babelcheck.js to scripts/
2016-10-13 09:50:40 +01:00
5ff915476a
Reminder to restore links + stage2, not stage 0
2016-10-12 18:08:52 +01:00
e5d2ebc57c
Add babelcheck.js
...
As per 4bea0c0818
2016-10-12 17:46:11 +01:00
64815b1b0b
Remove babel-polyfill
...
Should be no need for it if we're using transform-runtime (and
we definitely don't need it twice...)
2016-10-12 17:23:01 +01:00
59120d3019
Merge branch 'babelrc' of https://github.com/aviraldg/vector-web into aviraldg-babelrc
2016-10-12 17:17:10 +01:00
9245ab01f1
js-sdk & react-sdk develop
2016-10-12 11:52:18 +01:00
59fe9279d1
0.8.3
2016-10-12 11:49:58 +01:00
bca22f26c5
js-sdk & react-sdk release versions
2016-10-12 11:49:21 +01:00
cd7adfed0a
Back to develop react & js sdk
2016-10-05 16:59:25 +01:00
902bf3a0a6
0.8.2
2016-10-05 16:55:45 +01:00
fb2c2ed09a
Use released version of react-sdk & js-sdk
2016-10-05 16:54:24 +01:00
52cae92dd7
Update to linkify 2.1.3
...
To pull in https://github.com/SoapBox/linkifyjs/pull/166
2016-10-04 11:28:28 +01:00
9174b32ef1
Upgrade to babel6 and enable some presets.
2016-10-02 17:28:24 +05:30
f4a6a3c4b2
Update linkify version
...
Fixes https://github.com/vector-im/vector-web/issues/2357
In addition, https://github.com/matrix-org/matrix-react-sdk/pull/500 will make sure failures like this are obvious.
2016-09-27 10:40:02 +01:00
99b0f9eb7c
Back to develop
2016-09-21 17:33:27 +01:00
5248bdd974
0.8.1
2016-09-21 17:30:41 +01:00
2639d10f97
Pin to released js-sdk & react-sdk
2016-09-21 17:29:44 +01:00
cc5c636fa5
Back to develop versions
2016-09-21 12:03:59 +01:00
c4a2df75eb
0.8.0
2016-09-21 12:02:41 +01:00
3eed711b34
Use released versions
2016-09-21 12:01:59 +01:00
f6fb1561d7
Update the version of olm to 1.3.0
2016-09-15 11:33:37 +01:00
d65b791b2b
bump draft-js to 0.8.1 (as with matrix-react-sdk)
2016-09-12 18:31:22 +05:30
31dd49ffd7
Bump to olm 1.2.0
2016-09-06 22:33:21 +01:00
0494dff545
Merge branch 'master' into develop
2016-09-02 17:23:02 +01:00
e63e6e7016
0.7.5-r3
2016-09-02 17:21:30 +01:00
dec62ab92c
bump react-sdk
2016-09-02 17:20:23 +01:00
6c8a492637
Bump to olm 1.1.0
...
Olm 1.0.0 made broken OlmAccounts.
2016-09-02 12:01:27 +01:00
9709a38250
merge master
2016-09-01 22:38:40 +01:00
06ca94c1e6
0.7.5-r2
2016-09-01 22:29:36 +01:00
a20962ac14
bump to react-sdk v0.6.5-r1
2016-09-01 22:28:39 +01:00
a2694113d3
Merge pull request #2009 from vector-im/rav/enable_react_checks
...
Turn react consistency checks back on in develop builds
2016-08-30 14:57:49 +01:00
c7eba0f292
repin deps to dev
2016-08-30 13:52:35 +01:00
5f233d75f2
0.7.5-r1
2016-08-28 18:09:20 +01:00
45c013f2f2
0.7.5
2016-08-28 18:07:33 +01:00
ef8f9ecbf3
pin matrix-js-sdk and matrix-react-sdk deps for release
2016-08-28 17:36:57 +01:00
abca5faf78
pin linkifyjs to precisely 2.0.0-beta4, as 2.0.0-beta9 breaks links as per https://github.com/vector-im/vector-web/issues/2010
2016-08-25 18:30:35 +01:00
21ffe22375
Turn react consistency checks back on in develop builds
...
The react checks are useful on /develop, to catch programming errors earlier,
and the original reason for turning them off (so that we could meaningfully
compare performance between /develop and /beta) is no longer so
relevant.
This reverts commit b5f029d10e
2016-08-25 17:06:12 +01:00
4c9ade5ecb
Use cpx to copy olm.js, and add watcher
...
We are now using `cpx` to copy the emojione files, so we might as well use it
for olm.js, rather than rolling our own - particularly since that makes it easy
to add a watcher for `npm start`.
We have to add a `-L` to the `cpx` invocation, otherwise, if olm is a
symlink (as is useful for development), cpx ends up watching the symlink, which
obviously never changes.
2016-08-15 12:16:08 +01:00
1d435890af
Unpin react-sdk and js-sdk
2016-08-15 12:15:24 +01:00
8a2b2daad7
Revert "Unpin react-sdk and js-sdk"
...
I messed this up and removed staticfiles.js by accident
This reverts commit 21334cab28
2016-08-15 12:13:58 +01:00
21334cab28
Unpin react-sdk and js-sdk
2016-08-15 12:11:35 +01:00
0afdf5d8e4
Merge pull request #1959 from vector-im/rav/device_display_name
...
Make up a device display name
2016-08-12 11:48:12 +01:00
3a819a29b7
Make up a device display name
...
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
9d77fab18f
0.7.4-r1
2016-08-12 10:11:40 +01:00
5512fd4220
Bump to matrix-react-sdk 0.6.4-r1
2016-08-12 10:09:53 +01:00
25d8a7999f
0.7.4
2016-08-11 17:47:17 +01:00
2b671fcafc
js-sdk & react sdk released
2016-08-11 17:45:10 +01:00
19d5063814
Merge branch 'develop' into fix-emoji
2016-08-11 14:51:17 +05:30
bd9f5d3e06
Various fixes and improvements to emojification.
...
- Use locally hosted emoji
- Emojify SenderProfile and m.emote
- Fix emoji spacing
2016-08-09 21:44:09 +05:30
51b74251f9
Exclude olm from the webpack
...
Olm takes *ages* to webpack, and it doesn't compress well. So, serve it as a
separate asset to the browser.
2016-08-02 12:44:23 +01:00
4b33164ab6
Remove relayoutOnUpdate prop on gemini-scrollbar
...
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:41:27 +01:00
53fe372a0c
Bump to react 15.2.1
...
This should also stop npm complaining about invalid peerDependencies.
2016-07-22 10:47:09 +01:00
4cb04d1e40
Bump to latest react-gemini-scrollbar
...
I've updated our forks of the gemini-scrollbar project to latest upstream.
2016-07-22 10:46:38 +01:00
3e53879adc
Bump to olm 1.0.0
...
Fixes https://github.com/vector-im/vector-web/issues/1719
2016-07-11 14:53:51 +01:00
4c6fa740f3
package.json: add olm as optionalDependency
...
Add olm as an optionalDependency to vector, so that the webpack config can find
it and include it in the bundle.
2016-06-20 15:10:19 +01:00
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
7999a70cab
Switch to dev versions of react-sdk and js-sdk
2016-06-08 21:36:45 +01:00
c6cf5febd5
Merge pull request #1516 from vith/static-config-json
...
serve config.json statically instead of bundling it
2016-06-06 19:15:35 +01:00
c672919d1e
0.7.3
2016-06-03 12:20:05 +01:00
e68a2b5e1d
pin to react sdk 0.6.3 for release
2016-06-03 12:19:04 +01:00
ddc4ac187c
dep on react-sdk develop
2016-06-02 23:32:47 +01:00
ded66bbdfc
0.7.2
2016-06-02 19:05:50 +01:00
4ec77eeca7
correctly bump dep on js-sdk and react-sdk
2016-06-02 19:04:22 +01:00
635fd927cd
0.7.1
2016-06-02 18:41:20 +01:00
e0bf23fa7c
0.7.0
2016-06-02 13:42:25 +01:00
f6ec858ac9
Bump js-sdk and react-sdk for new releases
...
js-sdk 0.5.3
react-sdk 0.6.0
2016-06-02 13:40:15 +01:00
7e563b89c7
initial version of rich text editor
2016-05-27 10:17:01 +05:30
6a6118e136
serve config.json statically instead of bundling it
...
issue #1344
2016-05-24 19:08:09 -05:00
4f64f70a12
Use react-sdk develop as email notifs needs it
2016-05-10 17:35:35 +02:00
4cddda67d9
0.6.1
2016-04-22 11:35:51 +01:00
ee88fe55c1
Bump to react-sdk 0.5.2
2016-04-22 11:30:33 +01:00
b8018942fc
Bump react-gemini-scrollbar
...
(to pick up a non-broken version)
2016-04-20 13:46:59 +01:00
02f58ef9e3
Don't relayout scrollpanels every time something changes
...
Gemini's habit of reflowing everything everytime anything changes at all makes
for an unresponsive app. Turn it off everywhere we use gemini.
2016-04-20 12:29:32 +01:00
b5f029d10e
Turn react consistency checks off in develop builds
...
For now at least, turn off the consistency checks in build:dev, and hence in
/develop. This will allow us to more meaningfully compare performance between
/beta and /develop.
2016-04-19 20:28:29 +01:00
caff20cbb3
Merge pull request #1431 from vector-im/rav/reactperf
...
Include react-addons-perf for non-production builds
2016-04-19 19:28:15 +01:00
e71ca328e7
Switch back to dev builds of the react-sdk and js-sdk
2016-04-19 18:32:35 +01:00
a0b460b084
Include react-addons-perf for non-production builds
...
This makes it possible to gather a few performance stats
2016-04-19 15:01:24 +01:00
abca28c80b
0.6.0
2016-04-19 13:39:40 +01:00
da7909f1ce
Bump to release versions of js-sdk and react-sdk
...
... in preparation for vector release.
2016-04-19 13:36:25 +01:00
210cb31852
Upgrade to react 15.0
...
(which also requires upgrades to react-gemini-scrollbar and react-dnd)
2016-04-17 21:41:50 +01:00
5cdd234bf2
Do less mangling of jenkins builds
...
This turns off uglification, and turns on the react sanity checks.
2016-04-14 15:05:36 +01:00
cb3ae0e069
Disable autoWatch for npm test
...
... we're only going to run the tests once, so there is no need to tell webpack
to watch the sources. This saves a spurious repack.
2016-04-13 18:13:57 +01:00
bf31d6d5fa
Karma test tweaks
...
* Make sure we only get one js-sdk (and update runtime config to match)
* Don't verifyNoOutstandingRequests (since it is hard to be certain which we
will get, and makes the tests too dependent on implementation-specifics).
* Disable color for npm test, to avoid confusing Jenkins
2016-04-13 17:41:23 +01:00
322af6513d
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 17:20:06 +01:00
69ce3c43cf
Revert "Merge branch 'develop' into rav/karma"
...
The karma tests don't pass yet, and aren't ready to land on develop.
This reverts commit 438453e61a50f94eb040
2016-04-13 17:17:45 +01:00
429d110212
Run some tests under karma
...
Including a regression test for
https://github.com/vector-im/vector-web/issues/1314
2016-04-13 10:15:04 +01:00
bf055688b7
Switch js-sdk and react-sdk back to develop
2016-03-31 16:35:38 +01:00
00a92452e8
0.5.0
2016-03-30 13:31:09 +01:00
20f93e761b
Bump to react-sdk 0.4.0 and js-sdk 0.5.1.
2016-03-30 13:27:55 +01:00
2462ede539
Switch to dev versions of react-sdk and js-sdk
2016-03-24 17:39:49 +00:00
4507117f89
0.4.1
2016-03-23 14:58:30 +00:00
5138dc9fd8
Bump to react-sdk 0.3.1
...
Disables ScrollPanel debug.
2016-03-23 14:56:22 +00:00
c12a77bc15
0.4.0
2016-03-23 14:40:16 +00:00
752f8363a7
Bump to release versions of react-sdk and js-sdk
2016-03-23 14:14:07 +00:00
948b862c31
Bump gemini-scrollbar to latest version
...
RoomDirectory uses react-gemini-scrollbar directly, so make sure we are using a
consistent version.
2016-03-23 12:24:25 +00:00
a5e0aa763b
Bump gemini-scrollbar version
...
To fix scrollbar fail thanks to npm's lack of dependency-version conflict
resolution.
2016-03-18 16:34:20 +00:00
d4d2ef326e
Bump to dev branch of js-sdk
2016-03-14 15:54:56 +00:00
2a62fdb652
Switch back to dev version of react-sdk
2016-03-14 14:08:47 +00:00
8fa059fc4b
Prep 0.3.0
2016-03-11 13:00:31 +00:00
874123bbfa
Move package script out and make it tar into a versioned top level directory. It may as well be a shell script since it's unix specific anyway, and maintaining it inside package.json is now impractical.
2016-02-24 18:41:30 +00:00
b088651211
Use the --tags option so it works with non-annoated tags (seriously, git?)
2016-02-24 15:05:13 +00:00
ebd5399626
Bump to version 0.2.0
2016-02-24 14:24:15 +00:00
5d63d2269e
Use newly released versions of js-sdk & react-sdk
2016-02-24 14:21:53 +00:00
484736bf57
oops, add sanitize-html
2016-02-21 00:05:44 +00:00
95a3354b90
Merge pull request #914 from vector-im/dbkr/package_use_tar
...
Use tar for packaging because zip can't traverse directory symlinks
2016-02-11 15:09:49 +00:00
82b498017d
Bumb webpack micro version (although it would have installed the latest micro version anyway) to maybe get a webpack that doesn't throw stack depth errors.
2016-02-11 15:01:32 +00:00
b929f80be8
Use tar for packaging because zip can't traverse directory symlinks, hence ditch windows support for packaging.
2016-02-11 14:59:22 +00:00
05a30e7c68
Merge pull request #902 from vector-im/dbkr/add_package_script
...
Add 'package' script to build a webapp bundle
2016-02-11 14:18:06 +00:00
3c75c43d37
Bail if build step fails
2016-02-11 13:59:40 +00:00
369e357742
We expect the mkdir to fail when the dir exists, so use ; not &&
2016-02-11 13:40:26 +00:00
93f8fcbacc
Add 'package' script to build a webapp bundle for straight unzipping on a production server.
2016-02-10 15:35:06 +00:00
155728b136
make babel actually do full ES6 emulation for Safari 8
2016-02-10 14:54:55 +00:00
0752c3a6d5
Add start:prod - same as 'npm run start' but with NODE_ENV=production
2016-01-22 13:17:09 +00:00
939733b736
Merge branch 'develop' into require-css
2015-12-02 10:26:26 +00:00
d837d02ac9
Still add highlight.js as an import as we symlink directly to the node_module for github.css :/ - Fixes ENOENT
2015-12-02 09:26:12 +00:00
7ff5e42f3e
Run the CSS through webpack so we can pull in CSS files from modules with require rather than symlinking into the node_module directory which is breaking people on different npm versions.
2015-12-01 18:05:43 +00:00
021056cfd1
Move copyright header
2015-11-30 18:00:54 +00:00
6f646260aa
WIP of component indexing update
2015-11-30 17:31:32 +00:00
af30ef1f72
Remove unusued imports
2015-11-27 15:39:29 +00:00
05c9b44b81
Move velocity stuff to react sdk
2015-11-27 15:34:26 +00:00
da97185fcd
highlight <code/> blocks via highlight.js
2015-11-21 12:14:56 +00:00
76c6d6d4d6
add target=_blank onto all HTML links, and apply GFM.css for CSS for markdown
2015-11-20 20:12:23 +00:00
3a003341ad
Merge pull request #387 from vector-im/rav/suppress_unread_on_memberchange
...
Don't mark rooms as unread on m.room.member changes
2015-11-19 13:22:37 +00:00
025b9e2fc8
depend on react sdk dev
2015-11-18 14:54:32 +00:00
c42d4f901b
Don't mark rooms as unread on m.room.member changes
...
A quick and hacky fix to issue #169 .
2015-11-18 11:01:47 +00:00
816f20e068
comma
2015-11-16 16:36:01 +00:00
bb59e9276b
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-16 16:33:39 +00:00
bc2c744bed
more bits of read receipt animation implemented
2015-11-13 11:42:51 +00:00
68c1ddd5d2
replace react-loader with Spinner everywhere
2015-11-10 18:12:26 +00:00
450036a6ed
Merge remote-tracking branch 'origin/develop' into read_receipts
2015-11-10 11:26:42 +00:00
cb887c699e
use gemini-scrollbar to provide fake scrollbars for the room list
2015-11-10 01:40:08 +00:00
87bb7c9b7b
upgrade to react 0.14
2015-11-09 23:13:46 +00:00
0aa90d918c
bump js-sdk dep to develop
2015-11-05 14:45:16 +00:00
7fe7af6026
refactor out the sections of the RoomList into RoomSubLists. Start wiring up tags
2015-11-04 00:19:37 +00:00
e25d31a9fe
Merge pull request #296 from vector-im/matthew/redesign
...
Matthew/redesign
2015-10-30 18:30:13 +00:00
ffb9ce89c7
Merge branch 'develop' into matthew/redesign
2015-10-30 11:50:34 +00:00
fdfa0cbd0e
display search results correct; support HTML markup
2015-10-30 04:10:37 +00:00
cc313f350c
Merge branch 'develop' into kegan/blocking
2015-10-29 16:03:26 +00:00
5c77395faa
v0.1.2
2015-10-28 18:32:13 +00:00
e48e636c44
Bump js-sdk & react-sdk deps
2015-10-28 18:27:09 +00:00
59d8cbe742
Use Modernizr to check for browser compatibility
...
Add a CompatibilityPage which is shown for incompatible clients. If they
continue on regardless, proceed as if it never happened.
2015-10-28 17:39:50 +00:00
1dd707775a
Use new js-sdk modified time to avoid unnecessary member tile updates. Also avoid double-updating since we were setting state and then forcing an update which is redundant.
2015-10-13 11:10:43 +01:00
53c8b9bcf7
no single quotes because windows
2015-10-05 10:20:02 +01:00
2247d951d6
Add config file for default hs/is urls
2015-10-02 11:48:52 +01:00
94a6f856d1
Use the new interface for providing conf call functionality. Doesn't shoe it in the right room yet.
2015-09-30 16:52:45 +01:00
3ecf19df49
Disable caching on the local http server as commented
2015-09-25 17:38:51 +01:00
796f424a3f
Didn't need these in the end
2015-09-25 11:51:35 +01:00
f020f4397c
Switch to webpack
...
Webapck actually supports loading input source maps and generally seems a lot
more solid then browserify (even if their website has an annoying animated
logo).
2015-09-25 11:43:28 +01:00
c21dd853f9
Update package.json for renamed skin
2015-09-23 09:48:18 +01:00
7e72ee891a
More fixing up of vector skin
2015-09-22 18:49:04 +01:00
09b81f46b0
Remove controllers that all come from react-sdk
2015-09-22 17:20:22 +01:00
901574b56e
Update package.json
2015-09-16 14:13:16 +01:00
5bab440a1f
temporarily pin flux to 2.0, as 2.1 switches to ES6 and Babel which breaks our Dispatcher.js which fails to correctly extend the new Flux dispatcher, presumably due to using our noddy extend.js rather than an ES6-compatible one
2015-08-29 20:28:07 +01:00
772f987489
Unbreak npm start when running on Windows
2015-07-22 08:25:40 +01:00
c8f3f5841c
Depend on develop js-sdk for now
2015-07-21 22:51:54 -07:00
c33899e93a
bump to the same react version as the custom app
2015-07-12 14:26:51 +01:00
63d7ff3ed6
Build the logic too into the same hierarchy as it is unbuilt so it can be used either processed or unprocessed. Does involve having a dir called 'src' in the built products directory, and abusing jsx as a cross-platform version of cp (there is no jsx in the src dir).
2015-07-10 18:09:30 +01:00
a00510c1ca
Linkify URLs
2015-07-09 15:41:19 +01:00
53e9d030b7
See uploaded files
2015-07-08 16:25:27 +01:00
36ecbfc87f
Upload files and images
2015-07-08 14:34:53 +01:00
dff74f44de
Tweak the example build process. Move example -> examples/trivial to we can have more than one. Update README appropriately.
2015-07-03 15:56:04 +01:00
aaa38d95ba
s/themes/skins/g as we are always describing the whole UI layout here, whereas themes can sometimes just be small cosmetic tweaks (light-on-dark, dark-on-light etc)
2015-06-23 18:28:20 +01:00
6fc1c54e66
Bump js-sdk version
2015-06-23 15:48:15 +01:00
a022a4b9a6
Reshuffle to put "HTML" (JSX) and CSS together as a theme with logic elsewhere.
2015-06-23 14:40:50 +01:00
5c56b201fc
sensible version of js-sdk
2015-06-18 11:56:12 +01:00
125fa78bc6
Something starting to resemble a Matrix Client
2015-06-12 17:34:17 +01:00
877873e730
Build (and watch-build) jsx->js and modular css -> (uglified) css bundle
2015-06-10 15:54:36 +01:00
2ea9ed8d79
Add repository fields to package.json and add a README to the example
2015-06-09 18:52:26 +01:00
c42733ec95
Basic structure of a react SDK and start of an implementation.
2015-06-09 17:40:42 +01:00
Richard van der Hoff