91eabbba60
MessageComposer: Trigger Jitsi app from call buttons
2017-06-13 15:35:13 +02:00
5d898dd098
AuxPanel: Add type checking for userId and showApps properties
2017-06-13 15:34:05 +02:00
b63edcb390
AppTile: Support deletion of apps from room state
2017-06-13 15:33:17 +02:00
bcb2f8408b
AppTile: Fix typo in property name
2017-06-13 15:32:40 +02:00
2aa0aa61e3
AddAppDialog: Support adding apps to room state
2017-06-13 15:31:37 +02:00
a72cb794f2
AppsDrawer: Populate apps from room state
2017-06-13 15:28:37 +02:00
9e0b476b72
Merge branch 'develop' into rob/apps
2017-06-09 12:06:44 +02:00
f26aeef2bf
Merge pull request #1056 from matrix-org/kegan/translation-tamarin
...
Add remaining translations
2017-06-08 15:06:26 +01:00
9baaf5499f
Linting
2017-06-08 14:58:54 +01:00
71eb405859
Add comments & remove redundant check
2017-06-08 14:53:21 +01:00
f2efdf8a4f
Review comments
2017-06-08 14:45:59 +01:00
b40636a425
Merge pull request #1040 from ollieh/issues/1974
...
Added button that copies code to clipboard
2017-06-08 14:45:58 +01:00
c173861b27
Merge pull request #1021 from Bitim/feature/rtl-languages-support
...
Better RTL support
2017-06-08 14:43:18 +01:00
e3ac78bd28
Self-review
2017-06-08 14:36:20 +01:00
29e792b642
make mels emoji capable
2017-06-08 14:21:14 +01: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
1c58a9cd5e
Everything but src/components/views/rooms
2017-06-08 12:33:29 +01:00
bc0eb4294c
rename welcome page to home
2017-06-08 10:27:35 +01:00
0f4028da07
Add more translations..
2017-06-08 09:44:58 +01:00
8228db88d2
oops, fix more i18n var name typos
2017-06-07 18:28:49 +01:00
ef2fedc3a9
fix missing translations and typos in i18n
2017-06-07 18:24:35 +01:00
0370b7c5e8
Merge pull request #1050 from matrix-org/luke/feature-user-directory-invite
...
Use user_directory endpoint to populate ChatInviteDialog
2017-06-07 18:06:35 +01:00
29da25529c
Make it backwards compatible
...
Hit the user_directory API and if M_UNRECOGNIZED, do a local search and continue to search locally therein.
2017-06-07 17:53:58 +01:00
68ddf35db4
Use then, catch, done and display any errors that occur during search
2017-06-07 17:33:15 +01:00
49b22fb6c6
Use an arrow function to allow this
...
This was causing `TypeError: Cannot read property '_getEmptyContent' of undefined` for those with custom tags.
2017-06-07 16:13:40 +01:00
3b6599dcdc
Use user_directory endpoint to populate ChatInviteDialog
...
Also attempt to slightly improve the feedback given when searching. There is still room for improvement - it's not totally obvious whether to display a spinner because it's quite jarring were it to replace the dd. This does mean that "No results" will flash awkardly between two queries, neither of which return any results.
2017-06-07 16:05:36 +01:00
a09001933a
git status
2017-06-07 15:39:27 +01:00
53ea41e8a5
Merge branch 'develop' into new-guest-access
2017-06-07 12:08:37 +01:00
c552f7f336
App icon styling
2017-06-07 10:55:49 +01:00
f6f660fa9a
Initial app icon tiles
2017-06-06 23:45:17 +01:00
184c2d5e58
Merge pull request #1015 from matrix-org/t3chguy/random_fix_1
...
fix copy and paste derp and rip out unused imports
2017-06-06 18:02:35 +01:00
e8353edb06
Disable test postmessag
2017-06-06 15:57:40 +01:00
e9f110a4c5
Don't show add widget if there are more than one existing widgets
2017-06-06 14:50:43 +01:00
dd6171a39e
Review changes
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz >
2017-06-06 12:34:03 +01:00
a640e943f7
Added button that copies code to clipboard
...
Signed-off-by: Oliver Hunt <oliver@hunt.bz >
2017-06-06 12:33:44 +01:00
22df03944c
Merge branch 'develop' into new-guest-access
2017-06-06 10:35:28 +01:00
f8198ba9c9
Merge branch 'develop' into new-guest-access
2017-06-06 10:33:01 +01:00
e7af9bde23
Merge pull request #1036 from matrix-org/luke/fix-people-section-disappearing-again
...
Remove DM-guessing code (again)
2017-06-06 10:20:44 +01:00
d77a09adba
quick and dirty override to disable MD globally
2017-06-05 21:33:01 +01:00
4ab6dc9ddd
Merge branch 'new-guest-access' into luke/ilag-i18n
2017-06-05 20:28:51 +01:00
dc4f321707
Pass room and user id to apps draw
2017-06-05 18:21:31 +01:00
ad87e9bd50
Apply https://github.com/matrix-org/matrix-react-sdk/commit/9cae667c063e67b32e60b89e7256d714a056559b to ilag branch
2017-06-05 17:28:36 +01:00
cc8078837d
Remove DM-guessing code (again)
...
Seems this got reverted somehow:
>the revert of https://github.com/matrix-org/matrix-react-sdk/pull/807 (https://github.com/matrix-org/matrix-react-sdk/commit/ebfafb363972e77ef02f0e518573bf68ebc0ed15 ) also included the revert of https://github.com/matrix-org/matrix-react-sdk/pull/829
2017-06-05 16:57:30 +01:00
619830617a
Merge branch 'develop' into luke/ilag-i18n
...
In order to get ILAG internationalised
Conflicts:
src/components/structures/LoggedInView.js
src/components/structures/MatrixChat.js
src/components/views/dialogs/ChatCreateOrReuseDialog.js
src/components/views/dialogs/SetDisplayNameDialog.js
src/createRoom.js
src/i18n/strings/en_EN.json
2017-06-05 16:08:03 +01:00
6125395675
_t for SetMxIdDialog
2017-06-05 15:36:10 +01:00
c6991fd33c
Periodically pass messages to embedded iframe
2017-06-04 23:00:52 +01:00
159a920dc8
Better RTL support
2017-06-03 18:52:45 +03:00
1bbdb6c985
actually pass ev through
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-03 15:51:20 +01:00
4032a820f0
move KEY_M to KeyCode
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com >
2017-06-02 21:46:08 +01:00
Robert Swain