Commit Graph

62531 Commits

Author SHA1 Message Date
David Baker 40aee5b03d Merge pull request #1966 from vector-im/rav/use_cpx_to_copy_olm
Use cpx to copy olm.js, and add watcher
2016-08-15 13:10:27 +01:00
Richard van der Hoff 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
Richard van der Hoff 1d435890af Unpin react-sdk and js-sdk 2016-08-15 12:15:24 +01:00
Richard van der Hoff 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
Richard van der Hoff 21334cab28 Unpin react-sdk and js-sdk 2016-08-15 12:11:35 +01:00
David Baker a17df609f3 Read all 4 different notif states
Can't yet set loud / mute
2016-08-12 15:19:34 +01:00
David Baker 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
David Baker 5a83adc2b6 Merge pull request #414 from matrix-org/rav/fix_device_display_name
defaultDeviceDisplayName should be a prop
2016-08-12 11:44:57 +01:00
Richard van der Hoff b9870f2c23 defaultDeviceDisplayName should be a prop
... not a bit of config.
2016-08-12 11:41:45 +01:00
David Baker 33e9abe421 Merge pull request #410 from matrix-org/rav/use_server_device_id
Use server-generated deviceId
2016-08-12 11:40:55 +01:00
Richard van der Hoff 17733a66f9 rename MatrixChat defaultDeviceDisplayName prop 2016-08-12 11:40:25 +01:00
David Baker 7992042526 Merge pull request #413 from matrix-org/rav/device_display_name
Set initial_device_display_name on login and register
2016-08-12 11:28:18 +01:00
Richard van der Hoff 5fc98ffc49 Avoid setting device_id to 'undefined'
Deal with the situation where synapse doesn't give us a device_id on login:
don't set the device_id to 'undefined' in localstorage.
2016-08-12 11:22:04 +01:00
Richard van der Hoff 3a819a29b7 Make up a device display name
Pass a default device name into react-sdk
2016-08-12 11:01:39 +01:00
Richard van der Hoff a29325cc46 Set initial_device_display_name on login and register
Let Vector pass in a default device name, and thread it through everywhere to
set it on login and register calls
2016-08-12 10:55:02 +01:00
David Baker cb905dbaef Merge pull request #409 from matrix-org/rav/device_panel_stuff
Add device_id to devices display
2016-08-12 10:43:44 +01:00
David Baker 5f61464195 Merge pull request #408 from matrix-org/rav/refactor_matrix_client
Don't use MatrixClientPeg for temporary clients
2016-08-12 10:42:58 +01:00
David Baker 9d77fab18f 0.7.4-r1 v0.7.4-r1 2016-08-12 10:11:40 +01:00
David Baker 3650c3f08b Prepare changelog for v0.7.4-r1 2016-08-12 10:11:39 +01:00
David Baker 5512fd4220 Bump to matrix-react-sdk 0.6.4-r1 2016-08-12 10:09:53 +01:00
David Baker 3c8a7e36aa 0.6.4-r1 2016-08-12 10:08:15 +01:00
David Baker 6b1e5dfae7 Prepare changelog for v0.6.4-r1 2016-08-12 10:08:14 +01:00
David Baker 10e41d7a26 changelog 2016-08-12 10:04:35 +01:00
David Baker fc0c5a5c58 Tidy up fix to multi-invite 2016-08-12 10:02:55 +01:00
David Baker 678393e2bd Add note about file table overflows 2016-08-12 09:59:56 +01:00
Richard van der Hoff df22768f1b Use server-generated deviceId 2016-08-12 07:31:15 +01:00
Richard van der Hoff 5440fd7504 Fix tests
MatrixClientPeg no longer has a replaceUsingUrls method, so don't try to stub
it out.
2016-08-12 07:27:53 +01:00
Matthew Hodgson d1eec57118 fix inviting some more 2016-08-11 17:11:51 -05:00
Matthew Hodgson 3bedad69cd unbreak inviting :( 2016-08-11 17:08:17 -05:00
David Baker 25d8a7999f 0.7.4 v0.7.4 2016-08-11 17:47:17 +01:00
David Baker 014f7ade86 Prepare changelog for v0.7.4 2016-08-11 17:47:16 +01:00
David Baker 2b671fcafc js-sdk & react sdk released 2016-08-11 17:45:10 +01:00
wmwragg 434115ccda Bugifx: 'background-color' in react should be 'backgroundColor' 2016-08-11 17:34:05 +01:00
wmwragg 7713f0d587 refactoring out the direct message section 2016-08-11 17:32:39 +01:00
David Baker ec9243d4b0 0.6.4 2016-08-11 17:29:10 +01:00
David Baker 028c652f49 Prepare changelog for v0.6.4 2016-08-11 17:29:10 +01:00
David Baker e4dd387376 JS SDK 0.5.5 released 2016-08-11 17:28:09 +01:00
wmwragg cc1cec8431 Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:48:31 +01:00
wmwragg a07833e7fc Merge branch 'develop' into wmwragg/direct-chat-sublist 2016-08-11 16:47:19 +01:00
David Baker 109184aab7 Merge pull request #411 from matrix-org/dbkr/fix_messagecomposer_style
Only show Autocomplete if autocomplete is enabled
2016-08-11 16:47:07 +01:00
David Baker df5b243e75 Merge pull request #1954 from vector-im/dbkr/fix_messagecomposer_style
Don't show border on composer when not in RTE mode
2016-08-11 16:47:00 +01:00
wmwragg 4aea2caefc Initial pass at creating a direct message section 2016-08-11 16:45:19 +01:00
David Baker 5e43f2752a Don't show border on composer when not in RTE mode
This breaks the opacity animation (so remove the transition) but the extra border was making the border on the composer too thick.
2016-08-11 16:30:53 +01:00
David Baker 7cb663d39d Only show Autocomplete if autocomplete is enabled
It was just never used, but it has 1px top border which makes the top border on chat look too big
2016-08-11 16:28:32 +01:00
Richard van der Hoff 55a28564b9 Add device_id to devices display
(it turns out to be quite useful)
2016-08-11 16:24:09 +01:00
Richard van der Hoff e32c325863 Don't use MatrixClientPeg for temporary clients
Get rid of MatrixClientPeg.replaceUsingUrls, and instead create local,
temporary MatrixClients for the unauthed steps; we therefore only use
MatrixClientPeg for logged-in clients.
2016-08-11 16:23:03 +01:00
David Baker 0cb14ba5ec Don't force scrollbar on multi-invite 2016-08-11 15:11:31 +01:00
Matthew Hodgson d65477891e Merge pull request #1941 from vector-im/wmwragg/room-tag-menu
Wmwragg/room tag menu
2016-08-11 09:00:48 -05:00
Matthew Hodgson 3704e2c648 Merge pull request #402 from matrix-org/wmwragg/room-tag-menu
Wmwragg/room tag menu
2016-08-11 08:59:32 -05:00
David Baker 4f76398b29 Merge pull request #407 from matrix-org/rav/refactor_guest_registration
Move guest registration into the login logic
2016-08-11 13:13:51 +01:00