imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
12484 commits 222 branches 563 tags 470 MiB
Commit graph

2592 commits

Author SHA1 Message Date
Travis Ralston
d7367a7cfd Merge branch 'develop' into travis/permalink-routing 2018-10-24 09:12:14 -06: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
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
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
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
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
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
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
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
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
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
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
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