OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,424 Commits
228 Branches
566 Tags
501 MiB
Commit Graph

5892 Commits (31c13adaba2da09ccb65d5bf6cb6ab1fe2c76b5a)

Author SHA1 Message Date
Travis Ralston 57b99893e5
Merge pull request #1936 from turt2live/travis/pinned-room-list 
Add options to pin unread/mentioned rooms to the top of the room list
 2018-11-01 08:04:12 -06:00
David Baker 6d6e6b5a4e Remove cryptic abbreviation 2018-10-31 20:01:36 +00:00
David Baker 1a878fc77a Quote consistency 2018-10-31 19:56:34 +00:00
David Baker 23332e16c5 keyBackupStatus event now has crypto. prefix 2018-10-31 18:07:29 +00:00
Bruno Windels 7f72d5145a fix lint 2018-10-31 15:26:18 +01:00
Bruno Windels b4dd739771 Merge branch 'experimental' into bwindels/rightpanelbelowheader 2018-10-31 14:57:16 +01:00
Bruno Windels ba83166661 Merge branch 'develop' into experimental 2018-10-31 14:54:22 +01:00
Bruno Windels bd9c0dc6cf fix lint 2018-10-31 12:20:10 +01:00
Bruno Windels 1948e9bc17 only detach if created before 2018-10-31 12:17:13 +01:00
Bruno Windels ff383b4aa0 remove right panel from loggedinview 
this breaks user view for now but this is not available
through any UI as it is, and we don't know yet what this will
look like in the new design, even if it will be a feature at all.
 2018-10-31 12:09:53 +01:00
Bruno Windels 870280c6c7 move rightpanel into group view 2018-10-31 12:09:24 +01:00
Bruno Windels d535f60bf6 only create resizer in MainSplit when ref becomes available 2018-10-31 12:08:41 +01:00
Bruno Windels a40f1933f2 put RightPanel as sibling of .mx_RoomView_body instead of RoomView 2018-10-30 18:13:17 +01:00
Bruno Windels 790299f2d2 introduce MainSplit, to split between room/group body and right panel 2018-10-30 18:12:21 +01:00
Bruno Windels e80a1c5051 move room/group panel header buttons into room/group header 2018-10-30 17:15:19 +01:00
Bruno Windels 4972b1ba7c move aux panel into room body 
to put a resize handle between the body and the right panel later on
 2018-10-30 13:25:06 +01:00
David Baker 8ac62f8c12 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-29 16:20:45 +00:00
Aaron Raimist 5f3b03c85a
Fix a few no-useless-escape lint errors 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 23:00:54 -05:00
Aaron Raimist 49ce4ef117
eslint --fix src/ 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-26 22:50:38 -05:00
Travis Ralston 0bd1d6b778
Merge pull request #2250 from matrix-org/travis/permalink-routing 
Support routing matrix.to links to joinable rooms
 2018-10-26 14:23:30 -06:00
David Baker de366fa0e8 Add cancel button to error stage 2018-10-26 17:55:59 +01:00
Travis Ralston ef8c9246aa Maybe fix UserSettings? 2018-10-26 10:07:21 -06:00
David Baker 156ffd1334 Fix autoreplacement of ascii emoji 
More slate API updates in code paths I didn't test

Fixes https://github.com/vector-im/riot-web/issues/7509
 2018-10-26 17:01:44 +01:00
Travis Ralston ea8a37ff21 Merge branch 'develop' into travis/permalink-routing 2018-10-26 09:19:58 -06:00
Travis Ralston 6c23dc0020
Merge pull request #2252 from jryans/dialog-padding 
Repair DevTools button padding by centralizing styles
 2018-10-26 09:11:18 -06:00
Bruno Windels 3d07f45370 remove CreateRoom page, dead code 2018-10-26 17:10:32 +02:00
Bruno Windels 33925b2fd1 fix after merge conflict error 2018-10-26 15:57:57 +02:00
Bruno Windels 2c039483c6 Merge branch 'develop' into experimental 2018-10-26 15:33:39 +02:00
J. Ryan Stinnett 2dc335798d Repair DevTools button padding by centralizing styles 
This moves the padding styles for dialog content to the .mx_Dialog rule. In
addition, it fixes vector-im/riot-web#7548 where the DevTools buttons had double
padding.

Signed-off-by: J. Ryan Stinnett <jryans@gmail.com>
 2018-10-26 14:15:46 +02:00
