PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
4411 commits 1 branch 0 tags 338 MiB
Commit graph

4411 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Baker
0e880f7971 Merge pull request #842 from matrix-org/luke/fix-emote-rrs 
Add mx_EventTile_emote class
 2017-04-26 18:25:24 +01:00
Luke Barnard
63224ff164 Add mx_EventTile_emote class 2017-04-26 18:00:25 +01:00
David Baker
1913a32fbd Merge pull request #841 from matrix-org/luke/fix-double-dialogs 
Fix dialog reappearing after hitting Enter
 2017-04-26 17:47:53 +01:00
David Baker
0c16298c45 Merge pull request #840 from matrix-org/dbkr/spinner_until_sync_fixed 
Fix spinner that shows until the first sync
 2017-04-26 17:39:29 +01:00
Luke Barnard
5f0ecc588f Fix dialog reappearing after hitting Enter 
Fixes https://github.com/vector-im/riot-web/issues/3714

https://github.com/vector-im/riot-web/issues/3714#issuecomment-297460620 :
> It's as if there are two dialogs and as one closes, the other one appears. For some reason matrix-org/matrix-react-sdk#822 is causing this.
> I've realised it's because the `priorActiveElement` is probably the button that opened the dialog. If this is focused and the enter key is released, this triggers a keyPress which fires once the dialog has closed and the button has been focused 😬 the BaseDialog only calls stopPropagation _onKeyDown.

The soln. was to submit the dialog as finished `onKeyUp`. This means the `priorActiveElement` is focussed after any key events that should be associated with the dialog.
 2017-04-26 17:37:52 +01:00
David Baker
4910a225d1 Fix spinner that shows until the first sync 
Listen for the sync event and update when it changes
 2017-04-26 17:26:53 +01:00
Luke Barnard
9ac06d4c79 Merge pull request #839 from matrix-org/dbkr/spinner_until_sync 
Show spinner until first sync has completed
 2017-04-26 14:34:08 +01:00
Luke Barnard
e37ab02706 Merge pull request #838 from matrix-org/dbkr/loggedinview_style 
Style fixes for LoggedInView
 2017-04-26 14:11:29 +01:00
David Baker
df283dae47 Show spinner until first sync has completed 
Shows the 'forward paginating' spinner until the first sync has
completed.

Fixes https://github.com/vector-im/riot-web/issues/3318
 2017-04-26 14:05:09 +01:00
David Baker
04f44e9201 Style fixes for LoggedInView 
PRing this becaise I was going to change LoggedInView, so did
some code style updates, but then decided the do the change
elsewhere.
 2017-04-26 13:48:03 +01:00
Luke Barnard
5cbf77b53e Merge pull request #834 from matrix-org/dbkr/fix_registration_custom_server 
Fix specifying custom server for registration
 2017-04-26 10:41:29 +01:00
Luke Barnard
4207bf31f2 Merge pull request #833 from matrix-org/luke/improve-country-dd 
Improve country dropdown UX and expose +prefix
 2017-04-26 10:25:10 +01:00
David Baker
78b452818c Merge pull request #836 from t3chguy/fix_UserSettingsStore 
Fix user settings store
 2017-04-26 10:11:32 +01:00
Michael Telatynski
6cbd04045d change the now working defaults 
to what they effectively were when defaultValue was broken
(hopefully tests now pass)

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 22:17:25 +01:00
Michael Telatynski
cc53825b06 fix defaultValue on getLocalSetting and getSyncedSetting 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 22:01:35 +01:00
Michael Telatynski
de89c1f710 lets make eslint at least somewhat happy 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 22:00:50 +01:00
David Baker
fa9c2d1373 Fix specifying custom server for registration 
Broken by 9cd7914ea5
(ServerConfig interface changed but Registration not updated)
 2017-04-25 19:21:09 +01:00
David Baker
c1336f09fe Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd 2017-04-25 18:06:04 +01:00
Luke Barnard
bc045698b9 Fix for fuse 2.7.2 
As of v2.7.2, fuse.js introduces a regression where the second argument to the constructor `Fuse` is assumed to be an object. There was one instance where we were not passing any argument. This fixes that.
 2017-04-25 18:01:56 +01:00
