Commit Graph

906 Commits

Author SHA1 Message Date
Michael Telatynski 662a6297e7
FilteredList, now being a controlled component does not need state
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2018-01-25 21:06:35 +00:00
Michael Telatynski 04bca93e0d
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools-118247 2018-01-25 20:59:31 +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
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 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 8855cc294e converge on 'noisy' to mean noisy notifs 2018-01-19 16:52:54 +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
Michael Telatynski 4386d45a97
remove 'use strict' 2018-01-16 10:27:47 +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 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 &nbsp; 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
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
Michael Telatynski 8a7477f50c
Highlight ViewSource and Devtools ViewSource
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-12-20 20:40:41 +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 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 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
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 1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
Michael Telatynski 43578d2366
make FilteredList controlled, such that it can externally persist filter
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-28 22:16:53 +00:00
Luke Barnard bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Stefan Parviainen 0bd68ce068 Add some aria-labels to RightPanel
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-21 09:18:59 +01:00
lukebarnard 7cb59bddb0 Use badge count format for member count in RightPanel
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
2017-11-20 13:12:55 +00:00
Luke Barnard cb235a29fa
Merge pull request #5613 from pafcu/simplify-translation
Refactor translations
2017-11-16 11:54:52 +00:00
Stefan Parviainen 4949f2f763 Fix typo and update strings
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-15 20:43:45 +01:00
Michael Telatynski b00cf8c939
add dark theme styling to devtools input box
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-15 17:13:39 +00:00
Travis Ralston a583c2b658 Merge branch 'develop' into travis/granular 2017-11-14 19:16:35 -07:00
Matthew Hodgson 3e72d8d969
Merge pull request #5286 from turt2live/travis/presence
CSS/components for custom presence controls
2017-11-14 23:53:26 +00:00
Stefan Parviainen ca4b71b6e2 Update to use newer _t() 2017-11-14 21:54:00 +01:00
Travis Ralston 977599a660 Use the SettingsStore to get the theme
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-13 13:14:29 -07:00
Travis Ralston 7570ce580f Merge branch 'develop' into travis/granular 2017-11-13 12:25:56 -07:00
Matthew Hodgson 5abee4fddc replace some of the status.im theme with general config options 2017-11-11 23:47:03 +00:00
Matthew Hodgson 47d9e7f2a1 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-11-10 15:29:37 -08:00