Luke Barnard
5defd0bb74
Merge branch 'develop' of github.com:vector-im/vector-web into develop
2017-04-27 16:46:21 +01:00
Luke Barnard
e6f694307d
add word-break to RoomDirectory
2017-04-27 16:46:14 +01:00
David Baker
beefcfcb8c
Merge pull request #3742 from vector-im/luke/fix-emotes-rrs
...
Fix emote RRs alignment
2017-04-26 18:25:27 +01:00
Luke Barnard
44d0e7dcba
Fix emote RRs alignment
2017-04-26 18:00:51 +01:00
Luke Barnard
71685b5eab
Merge pull request #3741 from vector-im/dbkr/remove_unused_droptarget_placeholder
...
Remove unused `placeholder` prop on RoomDropTarget
2017-04-26 16:46:47 +01:00
David Baker
7b3719bc3c
Remove unused placeholder prop on RoomDropTarget
2017-04-26 16:27:25 +01:00
David Baker
c070e86c1f
Merge pull request #3732 from vector-im/luke/css-improve-country-dd
...
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-26 10:28:07 +01:00
Luke Barnard
78cabed0bf
Modify CSS for matrix-org/matrix-react-sdk#833
2017-04-25 16:24:00 +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
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
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
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
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
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
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
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
1701ea43a4
Remove spurious changelog entries
2017-04-24 18:22:23 +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
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
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
Matthew Hodgson
57f91086e6
add bullseye icon for 'Jump to first unread message'
2017-04-24 01:08:09 +01:00
Michael Telatynski
9e2324fb69
don't hook on postinstall, current dev cycle uses (abuses) npm i to build
...
so no point making it take longer than it has to for the devs only testing
webapp
build:electron - hook npm run install:electron
install:electron - run npm i for the electron deps
electron - start the app locally for testing
add to README
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 22:50:58 +01:00
Michael Telatynski
b3c9229aee
DRY code and change double quotes to single
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 09:59:00 +01:00
Michael Telatynski
2139fb74bb
change show logic to same as that of the tray icon
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 09:56:43 +01:00
Matthew Hodgson
8b4ab4bcdd
update room directory icon to something that looks like a room list
2017-04-23 03:14:41 +01:00
Matthew Hodgson
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
Matthew Hodgson
ab5ec04507
oops
2017-04-23 01:01:38 +01:00
Matthew Hodgson
b1ff0b9e65
hook up keyb shortcuts for roomdir
2017-04-23 01:00:25 +01:00
Matthew Hodgson
be52787473
better solution to incomingcallbox weirdness
2017-04-22 17:37:16 +01:00
Matthew Hodgson
b3431bb750
fix incoming call box
2017-04-22 17:28:09 +01:00
Matthew Hodgson
4864716abb
Merge pull request #3564 from t3chguy/t3chguy/malformed-notifications-gnome-kde
...
Escape HTML Tags from Linux Notifications (electron)
2017-04-22 16:45:04 +01:00
Matthew Hodgson
8a6283fedf
Merge pull request #3651 from t3chguy/t3chguy/show_access_token
...
styling for spoilerized access token view in Settings
2017-04-22 16:22:48 +01:00
Matthew Hodgson
634cf528b4
Merge pull request #3690 from t3chguy/fix_webpack_config
...
Fix Webpack conf
2017-04-22 16:14:19 +01:00
Michael Telatynski
0da6ca8aea
add more comment to explain this weirdness
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 16:05:08 +01:00
Michael Telatynski
08fb20a0df
use a character class for brevity
...
add a comment so this madness has meaning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 14:02:18 +01:00
Michael Telatynski
a8e4a2158a
move styling to correct place
...
NOTE TO SELF
1:1 mapping between react component to scss file.
Makes sense...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 04:33:47 +01:00
Matthew Hodgson
2f3e389a68
Merge pull request #3599 from coletivoEITA/develop
...
Add config.json to .gitignore
2017-04-22 03:11:17 +01:00
Matthew Hodgson
fb3ef89b50
Merge pull request #3641 from t3chguy/t3chguy/electron_launch_hidden
...
add command line arg (--hidden) for electron app
2017-04-22 03:02:48 +01:00