Luke Barnard
96e7479d8b Show "jump to message" when message is not paginated 2017-04-25 17:19:36 +01:00
Luke Barnard
71a119376c Guard against no children 2017-04-25 17:05:54 +01:00
Luke Barnard
1e9a2e80e9 Remove empty line 2017-04-25 11:57:03 +01:00
Luke Barnard
0d4ab07250 Fix not autoSelecting first item in dropdown 
Fixes https://github.com/vector-im/riot-web/issues/3686
 2017-04-25 11:53:14 +01:00
Luke Barnard
aac0238882 Remove redundant API for getting country prefix 2017-04-25 11:25:14 +01:00
Luke Barnard
336462366e Improve country dropdown UX and expose +prefix 
A prefix is now exposed through a change to the API for onOptionChange. This now returns the entire country object which includes iso2, prefix etc.

This also shows the prefix in the Registration and Login screens as a prefix to the phone number field.
 2017-04-25 11:21:47 +01:00
David Baker
d81adb234a v0.8.8 2017-04-25 10:53:59 +01:00
David Baker
f6fd7b04ac Prepare changelog for v0.8.8 2017-04-25 10:53:58 +01:00
David Baker
74dabb2087 Released js-sdk 2017-04-25 10:52:44 +01:00
Luke Barnard
5c83d4d2ed Merge pull request #832 from t3chguy/ude_break_out_room 
show the room name in the UDE Dialog
 2017-04-25 10:04:23 +01:00
Michael Telatynski
e64b647799 show the room name in the UDE Dialog 
especially useful when it appears after you switch rooms

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-25 09:26:21 +01:00
Matthew Hodgson
29e48d1801 Merge pull request #826 from matrix-org/matthew/mels-profile-changes 
summarise profile changes in MELS
 2017-04-25 00:18:19 +01:00
Matthew Hodgson
63dac026a8 remove spammy log 2017-04-25 00:17:46 +01:00
Matthew Hodgson
c7e4b298b2 Merge pull request #820 from turt2live/travis/h1-h2-to-h3 
Transform h1 and h2 tags to h3 tags
 2017-04-25 00:08:35 +01:00
Michael Telatynski
3997974f0f remove debug console log (ignore its content pls) 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:16:15 +01:00
Michael Telatynski
9ae9aeea07 lets improve forwarding :D 
ditch double quotes
stop caring about rhs state
always call hide_right_panel, nop if already hidden
use new restore_right_panel to bring it back if it was visible pre-us

actually tell things that we sent a message or failed in doing so
now the UDE works :D

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:14:45 +01:00
Michael Telatynski
28a2266f70 tidy up UDE handler 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:11:20 +01:00
Michael Telatynski
bfba25f3da we don't care about rhs state anymore as we can just restore it sanely 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:10:14 +01:00
Michael Telatynski
4cf9e0c1ae Create a way to restore last state of the rhs panel. 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 22:00:59 +01:00
Michael Telatynski
ee560a969a upon forwarding message to current room, explicitly remove clear from aux 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 20:17:29 +01:00
Michael Telatynski
fbca0e0d0d correct cancel appearing when it shouldn't 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-04-24 20:03:07 +01:00
turt2live
e6fd380947 Change redact -> remove for clarity 
Addresses vector-im/riot-web#2814

Non-technical users may not understand what 'redact' means and can more easily understand what 'Remove' does. See discussion on vector-im/riot-web#2814 for more information.

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 12:49:09 -06:00
Michael Telatynski
4285c395f5 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into forward_message 
Conflicts:
	src/components/structures/RoomView.js
 2017-04-24 18:36:33 +01:00
David Baker
e569144d6f v0.8.8-rc.2 2017-04-24 18:24:29 +01:00
David Baker
8e6981db44 Prepare changelog for v0.8.8-rc.2 2017-04-24 18:24:28 +01:00
Matthew Hodgson
cf2cf66cae fix deep-linking to riot.im/app 2017-04-24 18:19:51 +01:00
Matthew Hodgson
bb6dd363d7 unbreak in-app permalinks correctly 2017-04-24 18:19:39 +01:00
turt2live
3bd77d56db Allow h1 and h2 tags again. CSS handled by riot-web 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-04-24 08:45:22 -06:00
Luke Barnard
74e92d6c23 Remove DM-guessing code 2017-04-24 15:44:45 +01:00
turt2live
28923cdb93 Merge remote-tracking branch 'upstream/develop' into travis/h1-h2-to-h3 2017-04-24 08:29:10 -06:00
Matthew Hodgson
1347d9fa65 fix scroll behaviour on macs with no gemini 2017-04-24 12:53:53 +01:00