OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,134 Commits
211 Branches
549 Tags
658 MiB
Commit Graph

12134 Commits (5600a9d02adc61f9420234a4090d9342743443db)

Author SHA1 Message Date
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 43702a4887 v0.14.2-rc.1 2018-10-24 11:23:57 +01:00
David Baker 5f8eaa3782 Prepare changelog for v0.14.2-rc.1 2018-10-24 11:23:12 +01:00
David Baker 819fab3198 js-sdk rc.1 2018-10-24 11:20:39 +01: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
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
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
sergio e9a62bff2e Translated using Weblate (Russian) 
Currently translated at 95.9% (1219 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-10-22 07:37:42 +00:00
hamster 83ebe3752d Translated using Weblate (Polish) 
Currently translated at 91.8% (1166 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-22 07:37:42 +00:00
Victor Grousset b3d5612746 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 07:37:41 +00:00
FeiYang 2ac10dd6b1 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1270 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-10-22 07:37:41 +00:00
Bruno Windels 8532828b46
Merge pull request #2230 from matrix-org/travis/fix-canonical-aliases 
Fix an error where React doesn't like value=null on a select
 2018-10-22 07:37:23 +00:00
Karol Kosek 2a6ae17e6a Translated using Weblate (Polish) 
Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-20 16:07:08 +00:00
Oliwer 51a03a700a Translated using Weblate (Polish) 
Currently translated at 91.6% (1164 of 1270 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-10-20 15:31:16 +00: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
Weblate b17bf05761 Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 22:23:01 +00: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
Weblate 7df85725f7 Merge remote-tracking branch 'origin/develop' into develop 2018-10-19 22:22:35 +00: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