c1b8879b6b
Merge pull request #4500 from vector-im/luke/feature-enable-RTE
...
Take RTE out of labs
2017-07-10 13:56:02 +01:00
60703bdcfc
Log errors thrown by getThirdpartyProtocols
...
- so that it appears in rageshakes and test logs.
2017-07-05 10:54:10 +01:00
77a52b02cb
Take RTE out of labs
...
Goes with https://github.com/matrix-org/matrix-react-sdk/pull/1176
2017-07-04 16:26:19 +01:00
f36c1ca207
fix Quote not closing contextual menu
...
also use `this.closeMenu();` over the explicit direct call as the wrapper exists and is a little clearer
2017-06-27 14:51:18 +01:00
e33e0effa3
use `_t` on string literals and i18n 'warning'
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-22 15:05:13 +01:00
0788826a71
Merge branches 'develop' and 't3chguy/updating_stuff' of github.com:vector-im/riot-web into t3chguy/updating_stuff
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
# Conflicts:
# electron_app/src/tray.js
2017-06-22 15:04:33 +01:00
a9c8429d2e
Merge pull request #4362 from turt2live/travis/missed-redact
...
Change missed 'Redact' to 'Remove' in ImageView.
2017-06-22 14:37:31 +01:00
c4a3211cfc
Use _tJsx for PasswordNagBar (because it has <u>)
2017-06-20 16:28:40 +01:00
fe1b0b5cd8
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-20 14:32:19 +01:00
d5d29c1c92
Give _t to PasswordNagBar, add CSS for UserSettings password warning
...
Codep https://github.com/matrix-org/matrix-react-sdk/pull/1123
2017-06-20 11:23:34 +01:00
b9fc46fa41
Change missed 'Redact' to 'Remove' in ImageView.
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:24:03 -06:00
1c82b7b0c3
add register button
2017-06-19 00:54:07 +01:00
612cad5d9e
fix broken vars
2017-06-19 00:01:11 +01:00
274536bf13
change dispatcher forward_event signature
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-16 16:11:33 +01:00
2c186aafae
Fix h2 in markdown being weird
...
Date separator style was just define don any h2 in the message
list, so got picked up by any h2s in markdown too. Give date
separators their own class.
Fixes https://github.com/vector-im/riot-web/issues/4328
2017-06-16 11:36:24 +01:00
4f55f810af
Ask for email address after setting password for the first time
...
This is so that the user can reset their password.
2017-06-14 09:30:08 +01:00
91295c68ad
Don't show the tooltips when filtering rooms
...
Fixes https://github.com/vector-im/riot-web/issues/4281
2017-06-12 17:54:58 +01:00
bbb9dd9228
Fix broken riot.im link on homepage
...
For want of a quote the something something
Also add noopeners
2017-06-12 17:33:02 +01:00
9493f4a872
fallback from undefined for interpolation
...
because _t called with undefined interpolation name: errorDetail
even though when its undef its not used to sprinf-js would have been fine...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-12 10:42:44 +01:00
deb7ed660c
Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff
2017-06-11 23:13:49 +01:00
a520f0bfed
move all logic, make bar more generic
...
pass through actual errors
and tidy
needs testing
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 19:19:17 +01:00
6592526109
change /!\ to Warning for accessibility (plus weird escaping?)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-11 13:45:37 +01:00
919ca5d67c
fix missing string and broken var
2017-06-08 22:48:12 +01:00
d8f7262eac
Merge branch 'develop' into t3chguy/random_fix_1
2017-06-08 15:58:49 +01:00
da69d03b1d
i18n powered by [matrix] sanely
2017-06-08 13:50:53 +01:00
cabbd16dd3
fix colour & hyperlink for home page header
2017-06-08 12:06:52 +01:00
a158549a4c
Merge pull request #4039 from vector-im/new-guest-access
...
New guest access
2017-06-07 13:40:00 +01:00
090a7c5761
Remove '/' from homepage URL
...
As we are not always at the root of the web server.
2017-06-07 11:20:41 +01:00
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
e30fcdba4c
Merge branch 'develop' into new-guest-access
2017-06-06 11:39:47 +01:00
feaff9d99d
Fix tests for new-guest-access
...
This time the test wasn't being flaky, but it does inspect a lot of the internal of RoomView, which has had some modifications recently. I've updated the test to reflect this and it passes locally.
Also, fix a bug in HomePage with an undeclared "error" which should be "err".
Let's see what Travis thinks of this!
2017-06-05 20:16:44 +01:00
0919b7ce3a
i18n for SetPasswordDialog
2017-06-05 16:13:44 +01:00
5981887705
fix UpdateCheckBar image alt
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:04:01 +01:00
a4c1aee5ea
correct file header
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 16:00:49 +01:00
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
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
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
efc68c078e
basic manual update stuff + update check bar
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-03 15:59:12 +01:00
884322f82c
remove unused imports
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-02 21:57:42 +01:00
640fa108fc
Support 12hr time on DateSeparator
...
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-01 09:52:42 -06:00
a8f0ed60cf
Merge branch 'new-guest-access' into matthew/i18n-welcome
2017-06-01 11:16:50 +01:00
623f995934
fix untested stuff with iframe homepages
2017-06-01 11:13:04 +01:00
a21c77f4dd
make it work
2017-06-01 00:07:47 +01:00
a7659a57a8
Add remaining translations
2017-05-31 16:56:50 +01:00
a3ebeb5c69
Sanitize translated HTML
2017-05-31 16:38:51 +01:00
1dce9cda9e
Translate src/components/views/globals
...
directory and elements already done
2017-05-31 16:02:59 +01:00
162f3872e5
Translate src/components/context_menus|dialogs
2017-05-31 15:40:49 +01:00
17e80d7757
i18n welcome
2017-05-31 11:02:59 +01:00
1e1a43c78f
support iframes for RTS urls
2017-05-30 21:52:43 +01:00
64a67583e0
Merge pull request #4038 from vector-im/tom-welcome-page
...
Tom welcome page
2017-05-30 21:36:21 +01:00
Luke Barnard