409 Commits

Author	SHA1	Message	Date
Michael Telatynski	3aa12246ea	Merge branch 'develop' into t3chguy/devtools	2017-08-31 17:11:53 +01:00
Michael Telatynski	b84f258f87	add bottom margin to navigation buttons of room state explorer ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-31 13:49:52 +01:00
Michael Telatynski	68fc202086	remove pointless self vars and DRY render method of send custom events ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-31 09:45:46 +01:00
Michael Telatynski	ce0861d5bd	undo `` as its hard to read ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-31 09:25:06 +01:00
David Baker	a70e7751e9	Merge pull request #4943 from anoadragon453/develop ... Update vector-im to riot-im on Login	2017-08-31 08:33:21 +01:00
Andrew (anoa)	8e5427d626	Update vector-im to riot-im on Login ... Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>	2017-08-30 12:06:19 -07:00
Michael Telatynski	a2b57f502c	lets let people know that the bug report actually sent properly :) ... RFC on the wording of it. Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-28 00:07:48 +01:00
Michael Telatynski	d14f16f0e9	look at event property of the mxEv, this way we won't have all ... the additional internal keys :) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-27 17:25:51 +01:00
Michael Telatynski	a437f23e9d	add i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-26 18:48:24 +01:00
Michael Telatynski	84f4fbe142	DRY up code and change flow to be less destructive ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 23:56:57 +01:00
Michael Telatynski	3fd1a366bf	add back button to all pages and widen textarea	2017-08-10 23:13:40 +01:00
Michael Telatynski	2d4484e0f2	Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/devtools	2017-08-10 16:06:14 +01:00
Luke Barnard	535e33509b	Merge pull request #4688 from vector-im/t3chguy/i18n_analytics ... un-i18n Modal Analytics	2017-08-10 15:36:04 +01:00
Michael Telatynski	4c6836bc3f	don't track error messages .2 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 15:13:30 +01:00
Michael Telatynski	9c5ceb6775	don't track error messages ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-08-10 13:56:01 +01:00
Luke Barnard	57f82c3c9e	Quote using innerText ... codep matrix-org/matrix-react-sdk#1289	2017-08-10 10:18:37 +01:00
Michael Telatynski	1b004f170d	make eslint happy	2017-08-03 01:10:32 +01:00
Michael Telatynski	9ab30b7b17	fix line-length and copyright header	2017-08-03 01:05:43 +01:00
Michael Telatynski	131d1c74c9	add room state explorer to devtools	2017-08-03 00:59:40 +01:00
Michael Telatynski	6bfdd69279	add devtools dialog	2017-07-31 12:08:41 +01:00
Michael Telatynski	5b6dbfb701	Merge branch 'develop' of github.com:vector-im/riot-web into t3chguy/i18n_analytics	2017-07-28 21:02:48 +01:00
Michael Telatynski	93a3c896a4	un-i18n Modal Analytics ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2017-07-27 17:45:02 +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	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	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	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
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	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
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
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