Matthew Hodgson
654429dbdb
improve wording on 'search room names'
2016-06-18 21:12:32 +01:00
David Baker
895fb63d5d
Merge pull request #1661 from vector-im/rav/unverify_device
...
CSS for unverify button
2016-06-17 17:00:26 +01:00
Richard van der Hoff
95a0bc92d6
CSS for unverify button
...
(supports change in react-sdk)
2016-06-17 16:25:39 +01:00
Matthew Hodgson
a90492e393
fix CSS
2016-06-17 16:14:14 +01:00
Richard van der Hoff
4cfcdfa040
Merge pull request #1639 from vector-im/dbkr/fix_peeking
...
Update for react-sdk dbkr/fix_peeking branch
2016-06-16 11:13:29 +01:00
David Baker
e507339324
Merge pull request #1553 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:35 +01:00
David Baker
3547bd8d00
Update for react-sdk dbkr/fix_peeking branch
...
With the react-sdk update, this does nothing functionally since the room ID would just
have been ignored, but update this to correctly supply only one of ID/alias.
2016-06-14 13:02:34 +01:00
Pedro Ferreira
eb37032d8a
Markdown: styles for bold/italics
2016-06-12 01:04:22 +02:00
Aviral Dasgupta
f6ed21559a
RTE mode switch styling & cleanup
2016-06-11 15:54:43 +05:30
David Baker
d7504aeda5
Switch to new view_room
2016-06-10 15:13:41 +01:00
Aviral Dasgupta
b2459b2dc6
Merge branch 'develop' of github.com:vector-im/vector-web into feature-rte
2016-06-10 04:43:06 +05:30
Aviral Dasgupta
819e06e2cd
MessageComposer styling for Draft
2016-06-10 04:41:59 +05:30
David Baker
a030e46c69
Use join_room_by_alias in RoomDirectory
...
This still doesn't actually cause the room to be joined by alias though, so still need to fix that
2016-06-09 17:13:02 +01:00
David Baker
f61cfbc542
Fix RoomDirectory to join by alias whenever possible.
2016-06-09 16:41:01 +01:00
Richard van der Hoff
c4b7571c45
Merge pull request #1612 from vector-im/dbkr/optional_config
...
Make the config optional
2016-06-09 10:40:58 +01:00
Richard van der Hoff
4dd477e064
index.js: fix comment typo
...
Fix dave's typo for him
2016-06-09 10:38:51 +01:00
David Baker
f595f6f141
This check shouldn't be here with the ||
2016-06-09 10:25:49 +01:00
David Baker
24602119c5
This doesn't actually need to be global
...
(because the rendering isn't in a render method here)
2016-06-09 09:59:37 +01:00
David Baker
3040d0a474
Comment typo
2016-06-09 09:57:44 +01:00
David Baker
e4ea00ca23
Return here, else we'll call resolve too
2016-06-09 09:56:57 +01:00
David Baker
4fc311da90
Style fix
2016-06-09 09:56:11 +01:00
Richard van der Hoff
7894e52529
Merge pull request #1610 from vector-im/rav/device_verification
...
CSS support for device verification
2016-06-08 21:37:35 +01:00
David Baker
f6aa9a7ea4
Make the config optional
...
Accept 404 errors from getting the config and start MatrixChat with no config, make other errors display a simple error message to prevent a completely blank page if the config does fail to load.
2016-06-08 18:46:21 +01:00
Richard van der Hoff
5f29729e82
Make unverified encrypted events red and verified ones green
2016-06-08 17:03:54 +01:00
Richard van der Hoff
e24851456a
CSS for the MemberDeviceInfo view
2016-06-08 17:03:28 +01:00
David Baker
1e40fd750f
Don't use SdkConfig
...
instead take brand from a prop
2016-06-08 14:55:47 +01:00
Richard van der Hoff
ed1554f4af
index.js: fix wording in android popup
2016-06-07 22:01:56 +01:00
David Baker
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
David Baker
f9aaf7d903
Use the SdkConfig interface
...
rather than pulling in config.json directly.
json-loader appears to still be necessary due to some horrendous json dependency in the depths of sanitize-html.
2016-06-06 19:13:30 +01:00
Matthew Hodgson
d976046e6a
set email branding whenever emails are added from vector
2016-06-02 13:15:13 +01:00
Aviral Dasgupta
12157edd62
Style selection color
2016-05-28 12:20:21 +05:30
Aviral Dasgupta
7e563b89c7
initial version of rich text editor
2016-05-27 10:17:01 +05:30
Jason Papakostas
6a6118e136
serve config.json statically instead of bundling it
...
issue #1344
2016-05-24 19:08:09 -05:00
Matthew Hodgson
bede9a814b
remove spurious top border; fix #1472
2016-05-24 00:30:36 +01:00
Matthew Hodgson
d70842c3c7
fix padding of badges
2016-05-24 00:29:48 +01:00
Matthew Hodgson
d8c32db14b
typos
2016-05-17 20:24:01 +01:00
Matthew Hodgson
2b3606d44d
switch to lozenges, and improve overlap behaviour
2016-05-17 19:52:56 +01:00
Matthew Hodgson
5feb31911a
better collapsed look & feel
2016-05-17 11:19:04 +01:00
Matthew Hodgson
9483e42508
switch from dots to per-room badges
2016-05-17 11:14:30 +01:00
Matthew Hodgson
e640f65640
add close button to room search filter
2016-05-16 23:36:52 +01:00
Matthew Hodgson
8a9c85c97d
fix wording
2016-05-16 23:00:17 +01:00
Kegan Dougal
bc166f19b7
Fix NPE when loading the Settings page which infini-spinnered
2016-05-16 16:04:06 +01:00
Matthew Hodgson
8fb521c83c
302 android to play store
2016-05-13 17:14:01 +01:00
Matthew Hodgson
d9077584cd
Merge branch 'dbkr/email_notifs' into develop
2016-05-13 15:16:35 +01:00
Matthew Hodgson
8467d5d760
302 to iTunes if you don't have the app installed
2016-05-11 01:48:02 +02:00
Matthew Hodgson
9cd8f7c7f3
Merge pull request #1469 from vector-im/dbkr/email_notifs
...
Add option to enable email notifications
2016-05-10 16:39:50 +02:00
Matthew Hodgson
c64f71a3cb
refine memberlist cosmetics
2016-05-05 00:35:47 +01:00
Matthew Hodgson
af9838408b
s/devices/notification targets/
2016-05-04 11:58:37 +01:00
Matthew Hodgson
974a187e74
fix annoying bug where URL previews with very long lines (e.g. vector permalinks) would get clipped
2016-05-03 17:49:42 +01:00
David Baker
efe1c767f0
Un-inline onChange
2016-05-03 11:36:44 +01:00
