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
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
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
David Baker
24e16e5c18
Revert "Add a after timestamp"
2018-01-08 15:17:05 +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
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
nostradamos
762f6aaf0f
Merge remote-tracking branch 'upstream/develop' into fix_4821
2018-01-02 12:58:30 +01:00
Nostradamos
3600d1c667
moved max-height/min-height/overflow attributes to higher level to also include DraftEditorPlaceholder. Could fix https://github.com/vector-im/riot-web/issues/4821
2018-01-02 12:14:54 +01:00
Michael Telatynski
8a7477f50c
Highlight ViewSource and Devtools ViewSource
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-20 20:40:41 +00:00
Richard Lewis
cf47b919d5
Merge pull request #5849 from vector-im/rxl881/snapshot
...
Screenshot UI
2017-12-19 17:04:46 +00:00
Matthew Hodgson
bfb60265cb
Merge pull request #5610 from vector-im/t3chguy/devtools-1
...
add dark theme styling to devtools input box
2017-12-18 21:44:43 +00:00
Michael Telatynski
b16dcbc057
styling for on-demand quote nest traversal
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-18 19:28:19 +00:00
Michael Telatynski
2961e1949f
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-16 19:07:32 +00:00
Michael Telatynski
304d281ed2
change reply to be its own thing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-16 19:01:56 +00:00
Michael Telatynski
9c38794ad5
Style datesep inside Quote
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-15 18:37:44 +00:00
Richard Lewis
6b24aff6c5
Merge branch 'develop' of github.com:vector-im/riot-web into rxl881/snapshot
2017-12-15 13:01:51 +00:00
Luke Barnard
7cc8fed61b
Merge pull request #5790 from vector-im/luke/feature-ordered-tag-panel
...
Move DND wrapper to top level component
2017-12-14 10:36:26 +00:00
Michael Telatynski
4bc99b7f01
move QuotePreview CSS out to own file
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:40:54 +00:00
Michael Telatynski
54a9ccdee7
throw new quoting behind flags
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-12 23:36:10 +00:00
Michael Telatynski
10c6f24a83
CSS and Context Menu tweaks for Rich Quoting/Replies
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-10 12:52:00 +00:00
Luke Barnard
608a359e0a
Move DND wrapper to top level component
2017-12-06 14:54:35 +00:00
Richard Lewis
0ff5d61189
Don't capture pointer events.
2017-12-05 18:44:24 +00:00
Richard Lewis
c37c50e1e0
Add maximise and minimise icons
2017-12-05 18:07:49 +00:00
Richard Lewis
e0ae266bb2
Make cursor pointer on menubar mouseover.
2017-12-05 18:07:19 +00:00
Richard Lewis
380625241e
Green camera icon
2017-12-03 11:25:52 +00:00
Luke Barnard
b0d115a64a
Implement renumeration of ordered tags upon collision
...
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
2017-12-01 18:20:38 +00:00
Luke Barnard
e80c4fadea
Linting
2017-12-01 18:18:48 +00:00
Luke Barnard
cc4890f0b8
Fix TagPanel bg on status theme
2017-12-01 14:12:31 +00:00
Luke Barnard
0aaae9bca5
Merge pull request #5751 from vector-im/luke/refactor-keycode-to-keyboard
...
Update imports for accessing KeyCode
2017-12-01 12:04:10 +00:00
Luke Barnard
a24c42b3a8
Realign collpased BottomLeftMenu with create group button
2017-12-01 11:04:46 +00:00
Luke Barnard
1ccffb7e58
Update imports for accessing KeyCode
2017-12-01 10:56:25 +00:00
Luke Barnard
4e7a1e9653
Correctly position TagPanel createGroupButton
2017-11-30 11:07:27 +00:00
Matthew Hodgson
2a402985aa
Merge pull request #5685 from aidalgol/root-lang-attrib-fix
...
Set html lang attribute from language setting
2017-11-30 10:12:40 +00:00
Matthew Hodgson
f72b44650b
fix tertiary accent colors
2017-11-29 22:04:40 +00:00
Luke Barnard
72563e6114
overflow hidden for groupPublicity scrollbox
2017-11-29 18:50:22 +00:00
Luke Barnard
28132eaf36
Correct comment
2017-11-29 17:17:09 +00:00
Luke Barnard
0c43edb629
CSS for new TagPanel
2017-11-29 16:41:00 +00:00
Luke Barnard
63bedc440b
Merge pull request #5707 from vector-im/luke/allow-guest-view-group
...
getGroupStore no longer needs a matrix client
2017-11-28 14:09:39 +00:00
Luke Barnard
bbdafeff77
getGroupStore no longer needs a matrix client
2017-11-28 13:17:30 +00:00
Luke Barnard
6fc173eaa9
CSS required for moving group publication toggles to UserSettings
...
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
2017-11-27 18:59:33 +00:00
