Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 05:55:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
11,920 Commits 206 Branches 552 Tags 519 MiB
d58ff90ec1
Commit Graph

11920 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
43980addd0 Add hostname sanity tests 
In the event someone changes how the hostname parsing works.
 2018-10-25 15:22:52 -06:00
Travis Ralston
b9bfbdc22d Fix the tests so they actually test something 2018-10-25 15:22:28 -06:00
Travis Ralston
54ff5d8f25 Fix Karma/Webpack so it can build the tests 2018-10-25 15:21:18 -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
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
a8782120fe Install memfs because webpack is made of fail 2018-10-24 16:57:16 -06:00
Travis Ralston
6ee495b912 Merge remote-tracking branch 'origin/develop' into travis/permalink-routing 2018-10-24 16:36:39 -06:00
Travis Ralston
8d47baa95a
Merge pull request #2249 from Half-Shot/hs/devtools-in-roomsettings 
Add a devtools button to roomsettings
 2018-10-24 11:40:36 -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
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
David Baker
4c3c8a6285
Merge pull request #2244 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-10-24 11:20:02 +01: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
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
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
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
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
Travis Ralston
879ef7f52b
Merge pull request #2236 from aaronraimist/leave-room-button 
Change leave room button text, OK -> Leave
 2018-10-22 20:18:07 -06: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
Travis Ralston
f2cac45543 Merge branch 'develop' into travis/fix-group-members 2018-10-22 15:02:01 -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
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
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
Weblate
21d426821a Merge remote-tracking branch 'origin/develop' into develop 2018-10-22 07:37:42 +00:00