David Baker
|
b0a3bd6591
|
Merge pull request #6017 from vector-im/t3chguy/rich_quoting_linear
Linear Rich Quoting
|
2018-01-24 18:53:33 +01:00 |
|
Luke Barnard
|
394d4cf856
|
Merge pull request #5995 from vector-im/t3chguy/highlight_things
Highlight ViewSource and Devtools ViewSource
|
2018-01-24 08:55:12 +00:00 |
|
Michael Telatynski
|
22b7298542
|
add comments
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-23 20:28:39 +00:00 |
|
Michael Telatynski
|
9d1a3c9011
|
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-23 20:19:27 +00:00 |
|
Michael Telatynski
|
c2aa8137bb
|
sort components scss
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-23 20:02:47 +00:00 |
|
Michael Telatynski
|
c7146e62a0
|
Merge pull request #6022 from 4nd3r/README_cross_origin_renderer_url
Update README.md with correct example use of config.cross_origin_renderer_url
|
2018-01-23 11:00:45 +00:00 |
|
Ander Punnar
|
d9409232f9
|
default url, not domain
https://github.com/matrix-org/matrix-react-sdk/blob/master/src/components/views/messages/MFileBody.js#L116
Signed-off-by: Ander Punnar <ander@kvlt.ee>
|
2018-01-23 12:15:08 +02:00 |
|
Luke Barnard
|
9d387c32a5
|
Merge pull request #5929 from vector-im/t3chguy/num_members_tooltip
T3chguy/num members tooltip
|
2018-01-22 22:21:50 +00:00 |
|
Michael Telatynski
|
f5fc86258f
|
s/Highlight/SyntaxHighlight/
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 18:59:18 +00:00 |
|
Michael Telatynski
|
321f16d8a3
|
rename variable as it was horrible to read camelCased
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 18:54:22 +00:00 |
|
Michael Telatynski
|
d57a10e0b2
|
Merge branches 'develop' and 't3chguy/rich_quoting_linear' of github.com:vector-im/riot-web into t3chguy/rich_quoting_linear
|
2018-01-22 16:53:51 +00:00 |
|
Michael Telatynski
|
202f0e2163
|
Add EventTile_quote styling for less margin-right when in QuotePreview
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-22 16:42:08 +00:00 |
|
Michael Telatynski
|
3764a5d4b7
|
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-20 13:55:52 +00:00 |
|
Matthew Hodgson
|
37b5de2251
|
update triaging a bit
|
2018-01-19 16:52:55 +00:00 |
|
Matthew Hodgson
|
8855cc294e
|
converge on 'noisy' to mean noisy notifs
|
2018-01-19 16:52:54 +00:00 |
|
Luke Barnard
|
a819add7b0
|
Merge pull request #6008 from vector-im/luke/roomlist-beautiful-dnd
Swap RoomList to react-beautiful-dnd
|
2018-01-19 14:49:53 +00:00 |
|
lukebarnard
|
883ee4ec75
|
Remove react-dnd
|
2018-01-19 13:35:11 +00:00 |
|
lukebarnard
|
4504ff954a
|
Add sudo: required to travis config
|
2018-01-19 10:10:13 +00:00 |
|
lukebarnard
|
d55d3658f0
|
Use classNames instead of inline style
Theres no benefit to using inline styles
|
2018-01-18 18:08:18 +00:00 |
|
lukebarnard
|
3481283af8
|
Swap RoomList to react-beautiful-dnd
Includes themeing
See matrix-org/matrix-react-sdk#1711
|
2018-01-18 17:54:39 +00:00 |
|
Michael Telatynski
|
670f02acf8
|
Merge branches 'develop' and 't3chguy/highlight_things' of github.com:vector-im/riot-web into t3chguy/highlight_things
|
2018-01-16 18:04:08 +00:00 |
|
Luke Barnard
|
a94208e230
|
Merge pull request #5992 from vector-im/luke/tag-panel-beautiful-dnd
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
|
2018-01-16 13:05:31 +00:00 |
|
Michael Telatynski
|
4386d45a97
|
remove 'use strict'
|
2018-01-16 10:27:47 +00:00 |
|
lukebarnard
|
c269abd434
|
CSS required as part of moving TagPanel from react-dnd to react-beautiful-dnd
|
2018-01-16 09:40:15 +00:00 |
|
David Baker
|
f940dfdd79
|
Merge pull request #5984 from vector-im/t3chguy/datesep
fix&refactor DateSeparator and MessageTimestamp
|
2018-01-15 13:45:14 +00:00 |
|
David Baker
|
fc844567a6
|
Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting
Iterative fixes on Rich Quoting
|
2018-01-15 10:06:05 +00:00 |
|
Michael Telatynski
|
f97395f40f
|
change exports to default to retain compatibility with existing imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:41:44 +00:00 |
|
Michael Telatynski
|
b65fdf6ab0
|
refactor MessageTimestamp, as it was missing a PropTypes def for ts
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:35:53 +00:00 |
|
Michael Telatynski
|
22c024cc94
|
Refactor DateSep, use new Dateutils.formatFullDateNoTime
as it is not desired for it to include the time.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-14 18:34:38 +00:00 |
|
David Baker
|
d3811e3287
|
Merge pull request #5653 from vector-im/t3chguy/analytics_info
move piwik whitelists to conf and add piwik config.json info to readme
|
2018-01-12 09:32:15 +00:00 |
|
Michael Telatynski
|
5aec6840bf
|
Add cursor:pointer so that it actually looks clickable
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 19:33:21 +00:00 |
|
Michael Telatynski
|
17c4839029
|
only show reply button on REAL (not pending) m.room.message events
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-11 19:21:02 +00:00 |
|
David Baker
|
56300f9578
|
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting
Implement Rich Quoting/Replies
|
2018-01-11 10:34:43 +00:00 |
|
Michael Telatynski
|
77e2ceba9e
|
switch to new ES6 DateUtils imports
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-10 21:50:32 +00:00 |
|
Matthew Hodgson
|
c8e87cb5a2
|
Merge pull request #5950 from vector-im/t3chguy-patch-1
Change author
|
2018-01-08 21:33:22 +00:00 |
|
Michael Telatynski
|
627ebb848d
|
Change author
|
2018-01-08 21:32:25 +00:00 |
|
David Baker
|
1405859d2c
|
Merge pull request #5944 from vector-im/revert-3046-patch-1
Revert "Add a after timestamp"
|
2018-01-08 15:18:03 +00:00 |
|
David Baker
|
24e16e5c18
|
Revert "Add a after timestamp"
|
2018-01-08 15:17:05 +00:00 |
|
David Baker
|
a21bbd15c5
|
Merge pull request #3046 from rubo77/patch-1
Add a after timestamp
|
2018-01-08 15:00:45 +00:00 |
|
David Baker
|
b6c002b587
|
Fix merge
|
2018-01-08 14:35:39 +00:00 |
|
David Baker
|
9c3e4a1202
|
Merge branch 'develop' into patch-1
|
2018-01-08 14:31:21 +00:00 |
|
Matthew Hodgson
|
bddab533a3
|
Merge pull request #5938 from osoitz/master
Corrected language name
|
2018-01-07 20:34:19 +00:00 |
|
osoitz
|
5106809394
|
Update copy-res.js
Corrected Basque name
|
2018-01-07 20:39:24 +01:00 |
|
Michael Telatynski
|
290bf54d4f
|
pluralise properly
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:55:32 +00:00 |
|
Michael Telatynski
|
c68c54618f
|
delint
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:19:43 +00:00 |
|
Michael Telatynski
|
3788fde711
|
Add a tooltip to members button and badge with actual count
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
|
2018-01-05 23:16:21 +00:00 |
|
David Baker
|
d6942a455d
|
Merge branch 'rubo77-hide-options-cp' into develop
|
2018-01-05 14:30:36 +00:00 |
|
David Baker
|
c8af65fff4
|
Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp
|
2018-01-05 14:30:21 +00:00 |
|
David Baker
|
38e0b26153
|
Merge branch 'master' into develop
|
2018-01-03 16:15:46 +00:00 |
|
David Baker
|
5635614549
|
v0.13.4
|
2018-01-03 16:13:24 +00:00 |
|