OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
5,446 Commits
186 Branches
525 Tags
449 MiB
Commit Graph

5446 Commits (0cdebcce89605e3297cc72fac09038a8d9aa3c38)

Author SHA1 Message Date
Luke Barnard 0cdebcce89 Move sublist sorting to RoomListStore 
NB: fixUndefinedOrdering was removed completely because it was
code dealing with legacy favourites.

see matrix-org/matrix-react-sdk@9b0df191
 2018-02-08 16:28:42 +00:00
Luke Barnard 495090c9ba Remove now unused RoomSubList code 2018-02-08 14:08:20 +00:00
lukebarnard 662942ec29 Use dispatch to change room tags from RoomTileContextMenu 2018-02-06 11:52:39 +00:00
lukebarnard 83996c09d9 General delint, cleanup 2018-02-06 11:51:46 +00:00
lukebarnard e46f436a47 Prefer context.matrixClient in LeftPanel 2018-02-06 11:50:34 +00:00
lukebarnard 37fe3ac676 Prevent RoomTiles from being dragged into other droppables 
for the time being at least.
 2018-01-25 22:51:40 +01:00
lukebarnard 2926154dce Modify LeftPanel to include a DragDropContext 
that handles drag and drop for TagPanel and RoomList. This is to
allow the future feature of dragging between the two components.
 2018-01-25 22:30:58 +01: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
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
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 &nbsp; after timestamp"
 2018-01-08 15:18:03 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
David Baker a21bbd15c5
Merge pull request #3046 from rubo77/patch-1 
Add a &nbsp; 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
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
David Baker 1bb861f6cf Prepare changelog for v0.13.4 2018-01-03 16:13:24 +00:00
David Baker 2eb433157a v0.13.4 2018-01-03 16:08:38 +00:00
Michael Telatynski d71af40967 add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-03 16:06:58 +00:00
Luke Barnard 604d4e0a51
Merge pull request #5900 from Nostradamos/fix_4821 
Fix for `If riot is narrow enough, such that 'Send a message (unecrypted)' wraps to a second line, the timeline doesn't fit the window.`
 2018-01-03 15:48:38 +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
Richard Lewis cf47b919d5
Merge pull request #5849 from vector-im/rxl881/snapshot 
Screenshot UI
 2017-12-19 17:04:46 +00:00
Richard Lewis af99ac3293
Merge pull request #5855 from vector-im/t3chguy/nvl/fix_electron_config 
add missing config.json entry such that scalar-staging widgets work
 2017-12-19 13:23:15 +00:00
Michael Telatynski 843505f6a9
add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-12-19 12:03:48 +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 fbd9ba32aa
Merge pull request #5851 from oivoodoo/add-oivoodoo-author 
Fixes #1953 by adding oivoodoo as author
 2017-12-18 19:50:26 +00:00