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

5393 Commits (867b47f4a21ccc26ed4f51b66e0f0763222b7682)

Author SHA1 Message Date
David Baker 867b47f4a2 PR feedback: remove phases 2017-06-27 10:28:46 +01:00
David Baker f0aaca0a31 Fix some PR feedback 2017-06-27 10:05:05 +01:00
David Baker c033d5defd Missing React import 2017-06-27 09:58:29 +01:00
David Baker 09b1012388 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-26 17:49:06 +01:00
David Baker 812b3643de Add message for HSes that don't support groups 
Also add an unrelated missed translation
 2017-06-26 17:47:17 +01:00
David Baker a26498bc6c Make 'group not found' work 2017-06-26 17:38:10 +01:00
David Baker f9b37208a3 Merge pull request #1147 from matrix-org/matthew/stuck-unread 
fix one major cause of stuck unread notifications
 2017-06-26 14:57:25 +01:00
Matthew Hodgson edae66fd3a fix one major cause of stuck unread notifications 2017-06-26 14:28:56 +01:00
David Baker bbd85891f4 Merge pull request #1146 from matrix-org/luke/fix-rte-strikeout 
RTE: Use <del> for strikeout
 2017-06-26 11:38:04 +01:00
Luke Barnard d4034105a4 Revert support for ~~gh strikeout~~ 2017-06-26 10:10:31 +01:00
David Baker 7998602f42 Merge pull request #1145 from matrix-org/luke/fix-rte-tab-complete-after-join 
Update tab-complete state onRoom received after joining
 2017-06-26 10:05:35 +01:00
Luke Barnard c1bceb81d2 Merge branch 'develop' into luke/fix-rte-strikeout 2017-06-26 09:41:17 +01:00
Luke Barnard f091d209b9 Merge branch 'develop' into luke/fix-rte-tab-complete-after-join 2017-06-26 09:39:49 +01:00
Luke Barnard caa0250d30 Merge pull request #1144 from matrix-org/rte-fixes2 
RTE Fixes
 2017-06-26 09:38:14 +01:00
David Baker 3cdc7c9114 Add copyright headers 2017-06-23 18:30:16 +01:00
David Baker f0f4a16e97 Translate autocomplete delay 2017-06-23 18:28:02 +01:00
Luke Barnard 9404dd30c5 Use <del> for strikeout 
We've swapped to commonmark, which uses <del> instead of ~~ for strikeout, so make the RTE insert <del> when we apply strikeout. Also, when ~~ is inserted, transform them into <del> for simplicity. This means giving an input of ~~test~~ is effectively the same as giving an input of <del>test</del>.
 2017-06-23 18:19:06 +01:00
David Baker c0e48c72fc Remove dep on liblevenstein 
While we don't actually use it
 2017-06-23 18:03:32 +01:00
Luke Barnard ddb84f034e Update tab-complete state onRoom received after joining 
As opposed to doing it when the component mounts.

Fixes https://github.com/vector-im/riot-web/issues/3700 (hopefully)
 2017-06-23 17:52:50 +01:00
Luke Barnard 89afcfd897 Linting 2017-06-23 17:35:07 +01:00
Luke Barnard 004d4828f8 Make the tests pass 
sendTextMessage is not called when RTE Markdown is enabled, but rather sendHtmlMessage
 2017-06-23 17:08:37 +01:00
David Baker 2efa099de2 Use function from HTMLUtils for sanitizing 
Encapsulates things a little nicer
 2017-06-23 17:02:54 +01:00
Luke Barnard 738f261d5d Add missing translations for RTE ops 2017-06-23 16:14:22 +01:00
Luke Barnard 87609582c6 Merge branch 'develop' into rte-fixes2 
Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js
 2017-06-23 15:30:06 +01:00
David Baker 0207f3cc02 Merge pull request #1143 from matrix-org/luke/fix-login-multiple-fields 
Only submit phone number when phone loginType is selected
 2017-06-23 14:48:52 +01:00
