Commit Graph

62959 Commits

Author SHA1 Message Date
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
bf88620581 Merge pull request #3727 from vector-im/dbkr/warn_when_single_instance_quit
Warn when exiting due to single-instance
2017-04-25 11:18:19 +01:00
David Baker
777087504a Merge branch 'release-v0.9.9' 2017-04-25 11:12:14 +01:00
David Baker
aa482bae28 v0.9.9 v0.9.9 2017-04-25 11:08:08 +01:00
David Baker
6fd64d19f0 Prepare changelog for v0.9.9 2017-04-25 11:08:07 +01:00
David Baker
2d311ddbf4 Released js-sdk & react-sdk 2017-04-25 11:04:03 +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
David Baker
e24ef2bb5c Warn when exiting due to single-instance
This lost me a fair bit of time trying to figure out why Riot was
starting and then immediately quitting.
2017-04-25 10:18:17 +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
4dd6ee681d fix /config.json in .gitignore 2017-04-25 00:14:24 +01:00
Matthew Hodgson
ef057e4693 Merge pull request #3709 from t3chguy/electron_notification_causes_weirdness_onclick
Electron forgets it was maximized when you click on a notification
2017-04-25 00:10:20 +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
Matthew Hodgson
f53b238c24 Merge pull request #3719 from turt2live/travis/h1-h2-to-h3
CSS to make h1 and h2 the same size as h1.
2017-04-25 00:08:07 +01:00
Matthew Hodgson
7957eeba10 Merge pull request #3721 from vector-im/luke/css-fix-long-room-names
Prevent long room names/topics from pushing UI of the screen
2017-04-25 00:07:41 +01:00
Matthew Hodgson
95931918dc Merge pull request #3717 from vector-im/luke/css-disable-dd-highlight
Disable dropdown highlight on focus
2017-04-25 00:07:13 +01:00
Michael Telatynski
0a1ebc2487 Don't show for anything that doesn't have a msgtype and body
otherwise the server will just reject it anyway

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 22:43:02 +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
turt2live
9124c1475a Change redact -> remove to improve clarity
Addresses #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:48:32 -06:00
Michael Telatynski
2eb715002f Merge branch 'develop' of https://github.com/vector-im/riot-web into forward_message
Conflicts:
	.gitignore
2017-04-24 18:38:52 +01: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
Michael Telatynski
92b52a61e7 don't show forward option for things we cannot decrypt
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-24 18:33:25 +01:00
David Baker
5326faa0b8 v0.9.9-rc.2 v0.9.9-rc.2 2017-04-24 18:26:20 +01:00
David Baker
7f2fa09d4c Prepare changelog for v0.9.9-rc.2 2017-04-24 18:26:19 +01:00
David Baker
b6435502fc New version of react-sdk 2017-04-24 18:25:13 +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
David Baker
1701ea43a4 Remove spurious changelog entries 2017-04-24 18:22:23 +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
Luke Barnard
69f5833c9f Prevent long room names/topics from pushing UI of the screen
This was causing the "save" button in RoomSettings to be obscured when room names were set to long strings without spaces

Fixes https://github.com/vector-im/riot-web/issues/1729
2017-04-24 16:05:49 +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
turt2live
61bba6c31f CSS to make h1 and h2 the same size as h1.
Addresses #1772

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-24 08:44:53 -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
Luke Barnard
c067800a4f Disable dropdown highlight on focus 2017-04-24 10:00:39 +01:00
Matthew Hodgson
af105b1920 moar padding for _TopUnreadMessagesBar.scss 2017-04-24 01:17:17 +01:00
Matthew Hodgson
a414352661 re-add img to _TopUnreadMessagesBar.scss 2017-04-24 01:13:24 +01:00