Luke Barnard
ca79d9bb6e
Separate predicates for RM/RR
...
Instead of modifying the condition for updating the RR, separate the RM and RR conditions and use an OR to decide when to set both.
Make some logs only log when DEBUG.
2017-05-09 17:36:19 +01:00
Michael Telatynski
fdf48def00
make reskindex windows friendly
...
makes #871 windows friendly
2017-05-09 17:13:27 +01:00
Luke Barnard
3549ff2543
Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1
...
Fixes 2 issues with Dialog closing
2017-05-09 11:36:35 +01:00
Michael Telatynski
f02e659fb7
Consume key{up,down,pressed} events
...
so they don't trigger other things bubbling up
until Modal is closed
2017-05-09 11:27:06 +01:00
Luke Barnard
ac25fd6d87
Remove log
2017-05-09 10:16:37 +01:00
Luke Barnard
488fa3745b
Fix RM not updating if RR event unpaginated
...
If the RR event has been unpaginated, the logic in `sendReadReceipt` will now fallback on the event ID of the RM which in theory is always =< RR event ID stream-wise.
2017-05-09 10:03:40 +01:00
Luke Barnard
1db677141e
Merge pull request #871 from matrix-org/luke/fix-auto-reskindex
...
Automatic Reskindex
2017-05-09 09:36:32 +01:00
Luke Barnard
f5a23c14df
Remove redundant bind
2017-05-08 17:32:26 +01:00
Luke Barnard
fe121126f5
Merge branch 'develop' into rte-fixes
...
Conflicts:
src/UserSettingsStore.js
src/autocomplete/EmojiProvider.js
src/components/views/rooms/MessageComposerInput.js
2017-05-08 17:08:59 +01:00
David Baker
e5b1e4ce6d
Merge pull request #873 from matrix-org/dbkr/room_name_in_leave_confirm
...
Put room name in 'leave room' confirmation dialog
2017-05-08 17:02:53 +01:00
David Baker
85ed39b9d8
Put room name in 'leave room' confirmation dialog
...
https://github.com/vector-im/riot-web/issues/3850
2017-05-08 16:49:40 +01:00
David Baker
c01e8e85ac
Merge pull request #872 from matrix-org/dbkr/fix_left_panel
...
Fix this/self fail in LeftPanel
2017-05-08 16:40:17 +01:00
David Baker
805354bd2c
Revert unintentional change
2017-05-08 16:39:11 +01:00
Luke Barnard
9af9603373
Only watch indexed files
2017-05-08 16:29:53 +01:00
Luke Barnard
574c836941
Move chokidar to devDeps
2017-05-08 16:24:13 +01:00
David Baker
9cae667c06
Fix Create Room button
...
Opened the DM dialog rather than the new room dialog
2017-05-08 16:03:52 +01:00
David Baker
534f9277d4
Fix this/self fail in LeftPanel
2017-05-08 15:37:40 +01:00
Luke Barnard
598f5e20c6
Merge pull request #870 from matrix-org/luke/fix-null-url-previews
...
Don't show null URL previews
2017-05-08 15:23:18 +01:00
Luke Barnard
7d1940620d
Add (watching) reskindex to npm start
...
also add reskindex in non-watching mode to `npm run build`
2017-05-08 15:07:58 +01:00
Luke Barnard
2eaaa97451
Give reskindex.js
a watch mode (-w)
...
`scripts/reskindex.js -w` will run reskindex in watch mode whereby FS events will cause a reskindex to occur.
This depends on `chokidar`
2017-05-08 15:07:05 +01:00
Luke Barnard
1addc7e2c5
Update header copyright
2017-05-08 14:56:38 +01:00
Luke Barnard
ca7989a1fd
.gitignore auto-generated component-index
2017-05-08 14:55:55 +01:00
Luke Barnard
d1f467ee91
Remove auto-generated component-index
...
This will now be generated as part of the build process (`npm run build`) and whilst developing (`npm run start`).
2017-05-08 14:53:00 +01:00
Luke Barnard
39323647d1
Don't show null URL previews
...
These are URLs that were spidered by the server without error but yielded an empty response from the server. There's nothing to display, so return an empty div.
2017-05-08 14:01:44 +01:00
David Baker
11d039477d
Merge pull request #869 from matrix-org/dbkr/addressselector_keys
...
Fix keys for AddressSelector
2017-05-08 12:47:52 +01:00
David Baker
cafbe14589
Fix keys for AddressSelector
...
Was using a property which just did not exist.
2017-05-08 11:59:06 +01:00
David Baker
c841eb641b
Fix 'start chat' button
2017-05-08 11:26:25 +01:00
David Baker
3366d3bbae
Merge pull request #859 from matrix-org/dbkr/left_panel_for_newbies_2
...
Make left panel better for new users (mk II)
2017-05-08 10:37:55 +01:00
Luke Barnard
69382d36b1
Merge pull request #864 from matrix-org/luke/show-pwd-nag-bar
...
Show password nag bar when user is PWLU
2017-05-08 09:52:04 +01:00
Michael Telatynski
bd32df4ef6
comment wording
2017-05-07 20:58:30 +01:00
Michael Telatynski
360f1cd250
completely missed the ESC check
...
I need sleep
2017-05-07 20:57:54 +01:00
Michael Telatynski
78e7272344
Fixes 2 issues with Dialog closing
...
+ Upload Confirmation dialog would just change focus on ESC and not close
+ Keywords Dialog in UserSettings would also close UserSettings because event bubbled up
2017-05-07 20:43:42 +01:00
Matthew Hodgson
ceb71a4ef6
Merge pull request #866 from t3chguy/warn_on_unload
...
Explicitly save composer content onUnload
2017-05-07 20:07:09 +01:00
Michael Telatynski
a141350670
Explicitly save composer content onUnload
...
small oversight, caught by Matthew
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-07 20:01:55 +01:00
Matthew Hodgson
f056360f70
merge master post release
2017-05-07 20:01:11 +01:00
Matthew Hodgson
5900c879ce
Merge pull request #851 from t3chguy/warn_on_unload
...
Warn on unload
2017-05-07 18:17:18 +01:00
Michael Telatynski
2b2b43a7f3
Content in Composer is not lost on unload so it should be fine
...
to scare the user thinking they have lost all of their content
even though when they come back they can cry with joy :D
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-07 18:16:10 +01:00
Matthew Hodgson
2b71123ddc
suppress null member rejoins again
...
reverts f5fe4b2433
should fix https://github.com/vector-im/riot-web/issues/3788
2017-05-06 01:45:37 +01:00
Michael Telatynski
b944fff5c5
unscrew merge
2017-05-05 20:57:18 +01:00
Michael Telatynski
110ca22c4c
Merge branch 'develop' into webrtc_settings
2017-05-05 20:56:20 +01:00
David Baker
1a0ea29995
Remove redundant role elements
2017-05-05 17:51:14 +01:00
Luke Barnard
6f4eb9d8b1
Show password nag bar when user is PWLU
2017-05-05 16:31:33 +01:00
David Baker
4fc4ae1e99
Size is a string, import react
...
React gets put in by the JSX transpile
2017-05-05 14:56:26 +01:00
Richard van der Hoff
28e0a32d6c
Merge pull request #862 from matrix-org/rav/log_device_id
...
Log deviceid at login
2017-05-05 14:52:49 +01:00
David Baker
4a5821e199
Separate classes for the different buttons
...
Also rename RoleButton to ActionButton because it's not being
given a Role any more.
2017-05-05 14:25:18 +01:00
David Baker
e00605571b
Fix the spinner to actually appear
...
We started with clientSyncState being null, which it remained
until the SYNCING event was emitted. We need to set
clientSyncState's initial value correctly.
2017-05-05 10:48:54 +01:00
David Baker
f86ca5bc97
Hide empty tips if collapsed
2017-05-04 18:08:04 +01:00
Richard van der Hoff
bfceaa827b
Log deviceid at login
...
- to help understand rageshakes
2017-05-04 18:04:47 +01:00
Richard van der Hoff
8d4663f437
Fix lint in Lifecycle.js
2017-05-04 18:03:35 +01:00
Luke Barnard
8e3851b380
Merge pull request #860 from t3chguy/patch-4
...
Guests can't send RR so no point trying
2017-05-04 17:53:59 +01:00