Travis Ralston aaeb6e4978 Use about:blank instead 2018-10-25 15:59:42 -06:00
Travis Ralston 749441b4d3 Merge branch 'develop' into travis/redirect-widgets 2018-10-25 15:57:26 -06:00
Travis Ralston d58ff90ec1 Merge branch 'develop' into travis/permalink-routing 2018-10-25 15:23:33 -06:00
Travis Ralston 9cdb527163
Merge branch 'develop' into travis/pinned-room-list 2018-10-25 10:57:08 -06:00
David Baker b59b8b7fca Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-10-25 17:42:46 +01:00
David Baker 85bb8392c4
Merge pull request #2247 from matrix-org/dbkr/fix_emoji_replacement 
Fix emoji replacement in composer
 2018-10-25 16:23:13 +01:00
David Baker 5e81e5b8b8 Fix variable scope 2018-10-25 15:07:19 +01:00
David Baker 401f6333ed Do...while loops are a thing 2018-10-25 14:54:32 +01:00
David Baker adee0fdcef
Merge pull request #2248 from matrix-org/bwindels/memberpanel 
Redesign: basic makeover of member info panel
 2018-10-25 14:52:54 +01:00
Bruno Windels 3096bf42ef fix css in chrome 2018-10-25 15:20:51 +02:00
Bruno Windels 030deba90c avoid downloading avatars at full resolution 2018-10-25 15:20:33 +02:00
Travis Ralston 6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Maxwell Kepler 5d35ce9449 Changed letter case. 2018-10-24 19:06:48 +01:00
Will Hunt def0b2d8fb Add developertools option to UserSettings 2018-10-24 18:20:16 +01:00
Will Hunt 8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt 44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt 79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
Bruno Windels e4dfb90b85 basic makeover of member panel with big avatar 2018-10-24 18:23:34 +02:00
Bruno Windels 873ff7fc29 make EntityTile responsive 2018-10-24 18:22:57 +02:00
David Baker 78d8d22457 Fix emoji replacement in composer 
* Re-scan the slate document tree on each emoji replacement since
   doing a replacement will invalidate all the offsets we have.
 * Reset the emoji regex each time we use it.

Fixes https://github.com/vector-im/riot-web/issues/7550
 2018-10-24 16:46:06 +01:00
Travis Ralston d7367a7cfd Merge branch 'develop' into travis/permalink-routing 2018-10-24 09:12:14 -06:00
Bruno Windels 7244d30c9c guard against empty roomId/non-existant room 2018-10-24 16:44:18 +02:00
Bruno Windels 30e6fdc122 fix lint 2018-10-24 14:36:08 +02:00
Bruno Windels 25b55b2801
Merge pull request #2245 from matrix-org/bwindels/memberlistmakeover 
Redesign: memberlist basic makeover
 2018-10-24 12:23:30 +00:00
Bruno Windels 0038d6d219
Merge pull request #2234 from matrix-org/bwindels/roomsectionfixcollapsedsize 
Redesign: Fix room lists sizing
 2018-10-24 12:23:05 +00:00
Bruno Windels 8c62dddb32 one big commit, sorry 
changing looks of input & buttons
changing background color of right panels
moving invite button around
change margins and paddings in memberlist
 2018-10-24 13:50:58 +02:00
Bruno Windels 8a5c46ead0 Merge branch 'experimental' into bwindels/memberlistmakeover 2018-10-24 11:06:08 +02:00
Bruno Windels 6b14d61816 fix import path 2018-10-24 11:04:14 +02:00
Aaron Raimist fe901142aa
Split long string over two lines 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 17:20:57 -05:00
Bruno Windels 5425eda438
Merge pull request #2241 from matrix-org/bwindels/redesignicons1 
Redesign: update (most) icons
 2018-10-23 19:40:59 +00:00
Bruno Windels e479c72e3c Merge branch 'experimental' into bwindels/roomheader1 2018-10-23 21:39:13 +02:00
Bruno Windels 56ed38ad13 WIP 2018-10-23 21:38:04 +02:00
Bruno Windels 466062e872
Merge pull request #2239 from matrix-org/bwindels/topleftmenu1 
Redesign: 1st go at top left menu & restyling context menus
 2018-10-23 19:37:05 +00:00
Bruno Windels 88df3d2a81
Merge pull request #2238 from matrix-org/bwindels/initialtimelinetweaks 
Redesign: Initial timeline tweaks
 2018-10-23 19:36:19 +00:00
