Commit Graph

711 Commits (57f82c3c9e855e6ae3a293fa24ee83145e9e958b)

Author SHA1 Message Date
Luke Barnard 57f82c3c9e Quote using innerText
codep matrix-org/matrix-react-sdk#1289
2017-08-10 10:18:37 +01:00
Richard van der Hoff bc2f639aae Fix a couple of minor errors in the room list
bluebird promises don't support .fail, so some operations didn't work quite
right. We should use .catch instead.
2017-07-24 17:19:46 +01:00
Luke Barnard 53ae42ed68 Use `catch` instead of `fail` to handle room tag error
Because bluebird doesn't support fail
2017-07-19 14:11:22 +01:00
Richard van der Hoff 76181f4771 Merge remote-tracking branch 'origin/develop' into rav/bluebird 2017-07-13 12:04:54 +01:00
Richard van der Hoff 7238c4dfac Fix overlooked `q` 2017-07-13 11:33:25 +01:00
Richard van der Hoff 1d2d086a58 Replace q.allSettled()
Bluebird doesn't have an `allSettled` method, so instead catch the exceptions and
use `all`.
2017-07-13 00:50:01 +01:00
Richard van der Hoff d5b550f89a replace q method calls with bluebird ones
```
find src test -name '*.js' |
    xargs perl -i -pe 's/q\.(all|defer|reject|delay|try|isFulfilled)\(/Promise.$1(/'
```
2017-07-13 00:50:01 +01:00
Richard van der Hoff b29b4a959b q(...) -> Promise.resolve
```
find src test -name '*.js' | xargs perl -i -pe 's/\b[qQ]\(/Promise.resolve(/'
```
2017-07-13 00:50:01 +01:00
Richard van der Hoff 10decf95f6 replace imports of `q` with bluebird
update `package.json`

```
find src test -name '*.js' |
    xargs perl -i -pe 'if (/require\(.[qQ].\)/) { $_ = "import Promise from '\''bluebird'\'';\n"; }'

find src test -name '*.js' |
    xargs perl -i -pe 'if (/import [qQ] /) { $_ = "import Promise from '\''bluebird'\'';\n"; }'
```
2017-07-13 00:48:31 +01:00
Luke Barnard 188a58e5c7 RateLimitedFunc -> rate_limited_func 2017-07-12 18:18:13 +01:00
Luke Barnard 3e1a909b1d Just use the onKeyDown of the <input> 2017-07-12 17:46:27 +01:00
Luke Barnard 41cd238e02 Update to reflect previous implementation
Which was a74bbb424c
2017-07-12 17:10:43 +01:00
Luke Barnard 4fe4e10abb Implement the focus_room_filter action
This is for ctrl+k room filtering and switching
2017-07-12 13:49:57 +01:00
Richard van der Hoff bc60fa81af more HomePage tweaks
* Don't log errors with no context
* i18nify the "Couldn't load home page" message
2017-07-11 14:29:47 +01:00
Richard van der Hoff d755903fdb typo 2017-07-11 14:10:18 +01:00
Richard van der Hoff 8ac26dd19f Give HomePage an unmounted guard
Also add missing return in error-handling path
2017-07-11 14:08:16 +01:00
Luke Barnard 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
Richard van der Hoff 60703bdcfc Log errors thrown by getThirdpartyProtocols
- so that it appears in rageshakes and test logs.
2017-07-05 10:54:10 +01:00
Luke Barnard 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
Michael Telatynski 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
Michael Telatynski 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
Michael Telatynski 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
Richard van der Hoff 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
Luke Barnard c4a3211cfc Use _tJsx for PasswordNagBar (because it has <u>) 2017-06-20 16:28:40 +01:00
Michael Telatynski fe1b0b5cd8 Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-20 14:32:19 +01:00
Luke Barnard 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
turt2live b9fc46fa41 Change missed 'Redact' to 'Remove' in ImageView.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-06-19 16:24:03 -06:00
Matthew Hodgson 1c82b7b0c3 add register button 2017-06-19 00:54:07 +01:00
Matthew Hodgson 612cad5d9e fix broken vars 2017-06-19 00:01:11 +01:00
Michael Telatynski 274536bf13 change dispatcher forward_event signature
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-06-16 16:11:33 +01:00
David Baker 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
Luke Barnard 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
David Baker 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
David Baker 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
Michael Telatynski 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
Michael Telatynski deb7ed660c Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/updating_stuff 2017-06-11 23:13:49 +01:00
Michael Telatynski 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
Michael Telatynski 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
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
Matthew Hodgson da69d03b1d i18n powered by [matrix] sanely 2017-06-08 13:50:53 +01:00
Matthew Hodgson cabbd16dd3 fix colour & hyperlink for home page header 2017-06-08 12:06:52 +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
David Baker 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
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 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
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