Richard van der Hoff
641a5c244c
Merge pull request #2969 from vector-im/rav/keep_old_bundles
...
Update redeploy script to keep old bundles
2017-01-17 14:59:12 +00:00
David Baker
323c5d0732
CSS for 'searching known users'
2017-01-17 14:54:55 +00:00
David Baker
0b67fd5b4e
Add 'searching known users' to the user picker
...
So it's more obvious it's only finding people you've already seen
Fixes https://github.com/vector-im/riot-web/issues/2931
2017-01-17 14:48:50 +00:00
David Baker
6257019926
Merge pull request #2967 from vector-im/dbkr/include_version_in_update_check
...
Include current version in update check explicitly
2017-01-17 14:42:03 +00:00
Matthew Hodgson
a18d94099e
switch to using <span/> for edit button
2017-01-17 14:11:15 +00:00
Matthew Hodgson
203172c886
typos
2017-01-17 14:11:01 +00:00
Matthew Hodgson
c9c58ab0ec
fix up the contextual menu button
2017-01-17 14:10:09 +00:00
David Baker
cf92e7f64b
Clarify comment
2017-01-17 14:04:42 +00:00
Richard van der Hoff
8371006d90
Update redeploy script to keep old bundles
...
... so that people using old versions of the master chunk can still load other
webpack chunks.
2017-01-17 13:55:33 +00:00
David Baker
3b109f7612
Include current version in update check explicitly
...
Hopefully fix https://github.com/vector-im/riot-web/issues/2847
2017-01-17 13:16:08 +00:00
David Baker
ebc2ad54d6
Merge pull request #2966 from vector-im/rav/move_bundle_again
...
Add another layer of directory to webpack chunks
2017-01-17 12:04:28 +00:00
Richard van der Hoff
4a1b04e57b
Add another layer of directory to webpack chunks
2017-01-17 12:00:20 +00:00
Kegsay
fcb1d7a664
Merge pull request #575 from kyrias/commonmark
...
Replace marked with commonmark
2017-01-17 11:57:08 +00:00
David Baker
cf8af5f49e
Merge pull request #619 from matrix-org/kegan/better-reg-err-msgs
...
Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs
2017-01-17 11:54:05 +00:00
David Baker
205676a97d
Back to develop js-sdk & react-sdk
2017-01-17 11:30:59 +00:00
David Baker
0456cadff6
Merge branch 'master' into develop
2017-01-17 11:30:31 +00:00
lukebarnard
ade7c65617
Add test for MemberEventListSummary
2017-01-17 12:01:54 +01:00
lukebarnard
45655f4de3
Modified desc for invitation rejections, withdrawals
2017-01-17 12:01:19 +01:00
Richard van der Hoff
aa6d584ae3
Merge pull request #2965 from vector-im/rav/fix_font_links
...
Fix links to fonts and images from CSS
2017-01-17 11:00:27 +00:00
Kegan Dougal
4f860b4c6d
Review comments: If-statement style
2017-01-17 10:50:44 +00:00
Richard van der Hoff
ef07a6035e
Fix links to fonts and images from CSS
...
https://github.com/vector-im/riot-web/pull/2961 put the CSS in a subdirectory,
which meant that links from CSS to images and fonts were broken. Fix them up.
2017-01-17 10:48:38 +00:00
David Baker
86b66120d0
Merge pull request #2961 from vector-im/rav/build_hash_in_filename
...
Put parent build hash in webpack output filenames
2017-01-17 09:58:27 +00:00
Matthew Hodgson
3bdb330f5b
cheeky hack to get the ctxt menu colors right
2017-01-17 09:57:01 +00:00
Matthew Hodgson
4f8d3b0e2b
more factoring
2017-01-17 02:00:34 +00:00
Matthew Hodgson
87fd136e21
factor out remaining # colours
2017-01-16 23:13:47 +00:00
Matthew Hodgson
cab5bf8849
fix a lone lost opera vendor prefix
2017-01-16 19:00:44 +00:00
Matthew Hodgson
d74dfc9ee7
strip out unneeded -ms- prefixes
2017-01-16 18:58:37 +00:00
Matthew Hodgson
c305b72b91
strip out unneeded -moz- prefixes
2017-01-16 18:58:02 +00:00
Matthew Hodgson
dc1563d916
strip out unneeded webkit prefixes now we're using autoprefixer
2017-01-16 18:55:29 +00:00
Richard van der Hoff
09ce74cc76
Fix a couple of minor review comments
2017-01-16 18:44:46 +00:00
Matthew Hodgson
906d42688e
make autoprefixer work by reordering it
2017-01-16 18:40:29 +00:00
Richard van der Hoff
b3bff92cc2
Put parent build hash in webpack output filenames
...
In order to better support a world where old build artifacts are available
(which is necessary to support bundle.js splitting), collect all the webpack
artifacts for the build into a single directory. Then we'll be able to clear
out old builds after a few weeks, knowing they won't be in use any more.
2017-01-16 18:01:25 +00:00
lukebarnard
aa6e168505
Remove comment
2017-01-16 18:58:53 +01:00
lukebarnard
5ab287fa1a
Use pre-calculated displaynames to handle dupes
2017-01-16 18:57:49 +01:00
lukebarnard
a79dc886ba
Order sequences by occurance of the first event in each sequence
2017-01-16 18:46:17 +01:00
Kegan Dougal
f168f9cd06
Fix vector-im/riot-web#2833 : Fail nicely when people try to register numeric user IDs
2017-01-16 17:25:44 +00:00
Richard van der Hoff
ac22803ba0
Allow Modal to be used with async-loaded components
...
Add Modal.createDialogAsync, which can be used to display asynchronously-loaded
React components. Also make EncryptedEventDialog use it as a handy
demonstration.
2017-01-16 17:18:38 +00:00
lukebarnard
4be444d524
Move shouldComponentUpdate
2017-01-16 15:12:00 +01:00
lukebarnard
82d6805a71
Canonicalise certain transition pairs, handle arbitrary consecutive transitions
...
Transition pairs joined,left and left,joined are now transformed into single meta-transitions "joined_and_left" and "left_and_joined" respectively. These are described as "joined and left", "left and rejoined".
Treat consecutive sequences of transitions as repetitions, and handle any arbitrary repetitions of transitions:
...,joined,left,joined,left,joined,left,...
is canonicalised into
...,joined_and_left, joined_and_left, joined_and_left,...
which is truncated and described as
... , joined and left 3 times, ...
This also works if there are multiple consecutive sequences separated by other transitions:
..., banned, banned, banned, joined, unbanned, unbanned, unbanned,...
becomes
... was banned 3 times, joined, was unbanned 3 times ...
2017-01-16 14:49:07 +01:00
David Baker
ae7820e8f2
Fix merge
2017-01-16 13:37:18 +00:00
David Baker
3023ea5335
Merge branch 'release-v0.9.6'
2017-01-16 13:34:41 +00:00
David Baker
22060ac5a4
v0.9.6
2017-01-16 13:26:22 +00:00
David Baker
3f3a31e475
Prepare changelog for v0.9.6
2017-01-16 13:26:21 +00:00
David Baker
231306ea7c
Update js-sdk & react-sdk
2017-01-16 13:24:44 +00:00
David Baker
1d5112db5d
Back to develop js-sdk
2017-01-16 13:22:57 +00:00
David Baker
936e12dfe4
Merge branch 'master' into develop
2017-01-16 13:22:11 +00:00
David Baker
a9256b0ab1
v0.8.5
2017-01-16 13:21:34 +00:00
David Baker
834c8d0890
Prepare changelog for v0.8.5
2017-01-16 13:21:34 +00:00
David Baker
3679e47002
js-sdk 0.7.4
2017-01-16 13:19:24 +00:00
lukebarnard
fb68fff536
Refactor renderCommaSeparated for reuse
2017-01-16 13:45:42 +01:00