Aaron Raimist 92bfb42784
Use one string instead of two 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 13:11:36 -05:00
Aaron Raimist a6c78ace4f
Add warning when administrator leaves community 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-23 12:25:12 -05:00
Bruno Windels eb453f4539 make icons in composer smaller, better spacing 2018-10-23 18:11:15 +02:00
Bruno Windels 18fedb23ec fix basic room header layout 
make room name take as much space as it needs (but not more than width)
put all items apart from right buttons in one flex container
 so name and topic can grow as required
more small tweaks
 2018-10-23 16:57:56 +02:00
Bruno Windels 4b90fd5c11 move TopLeftMenu to context_menus folder 2018-10-23 15:42:28 +02:00
Bruno Windels cad0fa05e5 hide name when collapsed 2018-10-23 15:33:45 +02:00
Bruno Windels 97789a8858 event handlers need to be bound with es6 react classes 2018-10-23 15:33:24 +02:00
Bruno Windels 8b38af856a put settings and sign out in top left menu for now 2018-10-23 15:25:20 +02:00
Bruno Windels 863d89f6fd show profile in topleftmenu button for now (will be current community) 2018-10-23 15:25:10 +02:00
Bruno Windels eba91d3edc initial restyle of context menus with drop shadow 2018-10-23 15:23:59 +02:00
Bruno Windels 7b8e96723e support contextual menus without chevron 2018-10-23 15:21:30 +02:00
Bruno Windels 5f1cf07543 rename TopLeftMenu to TopLeftMenuButton 
so the former can be the actual menu
 2018-10-23 13:29:44 +02:00
David Baker 5206719663
Merge pull request #2223 from matrix-org/travis/fix-group-members 
Show the group member list again
 2018-10-23 10:18:06 +01:00
Bruno Windels f2efbc15f4 apply color categories to sender profile name 2018-10-23 10:49:44 +02:00
Bruno Windels 2a264f36b7 style date separator 2018-10-23 10:25:04 +02:00
Travis Ralston 8ff1da11ed
Merge pull request #2237 from aaronraimist/camel-case 
lint: make colorScheme camel case
 2018-10-22 22:44:14 -06:00
