afa6acc20a
All the trailing commas
2016-07-08 15:42:42 +01:00
6d403e792b
Add --stage 1 to babel cmdline
...
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which we should use when we switch back to babel 6.
2016-07-08 15:29:59 +01:00
e6ff1f8836
Merge pull request #334 from matrix-org/dbkr/error_on_email_registered
...
Error on registration if email taken
2016-07-07 13:03:58 +01:00
345ed04ba9
Less enetering
2016-07-07 13:03:27 +01:00
04728ae03b
PR fixes + more general notes
2016-07-07 12:09:02 +01:00
a6b04c462e
Comment how we're remembering form vals
2016-07-07 11:26:35 +01:00
5c879d786e
Doc the default params / guestUsername props
2016-07-07 11:23:08 +01:00
e2c473b366
Error on registration if email taken
...
Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147 ) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.
2016-07-06 15:22:06 +01:00
a2b64798f7
Fix timelinepanel test timeout
...
The previous fix was adjusting the wrong timeout: it's hitting browserNoActivityTimeout, so revert previous fix & do this instead
2016-07-05 14:35:34 +01:00
63ad57a8d4
Merge pull request #332 from aviraldg/feature-emojione
...
feat: render unicode emoji as emojione images
2016-07-05 10:18:33 +01:00
22ae60fb45
Merge pull request #333 from aviraldg/feature-img-data
...
feat: unblacklist img tags with data URIs
2016-07-05 09:59:20 +01:00
545d59769e
feat: unblacklist img tags with data URIs
...
fixes vector-im/vector-web#1692
2016-07-05 11:16:09 +05:30
a9a3d31b3f
feat: improve emoji-body detection
2016-07-05 10:43:09 +05:30
6a133bc034
feat: and emojify name in MemberInfo
2016-07-05 10:24:18 +05:30
020f1f4320
feat: emojify ALL THE THINGS!
2016-07-05 10:16:17 +05:30
9c0dc74289
feat: use svg emoji
2016-07-05 09:58:28 +05:30
4069886cbd
feat: large emoji support
2016-07-05 04:04:57 +05:30
48f2c4a696
feat: render unicode emoji as emojione images
2016-07-05 03:13:53 +05:30
9b364c1be5
Merge pull request #331 from aviraldg/fix-autocomplete-1
...
Autocomplete fixes
2016-07-04 21:53:52 +01:00
ed305bd547
fix: https for DDG, provide range for UserProvider
2016-07-05 01:37:01 +05:30
22a2593bf2
fix: unbreak old MessageComposerInput/TabComplete
2016-07-05 01:32:40 +05:30
87300e3a9f
Merge pull request #296 from aviraldg/feature-autocomplete
...
Better autocomplete
2016-07-04 18:16:26 +01:00
b3d8292113
feat: use canonical room alias for room completion
2016-07-04 22:34:58 +05:30
73b726e5fb
feat: import only flatMap from lodash
2016-07-04 21:56:09 +05:30
56c73b68a9
Use markdown
...
because the rst wasn't formatting and we use md for everything else in this repo, and in a document that talks about consistency...
2016-07-04 17:23:38 +01:00
dfe745c9e6
Add a JS code style doc
2016-07-04 17:15:15 +01:00
30b7efd585
fix: code cleanup, fix getCurrentCommand
2016-07-04 21:44:35 +05:30
cccc58b47f
feat: implement autocomplete replacement
2016-07-03 22:15:13 +05:30
8961c87cf9
feat: Autocomplete selection wraparound
2016-07-03 01:11:34 +05:30
cd928fe6f5
Merge remote-tracking branch 'upstream/develop' into feature-autocomplete
2016-07-03 00:00:02 +05:30
28e620f19b
Run eslint in jenkins script
2016-07-01 19:38:14 +01:00
21cc4cba9a
Correct npm run lint command line
2016-07-01 19:30:53 +01:00
9f5a2d57df
Merge pull request #329 from aviraldg/feature-eslint
...
feat: add and configure eslint
2016-07-01 19:26:16 +01:00
1c002866e8
feat: add and configure eslint
2016-07-01 23:08:51 +05:30
a671e07da7
Merge pull request #326 from matrix-org/dbkr/fix_user_links
...
Fix user links
2016-06-30 17:43:08 +01:00
ce39822957
Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist
...
Fix ordering of Memberlist
2016-06-29 10:21:15 +01:00
7609b9eba8
Simplify logic for timestamp ordering of memberlist
2016-06-29 17:45:24 +09:00
b3d871aa6a
Add back comment
2016-06-29 17:33:41 +09:00
69cb0a8f1c
Switch ordering of Idle users
2016-06-29 17:08:17 +09:00
72a1d5a0de
Remove unused comments
2016-06-29 16:58:08 +09:00
174caceabf
Use lastActiveAgo to reorder member list
2016-06-29 16:57:59 +09:00
ba47c5a198
Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links
2016-06-28 17:15:17 +01:00
a4329aa346
Merge pull request #325 from matrix-org/dbkr/room_not_exist_error
...
Display an error message if room not found
2016-06-28 17:14:30 +01:00
e8337b2119
More PR feedback
2016-06-28 17:11:47 +01:00
548c392236
PR feedback
2016-06-28 14:59:45 +01:00
c016eb78c8
Fix user links
...
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
2016-06-28 14:28:05 +01:00
98c03869a7
Display an error message if room not found
...
Fixes https://github.com/vector-im/vector-web/issues/1012
2016-06-24 15:34:07 +01:00
1c280badde
Increase timeout on TimelinePanel test
...
Since it looks like this timeout sometimes isn't sufficient to scroll all the way up when jenkins is very busy
2016-06-23 18:36:44 +01:00
b01b786dfc
Merge pull request #324 from matrix-org/rav/device_blocking
...
Implement device blocking
2016-06-23 18:24:21 +01:00
a1dd427420
Implement device blocking
...
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146 . It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.
Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
2016-06-23 17:30:04 +01:00
David Baker