David Baker ec36a348be comment why we send the empty string 2017-06-23 14:48:15 +01:00
Luke Barnard c51255da40 Submit empty string username when on phone number login 2017-06-23 14:34:19 +01:00
Luke Barnard f5353fcdc5 Only submit phone number when phone loginType is selected 
Otherwise submit a phoneNumber and phoneCountry of `null` (when logging in with email or username).

Fixes https://github.com/vector-im/riot-web/issues/4000
 2017-06-23 13:43:52 +01:00
Luke Barnard cddac3516b Merge pull request #1142 from matrix-org/dbkr/fix_potential_start_client_race_2 
Fix potential race in setting client listeners
 2017-06-23 12:56:14 +01:00
David Baker 8f3eb89f8b Fix potential race in setting client listeners 2017-06-23 10:48:21 +01:00
David Baker 75ef80ecd4 Merge remote-tracking branch 'origin/develop' into erikj/group_server 2017-06-23 09:51:24 +01:00
Matthew Hodgson ae053e88c7 fix broken vars 2017-06-22 21:59:33 +01:00
Matthew Hodgson cc3ad5972c Merge pull request #1141 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2017-06-22 21:42:26 +01:00
Weblate 4b5deaf17f Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into develop 
Conflicts:
	src/i18n/strings/fr.json
 2017-06-22 20:39:48 +00:00
Walter cc89d8318e Translated using Weblate (Ukrainian) 
Currently translated at 18.3% (168 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-06-22 20:22:03 +00:00
Elia 7bf10760e7 Translated using Weblate (Turkish) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2017-06-22 20:22:03 +00:00
Pitchaya Boonsarngsuk e5ecd168d7 Translated using Weblate (Thai) 
Currently translated at 64.6% (592 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/th/
 2017-06-22 20:22:03 +00:00
Walter eb76b1ae24 Translated using Weblate (Russian) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-06-22 20:22:03 +00:00
IMIN 50a5bc6b4f Translated using Weblate (Korean) 
Currently translated at 91.9% (841 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
 2017-06-22 20:22:02 +00:00
Szimszon f079e238fc Translated using Weblate (Hungarian) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2017-06-22 20:22:02 +00:00
zottel 81dadc9e05 Translated using Weblate (German) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-06-22 20:22:02 +00:00
Elia cc53c6776d Translated using Weblate (Turkish) 
Currently translated at 100.0% (915 of 915 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2017-06-22 19:53:09 +00:00
David Baker 73471138f8 Merge pull request #1140 from turt2live/travis/more-12h 
Use 12h timestamps when enabled in RR
 2017-06-22 17:44:52 +01:00
David Baker ac3e039e2a Merge pull request #1019 from matrix-org/t3chguy/updating_stuff 
manual check for updates
 2017-06-22 17:36:55 +01:00
turt2live a22f14e910 Use 12h timestamps when enabled in RR 
Fixes vector-im/riot-web#4393 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-22 08:54:34 -06:00
David Baker 042152aa66 Merge pull request #1138 from matrix-org/rav/fix_braindead_firefox 
Fix load failure in firefox when indexedDB is disabled
 2017-06-22 15:22:31 +01:00
David Baker c101459e63 Merge pull request #1139 from matrix-org/rav/fix_incorrect_log 
Fix an incorrect console error
 2017-06-22 15:21:09 +01:00
Richard van der Hoff fcd945afc2 Fix an incorrect console error 
... this error is thrown when registering as guest or loading from
localstorage, not when using tokenparams.
 2017-06-22 15:08:30 +01:00
Richard van der Hoff b124ac21fd Fix load failure in firefox when indexedDB is disabled 2017-06-22 15:07:54 +01:00
David Baker 3da9aaff9a Merge pull request #1134 from matrix-org/rav/remove_dead_olm_error 
Remove dead special-casing for OLM.BAD_LEGACY_ACCOUNT_PICKLE
 2017-06-22 14:24:27 +01:00