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
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
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
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
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
5326faa0b8
v0.9.9-rc.2
2017-04-24 18:26:20 +01:00
7f2fa09d4c
Prepare changelog for v0.9.9-rc.2
2017-04-24 18:26:19 +01:00
b6435502fc
New version of react-sdk
2017-04-24 18:25:13 +01:00
e569144d6f
v0.8.8-rc.2
2017-04-24 18:24:29 +01:00
8e6981db44
Prepare changelog for v0.8.8-rc.2
2017-04-24 18:24:28 +01:00
1701ea43a4
Remove spurious changelog entries
2017-04-24 18:22:23 +01:00
cf2cf66cae
fix deep-linking to riot.im/app
2017-04-24 18:19:51 +01:00
bb6dd363d7
unbreak in-app permalinks correctly
2017-04-24 18:19:39 +01:00
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
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
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
74e92d6c23
Remove DM-guessing code
2017-04-24 15:44:45 +01:00
28923cdb93
Merge remote-tracking branch 'upstream/develop' into travis/h1-h2-to-h3
2017-04-24 08:29:10 -06:00
1347d9fa65
fix scroll behaviour on macs with no gemini
2017-04-24 12:53:53 +01:00
c067800a4f
Disable dropdown highlight on focus
2017-04-24 10:00:39 +01:00
af105b1920
moar padding for _TopUnreadMessagesBar.scss
2017-04-24 01:17:17 +01:00
a414352661
re-add img to _TopUnreadMessagesBar.scss
2017-04-24 01:13:24 +01:00
6f461f0ebb
add in scrollto button
2017-04-24 01:09:57 +01:00
57f91086e6
add bullseye icon for 'Jump to first unread message'
2017-04-24 01:08:09 +01:00
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
96e733b487
Merge pull request #825 from matrix-org/matthew/missing-keyboard-modifiers
...
limit our keyboard shortcut modifiers correctly
2017-04-23 12:02:29 +01:00
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
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
5e8b43f3ed
if we're not granted, show an ErrorDialog with some text which needs changing
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-04-23 06:16:25 +01:00
0590ce7faf
Conform damn you (mostly)
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-04-23 06:07:53 +01:00
24f2aed45f
summarise profile changes in MELS
...
fixes https://github.com/vector-im/riot-web/issues/3463
2017-04-23 04:05:50 +01:00
8b4ab4bcdd
update room directory icon to something that looks like a room list
2017-04-23 03:14:41 +01:00
40eceaf9bc
show err.message in errors if present
2017-04-23 02:22:31 +01:00
a2be764681
display err.message to user if available in error msgs
2017-04-23 01:48:27 +01:00
db996f678c
show better errors when slash commands fail
2017-04-23 01:32:51 +01:00
ab5ec04507
oops
2017-04-23 01:01:38 +01:00
7854cac61d
hook up keyb shortcuts for roomdir
2017-04-23 01:00:44 +01:00
b1ff0b9e65
hook up keyb shortcuts for roomdir
2017-04-23 01:00:25 +01:00
fa033e6116
limit our keyboard shortcut modifiers correctly
...
fixes https://github.com/vector-im/riot-web/issues/3614
2017-04-23 00:49:14 +01:00
6a63c7e50c
fix deep-linking to riot.im/app
2017-04-22 21:06:38 +01:00
be52787473
better solution to incomingcallbox weirdness
2017-04-22 17:37:16 +01:00
34c1a8f3cf
make autofocus explicit on errordialog as it autoFocus attr seems unreliable
2017-04-22 17:28:48 +01:00
0e5006b041
typo
2017-04-22 17:28:28 +01:00
b3431bb750
fix incoming call box
2017-04-22 17:28:09 +01:00
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
e18e965eb8
missing key attr
2017-04-22 16:26:39 +01:00
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
634cf528b4
Merge pull request #3690 from t3chguy/fix_webpack_config
...
Fix Webpack conf
2017-04-22 16:14:19 +01:00
8865732286
Merge pull request #823 from t3chguy/improve_webpack_config
...
Specify cross platform regexes and add olm to noParse
2017-04-22 16:07:47 +01:00
0ac836919d
Merge pull request #822 from t3chguy/BaseDialog_restore_focus
...
Remember element that was in focus before rendering dialog
2017-04-22 16:05:34 +01:00
turt2live
Michael Telatynski
David Baker
Matthew Hodgson
Luke Barnard
Richard van der Hoff
Matthew Hodgson