mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity
5264 commits 185 branches 531 tags 233 MiB
Commit graph

464 commits

Author SHA1 Message Date
Matthew Hodgson
919ca5d67c fix missing string and broken var 2017-06-08 22:48:12 +01:00
Matthew Hodgson
d8f7262eac Merge branch 'develop' into t3chguy/random_fix_1 2017-06-08 15:58:49 +01:00
Luke Barnard
a158549a4c Merge pull request #4039 from vector-im/new-guest-access 
New guest access
 2017-06-07 13:40:00 +01:00
Luke Barnard
784e52f249 Align message timestamp centrally about the avatar mid-point 
Tested visually against any unintended changes to the alignment of e2e icons, with timestamps on 12h and 24h mode.
 2017-06-07 10:19:58 +01:00
David Baker
e30fcdba4c Merge branch 'develop' into new-guest-access 2017-06-06 11:39:47 +01:00
Luke Barnard
0919b7ce3a i18n for SetPasswordDialog 2017-06-05 16:13:44 +01:00
Michael Telatynski
5981887705 fix UpdateCheckBar image alt 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 16:04:01 +01:00
Michael Telatynski
a4c1aee5ea correct file header 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 16:00:49 +01:00
Michael Telatynski
f5ba6fa952 i18n things 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit d878c72)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:33 +01:00
Michael Telatynski
3ebd90565c add clearer concept of timeout vs error 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit 104c804)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:27 +01:00
Michael Telatynski
b95ad701af match ENUM style to others in project 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

(cherry picked from commit a871815)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:18 +01:00
Michael Telatynski
efc68c078e basic manual update stuff + update check bar 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-03 15:59:12 +01:00
Michael Telatynski
884322f82c remove unused imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-06-02 21:57:42 +01:00
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
d264426ece Merge branch 'develop' into new-guest-access 2017-05-30 21:06:45 +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
Kegan Dougal
2a122a25fa Translate notification strings 2017-05-30 17:39:41 +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
a92d96347b Merge branch 'develop' into new-guest-access 2017-05-28 22:50:53 +01:00
Matthew Hodgson
da7c6ca856 Merge branch 'develop' into travis/redact-to-remove 2017-05-28 22:41:38 +01:00
Matthew Hodgson
2f71dc9fe5 Merge branch 'develop' into forward_message 2017-05-28 02:37:10 +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
Oliver Hunt
16357a9bc7 Sorting of networks within a protocol based on name 
Signed-off-by: Oliver Hunt <oliver@hunt.bz>
 2017-05-27 19:10:17 +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
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
Luke Barnard
1db3ba676d Rejig the PaswordNagBar 
- Change the nag bar to read "To return to your account in future you need to set a password"
 - Underline "Set a password"
 - Make the whole thing clickable
 2017-05-25 15:33:40 +01:00
Luke Barnard
790fc7ca4a Remove "new" from set password dialog 2017-05-25 15:26:44 +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
Luke Barnard
365a46777c Remove GuestWarningBar 2017-05-25 11:02:26 +01:00
David Baker
6b6fa59f3e Squash merge https://github.com/vector-im/riot-web/pull/3636 2017-05-23 14:12:53 +01:00
Luke Barnard
299dc7fe84 Merge branch 'develop' into new-guest-access 2017-05-22 16:17:36 +01:00
Luke Barnard
9fc57786f1 Add warm-fuzzy for successful password entry 2017-05-22 16:11:52 +01:00
Luke Barnard
5d712d27d3 autoFocus new password input in SetPasswordDialog 2017-05-22 14:45:40 +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