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
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
David Baker
a72d0c5b7f
Merge remote-tracking branch 'origin/develop' into dbkr/email_notifs
2016-04-21 10:17:15 +01:00
David Baker
3cb092051e
Merge branch 'develop' into dbkr/email_notifs
2016-04-21 10:11:55 +01:00
Richard van der Hoff
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
Richard van der Hoff
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
Matthew Hodgson
aeb438dc62
fix tbody & keying warnings
2016-04-17 17:44:04 +01:00
Matthew Hodgson
10a053019d
fix thinkos - thanks @richvdh for posthoc review
2016-04-17 17:35:17 +01:00
Matthew Hodgson
58c431abc2
fix spinner layout bouncing when changing notifs
...
all-important s/done/then/ on pushRulesPromise to ensure that the refresh completes before relaying-out the page
s/Loud/Highlight & sound/
2016-04-17 14:00:20 +01:00
Matthew Hodgson
d512e25cca
persist search filter over being hidden
2016-04-17 00:28:33 +01:00
Matthew Hodgson
65d9333104
pointer on roomsublist
2016-04-16 23:49:21 +01:00
Matthew Hodgson
fbd974df55
fix bottomleft bug in chrome canary
2016-04-16 23:49:16 +01:00
Matthew Hodgson
fdf83a5ad5
fix tooltip offset
2016-04-15 22:24:20 +01:00
Matthew Hodgson
c98e06e1aa
add cancelButton to simpleHeader
2016-04-15 22:16:06 +01:00
