Matthew Hodgson
1ba0ef7369
Merge pull request #350 from matrix-org/wmwragg/spinner-fix
...
Wmwragg/spinner fix
2016-07-19 12:10:31 +01:00
Matthew Hodgson
c1fd2f888f
Merge pull request #352 from matrix-org/wmwragg/mention-state-indicator
...
Now showing three dots when hovering over the badge
2016-07-19 11:12:42 +01:00
David Baker
1a2546c939
Merge pull request #351 from matrix-org/dbkr/fix_directory_unpublish
...
Fix unpublishing room in room settings
2016-07-18 16:28:39 +01:00
wmwragg
9e4511b8eb
Now showing three dots when hovering over the badge
2016-07-18 16:10:07 +01:00
David Baker
ffaf7f44f3
typos
2016-07-18 15:36:19 +01:00
David Baker
743f79a9a7
Fix unpublishing room in room settings
...
Fixes https://github.com/vector-im/vector-web/issues/1743
2016-07-18 15:22:08 +01:00
David Baker
2b7ade9ef5
Merge pull request #347 from matrix-org/matthew/fix-race-on-new-room-invitelist
...
Fix race when creating rooms where invite list can be blank
2016-07-18 10:37:05 +01:00
David Baker
37402c0071
Merge pull request #348 from matrix-org/matthew/improve-start-chat-wording
...
improve wording of MemberInfo's start chat button.
2016-07-18 10:34:37 +01:00
wmwragg
a385955c6b
Fixed MatrixChat Dialog Spinner. Still needs testing, unsure what triggers it.
2016-07-17 21:23:52 +01:00
wmwragg
1559c69ddf
Create room Dialog Spinner fix.
2016-07-17 21:21:27 +01:00
Matthew Hodgson
8d749be51f
fix potential bug where canonical alias setting is broken (modulo autoheisting)
2016-07-17 20:36:53 +01:00
Matthew Hodgson
554a6ff035
improve wording of MemberInfo's start chat button. Fixes https://github.com/vector-im/vector-web/issues/689 and clarifies https://github.com/matrix-org/matrix-react-sdk/issues/328
2016-07-17 19:41:53 +01:00
Matthew Hodgson
999c52b650
fix comment
2016-07-17 19:00:22 +01:00
Matthew Hodgson
0553d806d7
stop re-invites
2016-07-17 18:40:54 +01:00
Matthew Hodgson
2bc9dd4307
hopefully fix vector-im/vector-web#1813
2016-07-17 18:32:48 +01:00
Matthew Hodgson
bfe50c209c
fix typo in comment
2016-07-16 22:49:42 +01:00
Matthew Hodgson
16665b9ca3
Merge pull request #346 from matrix-org/revert-343-feature-inline-link-preview
...
Revert "Amends react template and removes opening image in lightbox"
2016-07-15 16:55:05 +01:00
Matthew Hodgson
a61168d943
Revert "Amends react template and removes opening image in lightbox"
2016-07-15 16:54:56 +01:00
Matthew Hodgson
41bff38713
fix classes used for body spans, and only apply markdown-body to markdown(!)
2016-07-15 15:04:19 +01:00
Matthew Hodgson
ca5987bf6c
Merge pull request #345 from matrix-org/wmwragg/modal-restyle
...
Wmwragg/modal restyle
2016-07-15 14:05:22 +01:00
Matthew Hodgson
78b7d04710
Merge pull request #343 from ribot/feature-inline-link-preview
...
Amends react template and removes opening image in lightbox
2016-07-15 13:55:07 +01:00
wmwragg
febd2110c5
Updated all dialogs to define their primary button, I've selected the one that had been specified for focus, but the primary button isn't dependent on focus, it's a UX feature
2016-07-15 11:23:58 +01:00
Richard van der Hoff
8144b894f7
Merge pull request #344 from matrix-org/dbkr/remove_initial_memberlist_load_hack
...
Remove the member list loading hack
2016-07-14 18:50:52 +01:00
David Baker
3abdb83d16
Remove now-unused limit param to roomMembers()
2016-07-14 18:40:43 +01:00
David Baker
743cb4b777
Remove the member list loading hack
...
Now the memberlist os a truncated list it at-best makes no difference and may be marginally slowing us down.
2016-07-14 18:37:57 +01:00
David Baker
2e776f540e
Merge pull request #342 from matrix-org/dbkr/offline_user_colour
...
CSS classes to colour offline users differently
2016-07-14 18:29:24 +01:00
David Baker
9fd0ea1e32
More variable case
2016-07-14 18:18:44 +01:00
David Baker
2fd690ea2b
Oops, removed the pure offline class
2016-07-14 18:13:54 +01:00
David Baker
7c1b4f4fc9
Obey my own code style
2016-07-14 18:13:15 +01:00
David Baker
a49a545161
CSS classes to colour offline users differently
...
So we can use the same 66% opacity as idle tiles for offline-with-last-active-time to reduce the visual jarring
2016-07-14 17:41:07 +01:00
Stefan Pearson
cad057ef34
amends react template and removes opening image in lightbox
2016-07-14 17:12:17 +01:00
David Baker
a5272542ef
Lengthen timelinepanel test timeout again
...
It's now hitting this timeout on the jenkins box instead of the browser disconnect timeout
2016-07-14 10:40:12 +01:00
Kegsay
20210e7104
Log scrollTop and scrollHeight to try to debug flakey test
...
Sometimes it fails because awaitScroll() on :277 isn't resolving because onScroll isn't firing. We need to know if this is because we aren't changing scrollTop
2016-07-14 10:38:24 +01:00
David Baker
ec70a08b93
Merge pull request #340 from matrix-org/dbkr/memberlist_listen_all_presence
...
Listen for the new lastPreseceTs event
2016-07-14 10:36:08 +01:00
David Baker
2d6d734571
Listen for the new lastPreseceTs event
...
This will catch all presence events as previously we were only listening for the actual presence string changing
2016-07-14 10:05:40 +01:00
David Baker
95529df7a3
Merge pull request #339 from matrix-org/dbkr/search_by_user_id
...
Fix filtering user list by ID
2016-07-13 13:17:22 +01:00
David Baker
6b03f72474
Fix filtering user list by ID
...
Fixes https://github.com/vector-im/vector-web/issues/1739
2016-07-13 11:56:01 +01:00
Richard van der Hoff
da8f7df262
Merge pull request #338 from matrix-org/dbkr/fix_tab_complete_on_load
...
Update tab completion list when we have a room
2016-07-12 18:58:39 +01:00
David Baker
ac58520b3b
Update tab completion list when we have a room
...
Fixes https://github.com/vector-im/vector-web/issues/1737
2016-07-12 18:30:37 +01:00
Matthew Hodgson
a8677b52ad
major update to dev guidelines
2016-07-11 18:26:16 +01:00
David Baker
e00f3d9334
Mark code blocks as javascript
2016-07-11 16:28:41 +01:00
David Baker
513492e1bf
Change line length as per PR discussion
2016-07-11 16:27:17 +01:00
David Baker
a28a335df4
More newlines for formatting
2016-07-11 16:21:21 +01:00
David Baker
8d1d37c103
Try newline to fix code style formatting
2016-07-11 16:19:14 +01:00
David Baker
4056ee7f14
Merge pull request #330 from matrix-org/dbkr/code_style
...
JS code style guide
2016-07-11 14:27:21 +01:00
David Baker
ffbe045fcc
Change to const-by-default
2016-07-11 10:10:51 +01:00
David Baker
0fdc2d817c
mark as jsx
2016-07-08 15:59:34 +01:00
David Baker
1a3bc814e1
clarify event handlers
2016-07-08 15:58:18 +01:00
David Baker
afa6acc20a
All the trailing commas
2016-07-08 15:42:42 +01:00
David Baker
6d403e792b
Add --stage 1 to babel cmdline
...
So we can use trailing function commas. The trailing comma proposal is actually at stage 3 now and there's a babel 6 plugin for it, which we should use when we switch back to babel 6.
2016-07-08 15:29:59 +01:00