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
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
78b452818c
Merge pull request #836 from t3chguy/fix_UserSettingsStore
...
Fix user settings store
2017-04-26 10:11:32 +01:00
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
cc53825b06
fix defaultValue on getLocalSetting and getSyncedSetting
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:01:35 +01:00
de89c1f710
lets make eslint at least somewhat happy
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-04-25 22:00:50 +01:00
fa9c2d1373
Fix specifying custom server for registration
...
Broken by 9cd7914ea5
2017-04-25 19:21:09 +01:00
c1336f09fe
Merge remote-tracking branch 'origin/develop' into luke/improve-country-dd
2017-04-25 18:06:04 +01:00
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
96e7479d8b
Show "jump to message" when message is not paginated
2017-04-25 17:19:36 +01:00
71a119376c
Guard against no children
2017-04-25 17:05:54 +01:00
1e9a2e80e9
Remove empty line
2017-04-25 11:57:03 +01:00
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
aac0238882
Remove redundant API for getting country prefix
2017-04-25 11:25:14 +01:00
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
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
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
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
63dac026a8
remove spammy log
2017-04-25 00:17:46 +01:00
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
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
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
6f461f0ebb
add in scrollto button
2017-04-24 01:09:57 +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
24f2aed45f
summarise profile changes in MELS
...
fixes https://github.com/vector-im/riot-web/issues/3463
2017-04-23 04:05:50 +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
7854cac61d
hook up keyb shortcuts for roomdir
2017-04-23 01:00:44 +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
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
e18e965eb8
missing key attr
2017-04-22 16:26:39 +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
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
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
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
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
aa0658d9ce
Merge pull request #802 from t3chguy/t3chguy/file_download_improvements
...
File Download Consistency
2017-04-22 02:59:25 +01:00
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
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
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
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
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
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
872d0e0f50
Merge branch 'develop' into travis/hide-read-receipts
2017-04-22 01:36:38 +01:00
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
1faecfd0f7
fix sticky headers on resize
2017-04-22 01:29:48 +01:00
Luke Barnard