03ba3bd431
Merge branch 'rxl881/apps' into rob/apps
2017-06-13 15:41:52 +02:00
91eabbba60
MessageComposer: Trigger Jitsi app from call buttons
2017-06-13 15:35:13 +02:00
876899948f
Merge in upstream changes
2017-06-13 11:44:23 +01:00
b893887707
Fix merge conflict
2017-06-12 14:52:41 +01:00
f9f924bbd6
Merge branch 'master' of https://github.com/matrix-org/matrix-react-sdk into rxl881/apps
2017-06-12 14:50:25 +01:00
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
c57823a31d
Merge branch 'develop' into kegan/translation-tamarin
2017-06-08 14:19:56 +01:00
00df956ca2
Add remaining translations!
...
Every file has now been manually vetted by me. Due to the extent of
the changes, I've been unable to test all scenarios to make sure this
all works. :(
2017-06-08 14:08:51 +01:00
e30e45a82c
Merge branch 'develop' into new-guest-access
2017-05-30 21:05:07 +01:00
70e7d81093
More i18n strings ( #963 )
...
* Add i18n for E2E import and Export Dialogs
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add various previous missing i18n strings
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Translate CreateRoomButton
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ChatInviteDialog and fix missing to.
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ConfitmRedactDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeactivateAccountDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SessionRestoreErrorDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add SetDisplayNameDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownDeviceDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AddressTile translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add DeviceVerifyButtons translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add Dropdown translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UserSelector translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CaptchaForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CasLogin translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add CustomServerDialog translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add InteractiveAuthEntryComponents translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add LoginFooter translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add RegistrationForm translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add ServerConfig translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MAudioBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MImageBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add MVideoBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add TextualBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UnknownBody translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add UrlPreviewSettings translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add AuxPanel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* Add PresenceLabel translations
Signed-off-by: MTRNord <mtrnord1@gmail.com>
* fix syntax error
* weird space :P
* missing ','
* fix missing value
* fix json fail
* remove acidential added file
* fix another json fail
2017-05-30 15:09:57 +01:00
5c885922d9
Merge branch 'develop' into new-guest-access
2017-05-28 22:58:18 +01:00
443ab1add7
Put back default strings on dialogs
...
But make them work by calling _t in render rather than
getDefaultProps().
Also sort out some 'Warning!' strings
2017-05-25 18:20:48 +01:00
5c359e63ab
Bulk change counterpart imports
...
to use languageHandler wrapper func
2017-05-25 11:39:08 +01:00
d419c42a4f
Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801
2017-05-23 15:16:31 +01:00
05aaa599cc
Merge branch 'develop' into new-guest-access
...
Conflicts:
src/components/structures/MatrixChat.js
2017-05-22 16:19:10 +01:00
7e1de2ac35
Show/hide apps panel and misc formatting and lint fixes
2017-05-17 21:15:57 +01:00
95988bd5ec
Dispatch show hide app drawer events
2017-05-17 12:35:25 +01:00
9dd0b9bdd1
Fix lint errrors / warnings
2017-05-17 11:31:01 +01:00
e22712514e
Add show / hide apps button
2017-05-17 10:58:59 +01:00
8695397abb
Support for pasting files into normal composer
...
We don't seem to be in any danger of getting a working RTE any time soon, so
implement file pasting in the normal composer too.
2017-05-17 01:43:13 +01:00
f199f3599e
Replace NeedToRegisterDialog /w SetMxIdDialog
...
This uses MatrixChat's `view_set_mxid`
2017-05-15 17:31:26 +01:00
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
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
b6fd771b9a
move implementation to MessageComposer to it applies to any future composers
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-05-03 16:21:35 +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
6c7b191577
Merge pull request #605 from SijmenSchoon/feature/pastefiles
...
Add support for pasting files into the text box
2017-03-09 17:55:58 +00:00
8bd42693f7
Fix message composer placeholders
2017-02-23 09:05:26 +00:00
799e5ee0e9
Less jargon
2017-02-22 14:40:07 +00:00
fd146a732b
Clarify non-e2e vs. e2e /w composers placeholder
...
For E2E rooms, display "Send an encrypted message…" otherwise display "Send a plaintext message…" as the placeholder for the input box in [old] message composer.
2017-02-21 15:33:44 +00:00
937f13d578
fix a bunch of dark-theme buttons
2017-01-20 21:00:22 +00:00
18d4d3392a
Fix a bunch of linting errors
...
eslint --fix and a few manual ones
2017-01-20 14:22:27 +00:00
ef88e02931
Add support for pasting into the text box
...
Only supports the new rich-text-supporting text editor
2017-01-08 02:21:36 +01:00
a3d4ed5aee
Show an open padlock for unencrypted rooms
...
Also, add a tooltip, and enlarge the img to 12px wide, because the open padlock
looked silly at 10px and they both look fine at 12px
2016-11-15 12:31:17 +00:00
7b28dde263
Prevent error when clicking 'log in'
...
If you joined a room before clicking 'log in', it would throw an
exception here and break.
2016-09-29 16:57:10 +01:00
f171985e4c
Fix click-to-complete in RTE
...
Closes vector-im/vector-web#2179
2016-09-21 07:40:48 +05:30
b98c2ae25e
update crypto state of the room in realtime when turned on
2016-09-15 19:25:53 +01:00
b62622a814
Improve autocomplete behaviour
...
Fixes vector-im/vector-web#1761
2016-09-13 15:46:02 +05:30
9b7ab46a72
dedicated dialog box for E2E messages
2016-09-12 23:42:24 +01:00
9eae1c5bb7
final e2e icons
2016-09-12 16:51:19 +01:00
3a1159ce12
e2e look & feel
2016-09-12 01:37:51 +01:00
904348e62a
Merge branch 'develop' into matthew/notif-panel
2016-09-09 11:12:52 +01:00
b4c1eca1c5
fix key warning
2016-09-07 22:54:37 +01:00
c11232742b
Fix focus and toggling issues in formatting bar
2016-09-08 02:46:56 +05:30
8974442084
Hide empty autocomplete and remove word counter
2016-09-08 00:43:10 +05:30
f0f20beae0
RTE format bar enhancements
2016-09-08 00:03:54 +05:30
0c0c44b050
Formatting toggle, markdown indicator, quoting
...
Fixes vector-im/vector-web#1825
2016-09-08 00:02:55 +05:30
71251293e4
RTE formatbar (wip)
...
Fixes vector-im/vector-web#2024
2016-09-08 00:02:16 +05:30
7cb663d39d
Only show Autocomplete if autocomplete is enabled
...
It was just never used, but it has 1px top border which makes the top border on chat look too big
2016-08-11 16:28:32 +01:00
1f9a396fa5
fix: autocomplete to use tab instead of return
2016-08-03 17:51:40 +05:30
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
Robert Swain