Aaron Raimist 1aa3085958
Oh right, can't change these 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:33:38 -05:00
Aaron Raimist cb033bcadd
Why not change it everywhere while we're at it 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:16:07 -05:00
Aaron Raimist 4b3c865959
lint: make colorScheme camel case 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 23:07:47 -05:00
Aaron Raimist 41bd6e4366
Change leave room button text, OK -> Leave 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2018-10-22 20:55:24 -05:00
Travis Ralston 78f527cf95 Remove unused classes 2018-10-22 15:14:21 -06:00
Maxwell Kepler 5e9db3647a Fixed minor typo in comment 2018-10-22 21:03:39 +01:00
Maxwell Kepler 54f9231582 Added badge to GIFs (https://github.com/vector-im/riot-web/issues/7344) 2018-10-22 20:57:58 +01:00
Bruno Windels 521e035bf0 add vertical space above and below room section 2018-10-22 18:17:14 +02:00
Bruno Windels 91a2ee1779 tweak badges 2018-10-22 18:16:36 +02:00
David Baker 9976c4eba5
Merge pull request #2231 from matrix-org/travis/dialog-buttons 
Move all dialog buttons to the right and fix their order
 2018-10-22 15:00:35 +01:00
Bruno Windels a69463e7fa clear height flexbox properties when collapsing 
so item doesn't maintain height given by resizing
 2018-10-22 15:57:56 +02:00
David Baker c677dd8a24
Merge pull request #2225 from matrix-org/travis/join-room-text 
Add a bit of text to explain the purpose of the RoomPreviewSpinner
 2018-10-22 13:11:09 +01:00
David Baker b8153dcec7
Merge pull request #2219 from matrix-org/travis/login-register-composer 
Move the login box from the left sidebar to where the composer is
 2018-10-22 13:05:19 +01:00
Bruno Windels 5c843acc10 fix room lists growing taller than screen height in FF 
sections with flex-basis don't seem to shrink smaller in FF,
so use flexGrow which is unitless/proportional but works as well
 2018-10-22 11:16:33 +02:00
Bruno Windels f42ab32e05 Merge branch 'experimental' into bwindels/roomsectionheadercleanup 2018-10-22 10:31:07 +02:00
Travis Ralston 7ef08314b8 Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:23:19 -06:00
Travis Ralston c75beb0196 Revert "Redirect widgets to another location before deleting them" 
This reverts commit 275d88dd4f.
 2018-10-19 16:22:48 -06:00
Travis Ralston 275d88dd4f Redirect widgets to another location before deleting them 
This is so that shutdown hooks in the widget can correctly fire, such as Jitsi's hook to abandon its hold on the webcam.

Fixes https://github.com/vector-im/riot-web/issues/7351
 2018-10-19 16:22:20 -06:00
Travis Ralston 9582c1e65a Move all dialog buttons to the right and fix their order 
Fixes https://github.com/vector-im/riot-web/issues/5689

Some dialogs had their own CSS that prevented the buttons from being placed in the right spot. This has been fixed by using a generic standard for the buttons. The only strange dialog that needed more CSS was the devtools dialog due to the header.

Not all dialogs have been checked - I spot-checked about half of them and verified the CSS manually on an established account. It's hard to get at all the dialogs without convoluted testing.
 2018-10-19 15:33:23 -06:00
Travis Ralston 49efefa630 Fix an error where React doesn't like value=null on a select 
This only happens when there are no canonical aliases for a room.
 2018-10-19 14:18:05 -06:00
Travis Ralston 7383133846 Support parsing matrix.to links in the timeline with ?via= in them 
This ends up being translated to ?server_name= in the matrix-js-sdk, although that has a bug at the time of writing. It converts `server_name: ['a', 'b']` to `?server_name=a,b` instead of `?server_name=a&server_name=b`

For reference: the `viaServers` option is routed through the 'join_room' action to RoomViewStore#_joinRoom which is passed directly to the js-sdk http-api#joinRoom function.

Next steps:
* Fix the js-sdk parsing
* Make the SDK generate matrix.to links with ?via=
 2018-10-19 13:31:18 -06:00
Bruno Windels ebd3d34106 make sure no resize handle is put after last sublist 2018-10-19 18:35:27 +02:00
Bruno Windels 73d9a71b29
Merge pull request #2226 from matrix-org/bwindels/resizeroomsublists 
Redesign: 1st go at resizing room sublists
 2018-10-19 13:33:28 +00:00
Bruno Windels f2ee8307dc
Merge pull request #2224 from matrix-org/bwindels/removedndmore 
Redesign: remove room list truncation and DND
 2018-10-19 13:30:18 +00:00
Bruno Windels 7ece134b4e dont cause rerender with anon func 2018-10-19 15:22:28 +02:00
Bruno Windels e4276d9378 don't show notification count in expanded room section header 2018-10-19 14:50:35 +02:00
Bruno Windels acd383c6a9 move closer to usage 2018-10-19 14:44:37 +02:00
Bruno Windels c6924c47fa no need for self 2018-10-19 14:43:54 +02:00
Bruno Windels d48f19bc19 remove alwaysShowHeader, as now onAddRoom prop determines this 2018-10-19 14:43:02 +02:00
Bruno Windels 5091aa3b43 get rid of emptyContent, also cleanup sublist render method 
also assume empty list in css by default and add nonEmpty class
 2018-10-19 14:41:51 +02:00
Bruno Windels 57a9d3ca98 remove obsolete resizer 2018-10-19 14:37:23 +02:00
Bruno Windels 14cdd723f7 only show chevron for non-empty lists 2018-10-19 14:33:51 +02:00
Bruno Windels 0386a1e048 get rid of obsolete showEmpty prop 2018-10-19 14:32:49 +02:00
Bruno Windels ae8723451a remove onShowMoreRooms, as room tiles & scrollbar rendered at same level 2018-10-19 14:27:36 +02:00
Bruno Windels f14c2cf2b2 don't hide empty sections that have a (+) button 2018-10-19 12:46:59 +02:00
Bruno Windels 07799f609f fix lint 2018-10-19 12:34:55 +02:00
Bruno Windels 798be2d514 remove room count leftovers 2018-10-19 12:08:05 +02:00
Bruno Windels 6af61ebb09 add plus button for rooms and people 2018-10-19 12:07:36 +02:00
Bruno Windels 197dd57461 also set max-height so you can't make a sublist bigger than the content 2018-10-18 16:58:23 +02:00
Bruno Windels 44b92eb071 set sub list height with flex-basis to make it ... well, grow less 2018-10-18 16:58:17 +02:00
Bruno Windels d264687796 don't scroll sub list header 2018-10-18 16:25:22 +02:00
Bruno Windels 0b615b21e2 fix lint 2018-10-18 15:53:27 +02:00
Bruno Windels 01082c8595 hook up resizer events 2018-10-18 15:51:58 +02:00
Bruno Windels 39ab3d86bd create sizer that sets item size with flex-basis 
works with the flex-grow we set initially for the sub lists
 2018-10-18 15:51:22 +02:00
Bruno Windels c1e602d56f scrollbars and resize handles around room sub lists 2018-10-18 15:19:45 +02:00
Bruno Windels 99982b1164 put repeated props in process function 2018-10-18 15:15:56 +02:00
Bruno Windels c12368ea48 process RoomSubList props through function before creating them 
this way, we'll be able to add adjacent resize handles and scroll wrappers
 2018-10-18 15:09:58 +02:00
Bruno Windels 81d0ce2bcf remove sticky header code 2018-10-18 15:08:32 +02:00
Travis Ralston af8dfda9a7 Add a bit of text to explain the purpose of the RoomPreviewSpinner 
Fixes https://github.com/vector-im/riot-web/issues/5869
 2018-10-17 13:53:12 -06:00
Bruno Windels 3552326003 more lint fixes 2018-10-17 16:20:38 +02:00
Bruno Windels 6906d5a5f9 remove DND for room tiles 2018-10-17 16:02:35 +02:00
Bruno Windels 874ef50273 don't truncate room lists 2018-10-17 14:45:36 +02:00
Bruno Windels c926aa2bfe remove .collapsed class on mx_LeftPanel as the container already has it 2018-10-17 14:01:45 +02:00
Bruno Windels 8d3347bcfb fix lint 2018-10-17 13:36:15 +02:00
Bruno Windels 110e4526b8 store/load lhs & rhs sizes to/from localStorage 2018-10-16 18:43:40 +02:00
Travis Ralston fbadb588e1
Merge pull request #2221 from matrix-org/travis/tos-register 
Support m.login.terms during registration
 2018-10-16 09:47:48 -06:00
Bruno Windels 1d2e1d4b6b make it work for now, probably want to rename this back later on 2018-10-16 17:45:53 +02:00
Travis Ralston 06764c2bab
Merge pull request #2220 from matrix-org/travis/peek-invite-nag 
Don't show the invite nag bar when peeking
 2018-10-16 09:30:09 -06:00
Travis Ralston b929c36222 Documentation++ 2018-10-16 09:19:36 -06:00
Bruno Windels 30003d8f91 turn resizer into class to make programmatic interaction/cleanup easier 2018-10-16 15:16:10 +02:00
Bruno Windels c095e30ae4 provide collapsed callback to also collapse on react side of things 2018-10-16 14:56:49 +02:00
Bruno Windels cc29dd08da don't always show badge (leftover) 2018-10-16 14:54:14 +02:00
Bruno Windels c56975d93d dont base collapse toggle size on min-width, as it's not available in collapsed state 2018-10-16 12:26:08 +02:00
Bruno Windels 01471abdc5 Merge branch 'bwindels/redesign' into bwindels/resizehandles 2018-10-16 11:57:59 +02:00
Bruno Windels 6878ce3c6a Merge branch 'develop' into bwindels/redesign 2018-10-16 11:57:44 +02:00
Travis Ralston d87ab8aac0 Support m.login.terms during registration 
Fixes https://github.com/vector-im/riot-web/issues/7168
Requires https://github.com/matrix-org/synapse/pull/4004
 2018-10-15 16:39:59 -06:00
Travis Ralston 6323d78b0c Move tinter init to MatrixChat 
This is a much better place for it to live
 2018-10-15 14:41:00 -06:00
Travis Ralston 2d62fda862 Don't show the invite nag bar when peeking 2018-10-15 14:35:36 -06:00
Travis Ralston 94aac62f25 Move the login box from the left sidebar to where the composer is 
Fixes https://github.com/vector-im/riot-web/issues/4227

This includes removing the collapse button that isn't needed anymore.
 2018-10-15 14:26:24 -06:00
Travis Ralston 3d8f0adf56 Move pinned rooms check to the RoomListStore 2018-10-12 14:35:54 -06:00
Travis Ralston 103ed71eb5 Merge branch 'develop' into travis/pinned-room-list 2018-10-12 14:09:52 -06:00