David Baker
|
fdcebe1e56
|
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
|
2016-06-06 17:19:38 +01:00 |
|
Matthew Hodgson
|
a2e73cceee
|
Merge branch 'develop' into matthew/scalar
|
2016-06-06 10:24:39 +01:00 |
|
Matthew Hodgson
|
c672919d1e
|
0.7.3
|
2016-06-03 12:20:05 +01:00 |
|
Matthew Hodgson
|
7ab2449ac1
|
Prepare changelog for v0.7.3
|
2016-06-03 12:20:04 +01:00 |
|
Matthew Hodgson
|
e68a2b5e1d
|
pin to react sdk 0.6.3 for release
|
2016-06-03 12:19:04 +01:00 |
|
Matthew Hodgson
|
507f5e2ca1
|
0.6.3
|
2016-06-03 12:17:46 +01:00 |
|
Matthew Hodgson
|
9e17c0ddd1
|
Prepare changelog for v0.6.3
|
2016-06-03 12:17:45 +01:00 |
|
Matthew Hodgson
|
f8b3128645
|
invite input box wording for amandine
|
2016-06-02 23:33:55 +01:00 |
|
Matthew Hodgson
|
ddc4ac187c
|
dep on react-sdk develop
|
2016-06-02 23:32:47 +01:00 |
|
Matthew Hodgson
|
1b3c8481f6
|
fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged
|
2016-06-02 21:07:47 +01:00 |
|
Matthew Hodgson
|
532e93d7cb
|
fix up trailing whitespace and put the buttons in the right order
|
2016-06-02 21:07:04 +01:00 |
|
Matthew Hodgson
|
e20a1acb88
|
label our versions sensibly
|
2016-06-02 19:22:11 +01:00 |
|
Matthew Hodgson
|
ded66bbdfc
|
0.7.2
|
2016-06-02 19:05:50 +01:00 |
|
Matthew Hodgson
|
1a11c402fa
|
Prepare changelog for v0.7.2
|
2016-06-02 19:05:50 +01:00 |
|
Matthew Hodgson
|
4ec77eeca7
|
correctly bump dep on js-sdk and react-sdk
|
2016-06-02 19:04:22 +01:00 |
|
Matthew Hodgson
|
b06ab78a81
|
0.6.2
|
2016-06-02 18:55:34 +01:00 |
|
Matthew Hodgson
|
5ecbd10d36
|
Prepare changelog for v0.6.2
|
2016-06-02 18:55:34 +01:00 |
|
Matthew Hodgson
|
168f74d6cf
|
correctly bump dep on js-sdk 0.5.4
|
2016-06-02 18:53:50 +01:00 |
|
Matthew Hodgson
|
635fd927cd
|
0.7.1
|
2016-06-02 18:41:20 +01:00 |
|
Matthew Hodgson
|
481a7b160d
|
Prepare changelog for v0.7.1
|
2016-06-02 18:41:20 +01:00 |
|
Matthew Hodgson
|
204437e40c
|
0.6.1
|
2016-06-02 18:32:50 +01:00 |
|
Matthew Hodgson
|
d857859d51
|
Prepare changelog for v0.6.1
|
2016-06-02 18:32:50 +01:00 |
|
Matthew Hodgson
|
487f3c72dd
|
fix new 3pid invite UI
|
2016-06-02 16:59:44 +01:00 |
|
Richard van der Hoff
|
5379956b0d
|
jenkins.sh: remove spurious 'npm install'
Just let npm install matrix-js-sdk, rather than installing the one from jenkins
|
2016-06-02 16:42:19 +01:00 |
|
David Baker
|
cadedd2919
|
Revert presumably accidentally comitted config.json
|
2016-06-02 14:24:36 +01:00 |
|
Richard van der Hoff
|
e0bf23fa7c
|
0.7.0
|
2016-06-02 13:42:25 +01:00 |
|
Richard van der Hoff
|
a53acb3b58
|
Prepare changelog for v0.7.0
|
2016-06-02 13:42:24 +01:00 |
|
Richard van der Hoff
|
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 |
|
Richard van der Hoff
|
268cedee0f
|
0.6.0
|
2016-06-02 13:38:19 +01:00 |
|
Richard van der Hoff
|
9a77796d77
|
Prepare changelog for v0.6.0
|
2016-06-02 13:38:18 +01:00 |
|
Richard van der Hoff
|
d812c77fc1
|
Bump to js-sdk 0.5.3
|
2016-06-02 13:36:45 +01:00 |
|
Matthew Hodgson
|
d976046e6a
|
set email branding whenever emails are added from vector
|
2016-06-02 13:15:13 +01:00 |
|
Matthew Hodgson
|
1d31463140
|
set email branding after registration
|
2016-06-02 13:14:52 +01:00 |
|
Matthew Hodgson
|
83fd02bdfa
|
specify a brand when registering accounts
|
2016-06-02 11:51:26 +01:00 |
|
Matthew Hodgson
|
1902b631c7
|
add default branding parameter for email notifs
|
2016-06-02 11:45:23 +01:00 |
|
Matthew Hodgson
|
0ef0120227
|
Merge pull request #297 from matrix-org/matthew/new-3pid-invite
implement new UX for 3pid invites
|
2016-06-02 11:24:21 +01:00 |
|
Matthew Hodgson
|
3b34311e05
|
implement new UX for 3pid invites
|
2016-06-01 23:42:34 +01:00 |
|
Matthew Hodgson
|
0747ca3923
|
ignore @ prefixes when sorting memberlist
|
2016-06-01 14:00:20 +01:00 |
|
Aviral Dasgupta
|
b979a16199
|
initial version of autocomplete
|
2016-06-01 16:54:21 +05:30 |
|
Matthew Hodgson
|
272afe39dc
|
do not list rooms by default
|
2016-06-01 02:03:53 +01:00 |
|
Matthew Hodgson
|
c3fc76cdaa
|
warn guests to register nicely to upload files
|
2016-05-31 23:59:36 +01:00 |
|
Matthew Hodgson
|
e1ba7df66e
|
fix the Add button for email addies
|
2016-05-31 23:50:53 +01:00 |
|
Matthew Hodgson
|
2662ca36f9
|
fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?!
|
2016-05-31 23:50:47 +01:00 |
|
Matthew Hodgson
|
b74d690035
|
Merge pull request #290 from matrix-org/matthew/multipreview
multiple URL preview support
|
2016-05-31 19:42:21 +01:00 |
|
Matthew Hodgson
|
b3638f9169
|
PR review
|
2016-05-31 19:42:00 +01:00 |
|
Aviral Dasgupta
|
96526c22c5
|
Merge branch 'develop' into feature-rte
|
2016-05-29 20:50:33 +05:30 |
|
Matthew Hodgson
|
dda2129354
|
Merge pull request #1557 from aviraldg/feature-style-selection
Style selection color.
|
2016-05-28 16:30:53 +01:00 |
|
Aviral Dasgupta
|
12157edd62
|
Style selection color
|
2016-05-28 12:20:21 +05:30 |
|
Aviral Dasgupta
|
fe76eb9f73
|
minor improvements
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
|
2016-05-28 12:02:35 +05:30 |
|
David Baker
|
a145ab7e28
|
Merge pull request #293 from matrix-org/dbkr/fallback_hs_login
Add a fallback home server to log into
|
2016-05-27 15:48:30 +01:00 |