OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
8,465 Commits
217 Branches
561 Tags
468 MiB
Commit Graph

8465 Commits (1d43ccde23f18ac1c38af136516237713b0a28e0)

Author SHA1 Message Date
Weblate 8ccc53088f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:49:44 +00:00
Andrey 0ce043ab12 Translated using Weblate (Russian) 
Currently translated at 99.5% (963 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-11 10:49:44 +00:00
David Baker 292a6c5767
Merge pull request #1674 from aidalgol/rebase-dialogs 
Normalise dialogs
 2018-01-11 10:49:40 +00:00
Kévin C 5e7fab1e15 Translated using Weblate (French) 
Currently translated at 100.0% (967 of 967 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-01-11 10:40:12 +00:00
Weblate f845071f91 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:35:01 +00:00
David Baker efb96cdd2a
Merge pull request #1695 from matrix-org/dbkr/send_without_verifying 
Add 'send without verifying' to status bar
 2018-01-11 10:34:56 +00:00
Weblate 070114d911 Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:44 +00:00
David Baker 4524e227d2
Merge pull request #1660 from matrix-org/t3chguy/nvl/rich_quoting 
Implement Rich Quoting/Replies
 2018-01-11 10:34:39 +00:00
David Baker 57e11cea1c Fix jsdoc 2018-01-11 10:27:15 +00:00
Michael Telatynski 007715aeaa
Run prune-i18n.js 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:54:00 +00:00
Michael Telatynski 94167e2b8b
Run gen-i18n.js and embed the ellipsis into the base string 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:52:20 +00:00
Michael Telatynski f5bad8bb10
Regenerate ESLintIgnore file 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:50:12 +00:00
Michael Telatynski 1a7dc22a8d
make wantsDateSeparator generic and throw into DateUtils 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:06:24 +00:00
Michael Telatynski e45fcf10c7
Refactor DateUtils to ES6 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 12:00:11 +00:00
Michael Telatynski 9e2238e884
remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:56:36 +00:00
Michael Telatynski 1bc9d344ae
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

# Conflicts:
#	src/components/views/messages/TextualBody.js
 2018-01-10 11:54:58 +00:00
Michael Telatynski 454fd23f25
fix typo shsape->shape 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:48 +00:00
Michael Telatynski a977ab9be4
change handler name to suit convention 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 11:51:23 +00:00
David Baker e2b2818555 Empty to force re-test 2018-01-10 11:03:38 +00:00
David Baker 9dd9a5be4b Wording tweak 2018-01-09 17:59:49 +00:00
David Baker dbb8f878cb Tidy up imports 2018-01-09 17:57:18 +00:00
David Baker 4c101628b5 Add 'send without verifying' to status bar 
Fixes other part of https://github.com/vector-im/riot-web/issues/5936
 2018-01-09 13:52:37 +00:00
Aidan Gauland 9365860075 Update copyright line 2018-01-09 18:40:12 +13:00
Michael Telatynski d0897dc8f3
update wording to not imply exhaustiveness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-08 13:29:27 +00:00
Iru Cai (vimacs) 275c960337 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 76.8% (739 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-01-08 02:00:48 +00:00
Weblate c8797a1347 Merge remote-tracking branch 'origin/develop' into develop 2018-01-07 20:33:13 +00:00
Matthew Hodgson 76ce40715d bump commonmark dep to try to fix https://github.com/vector-im/riot-web/issues/3428 better 2018-01-07 20:32:57 +00:00
Weblate eae95fce61 Merge remote-tracking branch 'origin/develop' into develop 2018-01-07 20:31:12 +00:00
Osoitz f6851101cc Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-07 20:31:11 +00:00
Matthew Hodgson bcc3a4870a
Merge pull request #1694 from matrix-org/revert-1270-luke/fix-md-unescaped-tokens 
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown"
 2018-01-07 20:31:07 +00:00
Matthew Hodgson a88f92c3e3
Revert "MD-escape URLs/alises/user IDs prior to parsing markdown" 2018-01-07 20:30:18 +00:00
Szimszon b49c5a4c16 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-01-05 17:27:39 +00:00
Weblate a9fa4c5f67 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 16:16:14 +00:00
David Baker 6902cb5648
Merge pull request #1693 from matrix-org/luke/pref-tag-panel-selected2 
Cache isConfCallRoom
 2018-01-05 16:16:10 +00:00
lukebarnard 5ac1d8ce81 Merge branch 'develop' into luke/pref-tag-panel-selected2 2018-01-05 15:57:43 +00:00
Weblate 7fc21f4423 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:55:29 +00:00
David Baker 587a6f8e2b
Merge pull request #1687 from matrix-org/luke/perf-tag-panel-selected 
Improve performance of tag panel selection (when tags are selected)
 2018-01-05 15:55:24 +00:00
Weblate c0d14904ef Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 15:26:27 +00:00
Osoitz f6b24b749f Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 15:26:26 +00:00
Luke Barnard 8c84c3f929
Merge pull request #1680 from matrix-org/t3chguy/hide_roomstatusbar 
Hide status bar on visible->hidden transition
 2018-01-05 15:26:22 +00:00
lukebarnard 8509db1bda Cache isConfCallRoom 
This only needs to be calculated one per room
 2018-01-05 14:53:04 +00:00
Osoitz 1e66f4f0ed Translated using Weblate (Basque) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-01-05 14:31:24 +00:00
Kévin C f1850d188e Translated using Weblate (French) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/

Correction (Seul -> Seules)
 2018-01-05 13:17:33 +00:00
lukebarnard 8ade357349 Handle newly added rooms and removed rooms. 2018-01-05 12:33:26 +00:00
Andrey 44d920afc8 Translated using Weblate (Russian) 
Currently translated at 100.0% (961 of 961 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 12:27:22 +00:00
Weblate 8a805187dc Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:24:14 +00:00
David Baker 845dda8f48
Merge pull request #1692 from matrix-org/t3chguy/pr-revival/turt2live/single_unsent 
[revived] Singularise unsent message prompt, if applicable
 2018-01-05 12:24:06 +00:00
Weblate 58c1118993 Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 12:18:19 +00:00
Andrey d3624886a7 Translated using Weblate (Russian) 
Currently translated at 100.0% (958 of 958 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-01-05 12:18:19 +00:00
Michael Telatynski c61d09464a
Merge pull request #1683 from matrix-org/t3chguy/memberinfo_warn_demote_self 
small refactor && warn on self-demotion
 2018-01-05 12:18:15 +00:00