Matthew Hodgson
90e5ab2ca3
merge in develop
2016-08-04 13:39:47 +01:00
David Baker
f7fda68e26
Use p tags instead of brs
2016-08-04 10:53:07 +01:00
David Baker
c017e8dcf4
Initialise _passwordField & delete stale comment
2016-08-04 10:51:31 +01:00
David Baker
2d936a2850
Don't leave isRoomPublished as undefined
...
As this causes react to consider the component uncontrolled and then
warn when we change it to controlled
2016-08-03 18:23:38 +01:00
David Baker
498ad7fa4c
Merge branch 'develop' into dbkr/deactivate_account
2016-08-03 17:52:18 +01:00
David Baker
1b39f02141
Merge pull request #335 from aviraldg/feature-composer-emoji
...
feat: code cleanup & emoji replacement in composer
2016-08-03 16:18:56 +01:00
David Baker
3780d82f6f
Merge pull request #386 from matrix-org/rav/default_to_device_id
...
DevicesPanel: use device_id as a placeholder
2016-08-03 16:12:46 +01:00
David Baker
f469bbbb64
Refactor UI error effects
...
And add error effects to the login page to be consistent with the registration page
2016-08-03 15:59:17 +01:00
Richard van der Hoff
42f6703112
Merge pull request #385 from matrix-org/rav/device_name_for_e2e_keys
...
MemberDeviceInfo: Use the device name, where available
2016-08-03 15:26:37 +01:00
Matthew Hodgson
f95a11a9bf
Merge pull request #369 from matrix-org/wmwragg/mention-state-menu
...
Wmwragg/mention state menu
2016-08-03 15:22:39 +01:00
wmwragg
c1cfbd6b59
Corrected comment typo
2016-08-03 14:47:53 +01:00
Richard van der Hoff
f4d41b7847
DevicesPanel: use device_id as a placeholder
...
A device may have no display_name set, in which case we probably want to use
the device_id as a placeholder.
2016-08-03 14:19:54 +01:00
Richard van der Hoff
55f4d23625
MemberDeviceInfo: Use the device name, where available
...
we now have device name for e2e devices: use it!
2016-08-03 14:18:09 +01:00
wmwragg
8e19532e5a
Hover state for badges, now only on the badges themselves
2016-08-03 14:09:10 +01:00
David Baker
efdcc6da98
Merge pull request #384 from aviraldg/fix-composer-up-down
...
fix: allow up/down normally for no completions
2016-08-03 13:55:13 +01:00
Aviral Dasgupta
a2d64f5119
fix: allow up/down normally for no completions
...
Autocomplete current eats up up/down key events by unconditionally returning
true for onUpArrow and onDownArrow. Instead, only do that if there are completions actually visible.
2016-08-03 18:04:52 +05:30
Aviral Dasgupta
1f9a396fa5
fix: autocomplete to use tab instead of return
2016-08-03 17:51:40 +05:30
David Baker
ffa97a4095
Log out when account is deactivated
2016-08-03 11:47:29 +01:00
David Baker
2f0fd6da05
Actually commit the deactivate account dialog
2016-08-03 11:34:13 +01:00
David Baker
a0b973ffad
Syntax fail
2016-08-02 16:07:07 +01:00
David Baker
10f6ecfe5f
Include rooms with 1 person invited
...
If we can't find one with both people joined.
2016-08-02 15:59:28 +01:00
David Baker
3000fae5d8
Oops, uncommit 61e0258
2016-08-02 15:58:21 +01:00
David Baker
61e0258b6f
Include rooms with 1 person invited
...
If we can't find one with both people joined.
2016-08-02 15:55:18 +01:00
David Baker
05f0d4d166
Fix 'start new direct chat'
2016-08-02 14:55:29 +01:00
wmwragg
2c2f689361
New design for long names
2016-08-02 14:46:47 +01:00
Richard van der Hoff
e63a32dc10
Fix warnings from MessageComposer
...
Fix a couple of warnings from React about required properties not being set.
2016-08-02 11:00:00 +01:00
Matthew Hodgson
1b38398156
Merge pull request #371 from matrix-org/wmwragg/button-updates
...
New voice and video call buttons
2016-08-01 20:36:56 +01:00
David Baker
89d2a56584
Merge pull request #373 from matrix-org/rav/more_react_warnings
...
Silence some more react warnings
2016-08-01 17:23:08 +01:00
Richard van der Hoff
124a816751
Silence some more react warnings
...
Remove some spurious props which were causing react warnings
2016-08-01 17:10:46 +01:00
Richard van der Hoff
94a44bfec3
Fix warnings emanating from Velociraptor elements
...
We are no longer allowed to stick random properties on child properties, and
the Velociraptor animations were causing some React warnings.
Move the startStyles and enterTransitionOpts properties up to the Velociraptor
node, and avoid setting arbitrary props on the created children. This is less
flexible, as it assumes that all children will have the same start style;
however, we weren't using the flexibility, and we can always replace the array
with a map or a function or something if we need it in the future.
2016-08-01 16:56:25 +01:00
wmwragg
84583b25e6
New voice and video call buttons
2016-08-01 16:45:27 +01:00
Matthew Hodgson
5b100eeff3
Merge pull request #353 from matrix-org/wmwragg/button-updates
...
Wmwragg/button updates
2016-08-01 15:42:46 +01:00
Richard van der Hoff
c071bc54f9
Implement device management UI
...
View/rename/delete.
2016-08-01 13:42:29 +01:00
Richard van der Hoff
9333793a7c
Fix code style
2016-08-01 10:49:51 +01:00
wmwragg
d16aa276e2
Positional tweaks for the name, badge and context menu, to better match design in both normal and collapsed states
2016-07-30 12:52:39 +01:00
wmwragg
398e56c9f9
Fixed bug where the long hover tooltip for a room name show an object rather than the name
2016-07-30 12:28:10 +01:00
wmwragg
cf22a5fecc
Merge up from develop
2016-07-30 12:10:43 +01:00
wmwragg
1487c600ee
Revert so that the
2016-07-29 17:53:18 +01:00
wmwragg
229664a624
first pass on css re-write
2016-07-29 17:49:42 +01:00
Richard van der Hoff
3194c5c61d
Factor EditableTextContainer out of ChangeDisplayName
...
Take the non-displayname-specific bits out of ChangeDisplayName into a new
EditableTextContainer, so that we can reuse the logic elsewhere.
2016-07-29 17:40:13 +01:00
wmwragg
38f504bdcb
Hide tooltip when badge clicked and collapsed
2016-07-29 11:10:16 +01:00
wmwragg
5889beacf3
Mute state now handled correctly
2016-07-28 17:24:58 +01:00
wmwragg
867b14d2ca
Reposition context menu now that the styling is final
2016-07-27 18:14:46 +01:00
wmwragg
46a643ac38
Now the text spaceing is correct need to align cheveron
2016-07-27 18:10:45 +01:00
wmwragg
8246d9148c
Initial context menu with all it's elements
2016-07-27 17:43:48 +01:00
Richard van der Hoff
88be2827fd
Merge pull request #367 from matrix-org/rav/remove_bad_props
...
Stop the Avatar classes setting properties on <span>s
2016-07-27 16:22:31 +01:00
wmwragg
6e7e091117
Refactor so that chevron and menu can be positioned independantly
2016-07-27 16:09:07 +01:00
Richard van der Hoff
39ae8c6e46
formatting
...
PR feedback
2016-07-27 15:41:24 +01:00
wmwragg
0660b9feff
Fixes to properly point to the moved components
2016-07-27 14:49:10 +01:00
wmwragg
3df746ef14
Revert merge up from develop
2016-07-27 14:16:17 +01:00
wmwragg
6d141d1a7b
Only allow none guests to access the context menu
2016-07-27 11:58:40 +01:00
Richard van der Hoff
1a600b0674
Stop the Avatar classes setting properties on <span>s
...
React apparently now checks the properties which are set on DOM elements, and
grumbles noisily about unexpected ones. Update BaseAvatar and RoomAvatar so
that they don't set unrelated properties on the DOM elements.
2016-07-27 11:38:04 +01:00
Richard van der Hoff
c8df9148b3
Remove relayoutOnUpdate prop on gemini-scrollbar
...
The latest gemini-scrollbar makes relayoutOnUpdate redundant, so update to it
and remove the properties.
2016-07-27 11:35:48 +01:00
wmwragg
4b26ac58af
Re-modularised the context menus
2016-07-27 10:41:24 +01:00
wmwragg
dca4702b7b
Fixed a bug where the contextual menu was being incorrectly positioned when zoom in on the webpage
2016-07-27 09:51:50 +01:00
wmwragg
477a17b49f
Removed debug statement
2016-07-26 10:39:34 +01:00
wmwragg
9c9c5ec458
Menu context dohickey now sticks when menu shown
2016-07-25 17:18:45 +01:00
wmwragg
a218b4e8a3
Merge branch 'wmwragg/mention-state-indicator-round-3' into wmwragg/mention-state-menu
...
# resolved Conflicts:
# src/components/views/rooms/RoomTile.js
2016-07-25 17:04:37 +01:00
wmwragg
8b8486a8d0
Move from +99 to 99+ for more than 99 messages
2016-07-25 14:39:15 +01:00
wmwragg
a69107f4f1
Trying to get the context menu dohicky to stick when menu open
2016-07-25 10:58:43 +01:00
Aviral Dasgupta
b7555f49ea
Merge branch 'develop' into feature-composer-emoji
2016-07-23 19:15:06 +05:30
wmwragg
c89904bc25
Initial unstyled mentions state notifier context menu
2016-07-22 17:30:31 +01:00
David Baker
b07e50d418
Fix 'start chat' button on MemberInfo
...
this/self fail & related scoping
Fixes https://github.com/vector-im/vector-web/issues/1844
2016-07-22 17:30:25 +01:00
wmwragg
9b318e8f61
Getting the corrct height for the placing the context menu
2016-07-22 16:12:20 +01:00
wmwragg
e4dd6c8dbe
Browser tooltip being used instead of the HTML styled one.
2016-07-22 15:15:24 +01:00
wmwragg
6984a55b11
The tooltip now appears even when not collapsed when hover over the avater, to allow the full name to be shown
2016-07-22 14:58:09 +01:00
wmwragg
ca75d93434
Tweaked the offset for the tooltip so that it is next to the element it is tipping
2016-07-22 11:31:26 +01:00
wmwragg
5d4b03c1f4
Put back clicking on the name to acces the room
2016-07-22 11:28:11 +01:00
wmwragg
3dd83922f1
Tooltip positioning tweaked
2016-07-22 11:12:11 +01:00
wmwragg
922bb0f402
+99 badge when notifications are greater the 99
2016-07-21 18:50:07 +01:00
wmwragg
762873350a
Badge dohickey shown on name hover and badge hover
2016-07-21 18:20:12 +01:00
wmwragg
4013ea75d0
Testing out the context menu
2016-07-21 17:44:31 +01:00
wmwragg
775fc97102
Slight refactor to better match current code
2016-07-21 14:33:54 +01:00
Matthew Hodgson
9babf3f92f
Merge pull request #357 from matrix-org/wmwragg/mention-state-indicator-round-2
...
Wmwragg/mention state indicator round 2
2016-07-20 18:01:59 +01:00
wmwragg
ffa43ebb96
badge content when hovered is now kerned via the CSS
2016-07-20 17:12:41 +01:00
David Baker
fb964be072
Merge pull request #356 from matrix-org/matthew/disable-url-previews
...
Support for disabling/enabling URL previews per-user, per-room and per-user-per-room
2016-07-20 16:43:08 +01:00
wmwragg
33edb1dea9
Made the badge always exist, but if no unread mesasges available then has a different class
2016-07-20 12:47:32 +01:00
Matthew Hodgson
1365f18829
many stupid thinkos and bugfixes; make it work
2016-07-20 12:03:13 +01:00
David Baker
d6df3682f2
Fix enourmous video bug
2016-07-20 11:58:49 +01:00
David Baker
514bc2cd51
Merge pull request #341 from matrix-org/dbkr/tab_complete_most_recently_spoke
...
Order tab complete by most recently spoke
2016-07-19 18:02:09 +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
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
Matthew Hodgson
ebdac4ee50
first cut (untested)
2016-07-18 01:35:42 +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
a61168d943
Revert "Amends react template and removes opening image in lightbox"
2016-07-15 16:54:56 +01:00
David Baker
d5bed78a54
Rejig tab complete to make it faster
...
Now do a lot less when people speak. Also move more of the tab completion logic into TabComplete.js and out of RoomView.
2016-07-15 16:10:27 +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
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
wmwragg
fd5d28768a
Simplification of the css
2016-07-14 12:05:00 +01:00
wmwragg
f6302fc990
Updated the search button, and simplified the leave css
2016-07-14 11:43:33 +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
wmwragg
7f00053f84
Footer upload icon updated to new vesrion
2016-07-13 17:46:56 +01:00
wmwragg
936a38a9f4
Updated and moved the room header settings icon
2016-07-13 16:02:18 +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
Aviral Dasgupta
b334522168
feat: code cleanup & emoji replacement in composer
2016-07-08 12:54:28 +05:30
David Baker
345ed04ba9
Less enetering
2016-07-07 13:03:27 +01:00
David Baker
5c879d786e
Doc the default params / guestUsername props
2016-07-07 11:23:08 +01:00
David Baker
e2c473b366
Error on registration if email taken
...
Use the new register-specific request token endpoint (https://github.com/matrix-org/matrix-js-sdk/pull/147 ) and catch the error that it gives if the email is already in use. Also add initial values to the registration form so we can reload it after the error without all the values disappearing, and split out the guest username parameter which was previously called defaultUsername.
2016-07-06 15:22:06 +01:00
David Baker
63ad57a8d4
Merge pull request #332 from aviraldg/feature-emojione
...
feat: render unicode emoji as emojione images
2016-07-05 10:18:33 +01:00
Aviral Dasgupta
6a133bc034
feat: and emojify name in MemberInfo
2016-07-05 10:24:18 +05:30
Aviral Dasgupta
020f1f4320
feat: emojify ALL THE THINGS!
2016-07-05 10:16:17 +05:30
Aviral Dasgupta
22a2593bf2
fix: unbreak old MessageComposerInput/TabComplete
2016-07-05 01:32:40 +05:30
Aviral Dasgupta
73b726e5fb
feat: import only flatMap from lodash
2016-07-04 21:56:09 +05:30
Aviral Dasgupta
30b7efd585
fix: code cleanup, fix getCurrentCommand
2016-07-04 21:44:35 +05:30
Aviral Dasgupta
cccc58b47f
feat: implement autocomplete replacement
2016-07-03 22:15:13 +05:30
Aviral Dasgupta
8961c87cf9
feat: Autocomplete selection wraparound
2016-07-03 01:11:34 +05:30
Aviral Dasgupta
cd928fe6f5
Merge remote-tracking branch 'upstream/develop' into feature-autocomplete
2016-07-03 00:00:02 +05:30
Richard van der Hoff
a671e07da7
Merge pull request #326 from matrix-org/dbkr/fix_user_links
...
Fix user links
2016-06-30 17:43:08 +01:00
Richard van der Hoff
ce39822957
Merge pull request #327 from theworldbright/1492-fix-ordering-memberlist
...
Fix ordering of Memberlist
2016-06-29 10:21:15 +01:00
theworldbright
7609b9eba8
Simplify logic for timestamp ordering of memberlist
2016-06-29 17:45:24 +09:00
theworldbright
b3d871aa6a
Add back comment
2016-06-29 17:33:41 +09:00
theworldbright
69cb0a8f1c
Switch ordering of Idle users
2016-06-29 17:08:17 +09:00
theworldbright
72a1d5a0de
Remove unused comments
2016-06-29 16:58:08 +09:00
theworldbright
174caceabf
Use lastActiveAgo to reorder member list
2016-06-29 16:57:59 +09:00
David Baker
ba47c5a198
Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links
2016-06-28 17:15:17 +01:00
David Baker
e8337b2119
More PR feedback
2016-06-28 17:11:47 +01:00
David Baker
548c392236
PR feedback
2016-06-28 14:59:45 +01:00
David Baker
c016eb78c8
Fix user links
...
'Start chat' was broken on the sidebar if the panel was displayed by clicking on a link to a user. This adds null checking for the hack that we use to display users in the member panel.
2016-06-28 14:28:05 +01:00
David Baker
98c03869a7
Display an error message if room not found
...
Fixes https://github.com/vector-im/vector-web/issues/1012
2016-06-24 15:34:07 +01:00
Richard van der Hoff
a1dd427420
Implement device blocking
...
This is the react-sdk part of
https://github.com/matrix-org/matrix-js-sdk/pull/146 . It adds 'Block'/'Unblock'
buttons to the device list, and updates the deviceVerified listeners to listen
for deviceVerificationChanged instead.
Also adds an extra <div> to the deviceinfo section to help me with the
CSS.
2016-06-23 17:30:04 +01:00
Richard van der Hoff
cdaf317f1d
Merge pull request #321 from matrix-org/rav/encrypt_room_setting
...
RoomSettings: add encryption setting
2016-06-23 13:40:30 +01:00
Richard van der Hoff
3a21958faf
RoomSettings: add encryption setting
...
Add a knob to RoomSettings which will send the appropriate event to enable
encryption in the room.
2016-06-23 12:21:31 +01:00
Richard van der Hoff
7a7d7c0e02
Fix a pair of warnings from RoomSettings
...
- initialise the 'publish' checkbox correctly so react doesn't grumble about it
turning from uncontrolled into controlled
- PowerSelector's 'controlled' property isn't really required, so mark it as
such.
2016-06-23 11:15:55 +01:00
Richard van der Hoff
a04f03669c
RoomSettings: refactor permissions calculations
...
The logic for calculating who had permission for what was impenetrable (and
wrong, in parts), so rewrite it to be a bit clearer.
2016-06-23 10:36:16 +01:00
Aviral Dasgupta
a74db3a815
Get basic keyboard selection working
2016-06-21 18:33:39 +05:30
Aviral Dasgupta
fb6eec0f7d
Hide/show autocomplete based on selection state
2016-06-21 15:46:20 +05:30
Aviral Dasgupta
442291c0a4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-autocomplete
2016-06-21 04:09:22 +05:30
Aviral Dasgupta
4af983ed90
Style changes and improvements in autocomplete
2016-06-20 13:52:55 +05:30
Matthew Hodgson
94aec10512
Merge branch 'develop' into dbkr/scalar
2016-06-19 22:40:48 +01:00
Richard van der Hoff
ad00abe9c0
Support for making devices unverified
...
Because its useful for testing
Requires support from js-sdk, and (ideally) css from vector-web
2016-06-17 16:24:23 +01:00
Aviral Dasgupta
b9d7743e5a
Emoji provider, DDG working, style improvements
2016-06-17 04:58:09 +05:30
Aviral Dasgupta
769b3f0c2a
Merge branch 'develop' into feature-autocomplete
2016-06-17 00:37:39 +05:30
Aviral Dasgupta
8b1332cd29
Use different keys for new MessageComposerInput
2016-06-16 14:46:09 +05:30
Aviral Dasgupta
3f1b57b35b
Fix cursor bug, persist editor mode & rte default
2016-06-15 00:13:34 +05:30
David Baker
5199cd04a2
Merge pull request #292 from aviraldg/feature-rte
...
Rich Text Editor
2016-06-14 15:27:39 +01:00
Aviral Dasgupta
ba69e4365d
more RTE fixes
2016-06-14 19:28:51 +05:30
Aviral Dasgupta
8cb086ef31
use constants for keycodes in RTE
2016-06-14 19:14:09 +05:30
Richard van der Hoff
e973d18085
Hide e2e features if not enabled
...
Don't show the device info in the MemberInfo and UserSettings unless the user
has ticked the 'labs' box.
2016-06-14 11:57:08 +01:00
Aviral Dasgupta
34be17cc7e
use rte labs setting
2016-06-14 00:10:43 +05:30
Aviral Dasgupta
4bc8ec3e6d
room, user, ddg autocomplete providers (wip)
2016-06-12 17:02:46 +05:30
Aviral Dasgupta
0df201c483
Merge branch 'develop' into feature-autocomplete
2016-06-12 14:10:23 +05:30
Pedro Ferreira
8f45f168d5
Fix highlighting behaviour on switch
...
Hopefully made the code a little bit clearer.
2016-06-12 01:08:31 +02:00
Pedro Ferreira
a5a3e4e915
Basic Markdown highlighting
2016-06-12 01:07:16 +02:00
Aviral Dasgupta
c0d7629980
get /commands working again
2016-06-12 00:11:27 +05:30
Aviral Dasgupta
b960d220d2
cleanup, better comments, markdown hotkeys
2016-06-11 22:24:09 +05:30
Aviral Dasgupta
e4217c3fb7
rte improvements, markdown mode
2016-06-11 15:52:08 +05:30
Aviral Dasgupta
bf8e56e04c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into feature-rte
2016-06-10 04:43:44 +05:30
Aviral Dasgupta
4e0720db12
Fix MessageComposerInput.setLastTextEntry
2016-06-10 00:03:40 +05:30
Aviral Dasgupta
29cdd1fc41
user and room decorators, history & typing notifs
2016-06-09 23:53:09 +05:30
David Baker
049e3a968b
Merge pull request #303 from matrix-org/rav/factor_out_createroom
...
Factor out common parts of room creation
2016-06-09 11:05:22 +01:00
Richard van der Hoff
de36aa63fb
Factor out common parts of room creation
...
Take the duplicated code out of MatrixChat and MemberInfo, and put it in a
separate 'createRoom' module
2016-06-09 10:58:25 +01:00
Richard van der Hoff
2352661513
MemberInfo: remove spinner if device query fails
...
If the request to /keys/query fails (for example, because we are a guest), we
need to remove the spinner.
2016-06-09 10:57:19 +01:00
Richard van der Hoff
85770feb31
device verification: use a js-sdk event
...
We'll probably want to be able to bubble up device verifications from the
js-sdk at some point, so let's use a js-sdk event for this.
2016-06-08 21:25:42 +01:00
Richard van der Hoff
7ce49c752f
Wire up events to update UI on device verification
...
Use the dispatcher to update event tiles and memberdeviceinfo when a device is
marked as verified.
2016-06-08 18:35:43 +01:00
Richard van der Hoff
1616431d27
EventTile: add classes to indicate verifiedness
...
Add a couple of CSS classes to event tiles to reflect whether encrypted events
have been verified or not.
2016-06-08 17:02:42 +01:00
Richard van der Hoff
f3e66e6fd2
Add device info to member info
...
Requires e81ce23 in matrix-js-sdk
2016-06-08 17:02:42 +01:00
David Baker
aca0e060a4
Also change velocity-vector commit & requires
...
Because it needs a versiob where the package name is actually updated and the requires need to use the right package name
2016-06-07 20:47:37 +01:00
David Baker
d5a522fdfe
Second attempt at fixing the Velocity memory leak
...
1) Correct fix for Velociraptor (we need to find the DOM node and pass that in)
2) Do the same leak fix for the read marker
3) Update the dependency to our fork which is fixed to make the call we do to release memory actually work.
4) Remove the velocity-ui-pack dependency which is unnecessary because velocity-ui is included in the velocity package
2016-06-07 18:22:01 +01:00
David Baker
15dccd9871
Handle errors with scalar-oauthing
...
Handle error getting the scalar token and check for non-success status codes in the response handler (because apparently browser-request doesn't consider that an error).
2016-06-06 17:55:45 +01:00
David Baker
fdcebe1e56
Merge remote-tracking branch 'origin/develop' into dbkr/scalar
2016-06-06 17:19:38 +01:00
Matthew Hodgson
f8b3128645
invite input box wording for amandine
2016-06-02 23:33:55 +01:00
Matthew Hodgson
1b3c8481f6
fix dialog prompt an embarassing bug where if 3pid invites triggered a dialog they'd get wedged
2016-06-02 21:07:47 +01:00
Matthew Hodgson
532e93d7cb
fix up trailing whitespace and put the buttons in the right order
2016-06-02 21:07:04 +01:00
Matthew Hodgson
487f3c72dd
fix new 3pid invite UI
2016-06-02 16:59:44 +01:00
Matthew Hodgson
3b34311e05
implement new UX for 3pid invites
2016-06-01 23:42:34 +01:00
Matthew Hodgson
0747ca3923
ignore @ prefixes when sorting memberlist
2016-06-01 14:00:20 +01:00
Aviral Dasgupta
b979a16199
initial version of autocomplete
2016-06-01 16:54:21 +05:30
Matthew Hodgson
272afe39dc
do not list rooms by default
2016-06-01 02:03:53 +01:00
Matthew Hodgson
c3fc76cdaa
warn guests to register nicely to upload files
2016-05-31 23:59:36 +01:00
Matthew Hodgson
2662ca36f9
fix tag unsetting https://github.com/vector-im/vector-web/issues/1499 - HOW DID THIS EVER WORK?!?!
2016-05-31 23:50:47 +01:00
Matthew Hodgson
b74d690035
Merge pull request #290 from matrix-org/matthew/multipreview
...
multiple URL preview support
2016-05-31 19:42:21 +01:00
Matthew Hodgson
b3638f9169
PR review
2016-05-31 19:42:00 +01:00
Aviral Dasgupta
96526c22c5
Merge branch 'develop' into feature-rte
2016-05-29 20:50:33 +05:30
Aviral Dasgupta
fe76eb9f73
minor improvements
...
- use <p> for unstyled blocks
- fix return key bug
- editor placeholder
2016-05-28 12:02:35 +05:30
Matthew Hodgson
d5e6e961fd
fix url previews firing incorrectly on Matrix.org
2016-05-27 10:09:17 +01:00
Aviral Dasgupta
001011df27
Initial version of rich text editor
2016-05-27 10:15:55 +05:30
Matthew Hodgson
39a3d6fdd4
multiple URL preview support
2016-05-24 00:54:20 +01:00
Matthew Hodgson
5835948a3d
ignore @ prefixes when sorting memberlist
2016-05-19 23:00:28 +01:00
Matthew Hodgson
c38c57df1e
put integrations manager into a modal
2016-05-19 14:12:08 +01:00
Matthew Hodgson
be5f29d03b
Merge branch 'develop' into dbkr/scalar
2016-05-17 20:37:16 +01:00
Matthew Hodgson
fd09d5c570
switch badge count to per-conversation, and add per-room badges
2016-05-17 11:14:12 +01:00
David Baker
75979786fc
Call it scalar_token for consistency
2016-05-06 15:06:23 +01:00
