Commit Graph

10121 Commits (8ddd2dd078ef5b6dd3bcc3173f0fc22798e962f2)

Author SHA1 Message Date
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 33e2fc28b7
Merge pull request #2254 from matrix-org/travis/permalink-routing-2
Fix and test matrix.to alias permalinks
2018-10-29 15:55:11 +00:00
Aaron Raimist e61e7f2626
Fix eslint --fix
Signed-off-by: Aaron Raimist <aaron@raim.ist>
2018-10-26 23:04:00 -05: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 5b22d157a7 Fix candidate server encoding 2018-10-26 20:34:06 -06:00
Travis Ralston 3bc5e2beb3 Fix and test matrix.to alias permalinks
Fixes https://github.com/vector-im/riot-web/issues/7614
Regression of https://github.com/matrix-org/matrix-react-sdk/pull/2250
2018-10-26 19:47:53 -06: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
Travis Ralston 0857e2c5e9 Clarify why we pick popular servers over the one that created the room 2018-10-26 12:21:27 -06:00
Travis Ralston 3734c8ab91 Don't mention that matrix.org is likely to be popular
This is untrue for quite a few real scenarios, including private federations and a ton of rooms.
2018-10-26 12:21:02 -06:00
Travis Ralston d802ee0fa2 Move the max candidates constant out of the function 2018-10-26 10:25:23 -06:00
Travis Ralston c389540522 Appease the linter 2018-10-26 10:22:18 -06: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 52094964a0 Fix the server candidate picker to actually work
Tests do wonders.
2018-10-25 15:23:15 -06:00
Travis Ralston 9cdb527163
Merge branch 'develop' into travis/pinned-room-list 2018-10-25 10:57:08 -06: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 e8cb636631 Pick servers for ?via on matrix.to links based on some heuristics 2018-10-24 18:01:08 -06:00
Travis Ralston 6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Will Hunt def0b2d8fb Add developertools option to UserSettings 2018-10-24 18:20:16 +01:00
Will Hunt 27a0f0ca62 Add i18n string 2018-10-24 18:16:55 +01:00
Will Hunt 8118a9c71a Wall devtools button behind a setting 2018-10-24 18:15:35 +01:00
Will Hunt a5ae599dcb Add show developer tools option 2018-10-24 18:15:25 +01:00
Will Hunt 3c045f3f65 Revert i18n changes for en_US 2018-10-24 18:02:45 +01:00
Will Hunt 44a41b589d Comma on strings and styling button 2018-10-24 17:50:27 +01:00
Will Hunt 06c34cff9c Add devtools string 2018-10-24 17:37:13 +01:00
Will Hunt 79d467c551 Add button to open devtools in roomsettings 2018-10-24 17:36:58 +01:00
Travis Ralston 6b13a071f3
Merge pull request #2242 from aaronraimist/leave-group-warning
Add warning when administrator leaves community (#5724)
2018-10-24 10:26:25 -06: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
Victor Grousset ef50e05580 Translated using Weblate (Esperanto)
Currently translated at 86.3% (1098 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-24 09:24:46 +00: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
Weblate 87ae1ce458 Merge remote-tracking branch 'origin/develop' into develop 2018-10-23 09:18:12 +00:00
RainSlide 690405d3f6 Translated using Weblate (Chinese (Simplified))
Currently translated at 98.7% (1255 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
2018-10-23 09:18:11 +00: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
Weblate a5ea073350 Merge remote-tracking branch 'origin/develop' into develop 2018-10-23 04:44:19 +00: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
Weblate 11a0437df1 Merge remote-tracking branch 'origin/develop' into develop 2018-10-23 02:18:12 +00:00
FeiYang 6774fd7acc Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2018-10-23 02:02:24 +00: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
Szimszon 2b9a646760 Translated using Weblate (Hungarian)
Currently translated at 100.0% (1271 of 1271 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2018-10-22 18:45:24 +00:00
Weblate 1fd6155163 Merge remote-tracking branch 'origin/develop' into develop 2018-10-22 18:34:37 +00:00
Victor Grousset 60b1b30c51 Translated using Weblate (Esperanto)
Currently translated at 86.4% (1098 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
2018-10-22 18:34:36 +00:00
J. Ryan Stinnett 4335dfea16 Translated using Weblate (English (United States))
Currently translated at 65.1% (828 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2018-10-22 18:34:36 +00: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 7d0b8083b6 hardcode to to dharma to avoid weird mix 2018-10-22 16:33:46 +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
Bruno Windels 4d53e13a28 make manual resizing follow cursor more accurately
by clearing flex-grow that was set based on the list size,
you don't want it to grow anymore but be exactly the size
you are giving it.
2018-10-22 15:56:39 +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