gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,627 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

612 Commits

Author SHA1 Message Date
turt2live 640fa108fc Support 12hr time on DateSeparator 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-06-01 09:52:42 -06:00
Kegan Dougal a7659a57a8 Add remaining translations 2017-05-31 16:56:50 +01:00
Kegan Dougal a3ebeb5c69 Sanitize translated HTML 2017-05-31 16:38:51 +01:00
Kegan Dougal 1dce9cda9e Translate src/components/views/globals 
directory and elements already done
 2017-05-31 16:02:59 +01:00
Kegan Dougal 162f3872e5 Translate src/components/context_menus|dialogs 2017-05-31 15:40:49 +01:00
Matthew Hodgson 4493994dd5 Merge pull request #4092 from turt2live/travis/12hrtime-hotfix 
Show 12hr time on hover too
 2017-05-30 20:15:00 +01:00
Matthew Hodgson 386fcb96fd Merge pull request #4087 from vector-im/kegan/translation-ape 
Translate src/notifications
 2017-05-30 20:14:10 +01:00
turt2live 676bd6196f Show 12hr time on hover too 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-05-30 13:07:49 -06:00
Matthew Hodgson f4c7aaf138 Merge pull request #4084 from vector-im/kegan/translation-monkey 
Translate src/components/structures
 2017-05-30 18:13:36 +01:00
Kegan Dougal 2a122a25fa Translate notification strings 2017-05-30 17:39:41 +01:00
Kegan Dougal 7e21e00c99 Translate src/components/structures 2017-05-30 16:27:48 +01:00
Matthew Hodgson 60a56d0617 Merge pull request #4056 from vector-im/t3chguy/piwik 
Piwik Analytics
 2017-05-30 15:59:08 +01:00
Michael Telatynski 6a57742343 managed to eat the eventStatus check, can't redact a local-echo etc 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-30 14:19:33 +01:00
Michael Telatynski 17c4e7a748 check PL on change as well as on comp load, that way it'll show remove button if PL increases later. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 23:49:56 +01:00
Michael Telatynski d3f9304598 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/show_redact_if_can 2017-05-29 23:17:44 +01:00
Michael Telatynski dda73cecf9 make eslint happy about MatrixToolbar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-29 19:12:04 +01:00
Matthew Hodgson 8ef7dda7bd fixing missing OK button on TextInputDialog 2017-05-29 16:43:28 +01:00
Matthew Hodgson da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Michael Telatynski 6969baa5a6 change event wording 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-28 13:08:09 +01:00
Matthew Hodgson 2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +01:00
Michael Telatynski 21b88ecfd5 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/piwik 2017-05-27 20:59:26 +01:00
Michael Telatynski 61a67c52c5 initial piwik stuff 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-27 20:39:52 +01:00
Matthew Hodgson 4293273e55 fix a bunch of i18n fails picked up by check-i18n.pl 2017-05-27 19:26:19 +01:00
David Baker 5e0457c32d Merge pull request #4035 from vector-im/dbkr/translations 
Translations!
 2017-05-26 18:39:07 +01:00
David Baker ee2a49ad41 Punctuation in translation strings 2017-05-26 13:46:01 +01:00
David Baker 92579cf463 Array literal 2017-05-26 13:36:58 +01:00
David Baker d688eade43 Remove commented use strict 
It's even less use in a comment
 2017-05-26 13:34:18 +01:00
David Baker 810fb42458 Fix indenting 2017-05-26 13:25:46 +01:00
David Baker 2982174028 No need for repeated OKs anymore 2017-05-25 18:21:40 +01:00
David Baker c15a66d1d4 Fix up notification settings strings 2017-05-25 17:21:41 +01:00
David Baker ee85eb961a Bulk change counterpart imports 
to use react-sdk wrapper function, rather than using counterpart
directly.
 2017-05-25 11:39:56 +01:00
David Baker 6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Kieran Gould cae62c8383 MessageTimestamp now has 12 hour prop 2017-05-19 22:36:02 +01:00
Maxwell Kepler 9e37fa46b1 Add 12 hour support 2017-05-19 22:29:20 +01:00
Michael Telatynski 09f987559b rename action, now forwarding any event is possible, limited by where 
button is shown, i.e easy to modify

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-19 01:30:36 +01:00
Michael Telatynski eaeac1230f Merge branch 'develop' of github.com:vector-im/riot-web into forward_message 2017-05-19 01:15:31 +01:00
Michael Telatynski 7777be89ee only for finalised events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-18 23:53:37 +01:00
Richard van der Hoff 86055bc476 Fix some setState-after-unmount in roomdirectory 
Give the RoomDirectory and unmounted guard, and use it to avoid some setState
warnings. Also, cancel the filterTimeout (no point in leaving it around).

There are still plenty of other opportunities to setState after unmount, but
the filterTimeout was causing noise in the test.
 2017-05-18 13:41:54 +01:00
David Baker 7ea0ecd125 Merge branch 'new_release_process_stable' into develop 
This reverts PRs on riot-web marked as notready, turning the develop
branch into a more stable version.
 2017-05-17 10:43:02 +01:00
David Baker 9fc9de3af5 Revert "Merge pull request #3654 from vector-im/matthew/quick-search" 
This reverts commit 8f20fcfa6b, reversing
changes made to 751f715e77.
 2017-05-16 17:21:49 +01:00
David Baker 844ea390c8 Revert "clear the searchbox after quick-search" 
This reverts commit ddd12edc06.
 2017-05-16 17:13:55 +01:00
David Baker fdf326c9f0 Revert "Cancel quick-search on Escape, clearing it and returning focus to composer." 
This reverts commit 52a119244b.
 2017-05-16 17:13:39 +01:00
David Baker 9399b7ddf0 Revert "fix incoming call box" 
This reverts commit b3431bb750.
 2017-05-16 16:35:17 +01:00
David Baker 03476705b1 Revert "better solution to incomingcallbox weirdness" 
This reverts commit be52787473.
 2017-05-16 16:35:06 +01:00
David Baker 3cead032c2 Revert "Merge pull request #3804 from vector-im/dbkr/left_panel_for_newbies_2" 
This reverts commit e6133820a2, reversing
changes made to d1db602b3a.
 2017-05-16 16:27:58 +01:00
Michael Telatynski 58ada2c27d move mxEvent.status check to js-sdk 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:14:06 +01:00
Michael Telatynski db78534b45 remove no longer required parseIntWithDefault 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:10:00 +01:00
Michael Telatynski d55f4f9e6a use new RoomState method from matrix-org/matrix-js-sdk/pull/435 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 14:08:00 +01:00
Michael Telatynski aff1e14efc first go at show redact only if we can redact 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-05-16 13:15:14 +01:00
Matthew Hodgson 25a727b8d8 use full date formats on timestamps - fixes https://github.com/vector-im/riot-web/issues/3874 2017-05-15 00:26:02 +01:00