Commit Graph

4015 Commits (81806e23bff0934b6642498369a490f4252643ee)

Author SHA1 Message Date
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
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
Matthew Hodgson 6f461f0ebb add in scrollto button 2017-04-24 01:09:57 +01:00
Richard van der Hoff 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
Michael Telatynski 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
Michael Telatynski 0590ce7faf Conform damn you (mostly)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-23 06:07:53 +01:00
Matthew Hodgson 24f2aed45f summarise profile changes in MELS
fixes https://github.com/vector-im/riot-web/issues/3463
2017-04-23 04:05:50 +01:00
Matthew Hodgson a2be764681 display err.message to user if available in error msgs 2017-04-23 01:48:27 +01:00
Matthew Hodgson db996f678c show better errors when slash commands fail 2017-04-23 01:32:51 +01:00
Matthew Hodgson 7854cac61d hook up keyb shortcuts for roomdir 2017-04-23 01:00:44 +01:00
Matthew Hodgson 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
Matthew Hodgson 6a63c7e50c fix deep-linking to riot.im/app 2017-04-22 21:06:38 +01:00
Matthew Hodgson 34c1a8f3cf make autofocus explicit on errordialog as it autoFocus attr seems unreliable 2017-04-22 17:28:48 +01:00
Matthew Hodgson 0e5006b041 typo 2017-04-22 17:28:28 +01:00
Matthew Hodgson e18e965eb8 missing key attr 2017-04-22 16:26:39 +01:00
Matthew Hodgson 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
Matthew Hodgson 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
Matthew Hodgson 7e07ffd55f Merge pull request #824 from t3chguy/fix_hide_rr_abstraction
move user settings outward and use built in read receipts disabling
2017-04-22 15:53:07 +01:00
Michael Telatynski 33e841a786 move user settings outward and use built in read receipts disabling
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 15:40:29 +01:00
Michael Telatynski 18d933cbe4 Specify cross platform regexes and add olm to noParse
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 14:52:20 +01:00
Michael Telatynski 6a657a6555 Remember element that was in focus before rendering dialog
restore focus to that element when we unmount

also remove some whitespace because ESLint is a big bad bully...

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-22 05:44:27 +01:00
Matthew Hodgson aa0658d9ce Merge pull request #802 from t3chguy/t3chguy/file_download_improvements
File Download Consistency
2017-04-22 02:59:25 +01:00
Matthew Hodgson 6c177bc617 Merge pull request #806 from t3chguy/t3chguy/show_access_token
Show Access Token under Advanced in Settings
2017-04-22 02:51:54 +01:00
Matthew Hodgson ad76dd0dd1 Merge pull request #810 from t3chguy/t3chguy/settings_versions_improvements
Link tags/commit hashes in the UserSettings version section
2017-04-22 02:38:30 +01:00
Matthew Hodgson febd9c637e Merge pull request #813 from t3chguy/RoomSettings_close_focus_composer
On return to RoomView from auxPanel, send focus back to Composer
2017-04-22 02:08:48 +01:00
Matthew Hodgson ba0bb677c8 Merge pull request #817 from turt2live/travis/rw-3626
Change presence status labels to 'for' instead of 'ago'
2017-04-22 01:45:21 +01:00
Matthew Hodgson 304136766d Merge pull request #816 from t3chguy/ability_to_disable_scalar
Disable Scalar Integrations if urls passed to it are falsey
2017-04-22 01:39:20 +01:00
Matthew Hodgson d2d24bf0fa Merge pull request #818 from turt2live/travis/hide-read-receipts
Add option to hide other people's read receipts.
2017-04-22 01:36:45 +01:00
Matthew Hodgson 872d0e0f50 Merge branch 'develop' into travis/hide-read-receipts 2017-04-22 01:36:38 +01:00
Matthew Hodgson b36eb90a10 Merge pull request #819 from turt2live/travis/no-typing-notifs
Add option to not send typing notifications
2017-04-22 01:35:07 +01:00
Matthew Hodgson 1faecfd0f7 fix sticky headers on resize 2017-04-22 01:29:48 +01:00
Matthew Hodgson ec6a1c4c75 recalculate roomlist when your invites change 2017-04-22 01:16:25 +01:00
turt2live 80b8be64d1 Transform h1 and h2 tags to h3 tags
Addresses vector-im/riot-web#1772

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 15:09:56 -06:00
turt2live 64e416e117 Add option to not send typing notifications
Addresses vector-im/riot-web#3220

Fix applies to both the RTE and plain editor.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:50:26 -06:00
turt2live e4c4adc517 Add option to hide other people's read receipts.
Addresses vector-im/riot-web#2526

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 14:28:28 -06:00
turt2live 2d39b59556 Change presence status labels to be more clear.
As per vector-im/riot-web#3626 the current labels are unclear. Changing the verbage should make it more clear.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-04-21 13:41:37 -06:00
Michael Telatynski 8e9f52e217 Disable Scalar Integrations if urls passed to it are falsey
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 19:46:19 +01:00
Michael Telatynski fdc26a490a On return to RoomView from auxPanel, send focus back to Composer
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-21 18:45:28 +01:00
David Baker a55eb00dad v0.8.8-rc.1 2017-04-21 18:22:39 +01:00
David Baker 2f08340ff0 Prepare changelog for v0.8.8-rc.1 2017-04-21 18:22:39 +01:00
David Baker 665f507537 Update js-sdk dependency 2017-04-21 18:18:35 +01:00
Luke Barnard ae8d04b35d Merge pull request #805 from matrix-org/luke/feature-read-marker
Sync RM across instances of Riot
2017-04-21 16:52:46 +01:00
Luke Barnard 29c2bd3d18 reset last_rr_sent on error
Indicate that setting the RR was a failure and that hitting the API should be retried (in the case where the errcode !== "M_UNRECOGNISED")
2017-04-21 16:46:36 +01:00