mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 14:41:33 +03:00
Code Issues Projects Releases Packages Wiki Activity
7807 commits 219 branches 562 tags 474 MiB
Commit graph

4237 commits

Author SHA1 Message Date
David Baker
5bca5a7a8e More underscore 2017-12-06 19:02:26 +00:00
David Baker
e2f5e16fa7 Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-20 10:00:47 +00:00
Travis Ralston
d010329f4a Make the room-level URL preview notification explicit 
Fixes https://github.com/vector-im/riot-web/issues/5638

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:03:06 -07:00
Travis Ralston
cdf5a6fb8a Fix typo that prevented URL previews on a room-account level from being saved 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:02:33 -07:00
David Baker
1675737e7d Merge remote-tracking branch 'origin/master' into develop 2017-11-17 17:48:42 +00:00
David Baker
6d23182f5f Fix the force TURN option 
The call object is created within the js-sdk for inbound calls, so
we never got the chance to set it.
 2017-11-17 14:54:44 +00:00
David Baker
65e1d49f37 More sensible buttons in UnknownDeviceDialog 
Just say 'Send' (or equiv) if you actually verify all the devices,
rather than 'Send Anyway'.
 2017-11-16 17:59:42 +00:00
David Baker
3c8645871f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 16:47:15 +00:00
David Baker
196eafdc7f Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-16 15:59:16 +00:00
David Baker
02629d13d9
Merge pull request #1615 from matrix-org/luke/fix-sender-profile-opacity 
Do something more sensible for sender profile name/aux opacity
 2017-11-16 15:35:16 +00:00
Luke Barnard
7ffb542cb5 Do something more sensible for sender profile name/aux opacity 
- If no translation is needed, don't do it.
 - For now, ignore the fact that this doens't allow us easily to put
   Flair into "luke sent an image" but we don't kow where the flair
   should go for this anyway.
 2017-11-16 15:24:36 +00:00
David Baker
6f8427a5af Revert rest of https://github.com/matrix-org/matrix-react-sdk/pull/1584 
Because apparently the revert did not revert this part
 2017-11-16 15:11:47 +00:00
Luke Barnard
b54e563cb6 Merge branch 'develop' into luke/linting-keyword-spacing 2017-11-16 13:23:42 +00:00
Luke Barnard
dad797d4a2 Run linting --fix 2017-11-16 13:19:36 +00:00
Matthew Hodgson
f62b04c3be
Merge branch 'develop' into travis/granular_bugs 2017-11-16 13:12:03 +00:00
Luke Barnard
f99755378a
Merge pull request #1612 from matrix-org/t3chguy/state_events 
differentiate between state events and message events
 2017-11-16 13:06:36 +00:00
Luke Barnard
a80935e181 JSX does not do comments in a way one might expect 2017-11-16 11:45:40 +00:00
Travis Ralston
d0a0a9ce7f Fix URL preview string not being translated 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 22:33:23 -07:00
Travis Ralston
10a1d9cb29 Language is a local setting 
Fixes https://github.com/vector-im/riot-web/issues/5611

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 21:16:12 -07:00
Travis Ralston
022e40a127 Use SettingsStore for default theme 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-15 19:04:49 -07:00
Stefan Parviainen
2c1618bc10 Fix conflict and update strings 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-15 20:40:51 +01:00
David Baker
b0027525f3 Wire up Unknown Devices popup for outbound calls 2017-11-15 17:21:04 +00:00
Michael Telatynski
c0002e7778
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/state_events 2017-11-15 16:03:07 +00:00
Michael Telatynski
5563b71c47
differentiate between state events and message events 
so that people can't fake state event types and have them rendered.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-11-15 15:56:54 +00:00
David Baker
aeca83ff2e Unused import 2017-11-15 15:20:45 +00:00
Richard Lewis
750e64deee Pass required props to TintableSvg. 2017-11-15 15:17:21 +00:00
David Baker
93800be742 Factor out showing UnknownDeviceDialog 
So we can re-use it for calls that fail due to unknwon devices
 2017-11-15 15:15:21 +00:00
Richard Lewis
7bab7813bb Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/invertOutlineColour 2017-11-15 13:26:29 +00:00
Richard Lewis
59d405d4fa Use TintableSvgButtons for widget menubar icons. 2017-11-15 13:24:38 +00:00
Richard Lewis
6c2e9096cd Tintable SVGs that behave like normal image buttons / links. 2017-11-15 13:08:24 +00:00
David Baker
f8fc6dc83e Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show 2017-11-15 12:11:33 +00:00
Matthew Hodgson
96a3eff5d3 lint hell 2017-11-15 11:25:56 +00:00
Matthew Hodgson
060a890275
Merge pull request #1516 from turt2live/travis/granular-settings 
Granular settings
 2017-11-15 10:55:55 +00:00
David Baker
63919befd0 Catch call failures due to unknown devices 
And show a specific dialog that you can then launch the UDD from
(although currently with a 'Send Anyway' button which makes little
sense for VoIP)
 2017-11-15 10:49:29 +00:00
Matthew Hodgson
e91e94fd42 fix unstyled CSS bug https://github.com/vector-im/riot-web/issues/5601 2017-11-15 09:56:44 +00:00
Travis Ralston
f58e8826c0 Use the correct settings store for presence 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-14 19:18:04 -07:00
Travis Ralston
bd4102eb3d Merge branch 'develop' into travis/granular-settings 2017-11-14 19:12:48 -07:00
Matthew Hodgson
546b062d82 automatically and correctly retint when changing theme 2017-11-15 01:45:51 +00:00
Matthew Hodgson
f05958e334
Merge pull request #1482 from turt2live/travis/presence 
Implement user-controlled presence
 2017-11-14 23:53:16 +00:00
Richard Lewis
58966c5c3d Make edit icon green by default 2017-11-14 19:53:59 +00:00
Richard Lewis
e87940f63c Make app tile title stronger 2017-11-14 19:53:32 +00:00
Stefan Parviainen
f8660de52d Add note about alternative to opacity 2017-11-14 20:13:00 +01:00
Stefan Parviainen
df6d5cc2b4 Pass plain components, rather than functions returning them 2017-11-14 20:09:52 +01:00
Stefan Parviainen
788be67c75 Clarifications 2017-11-14 20:08:27 +01:00
Matthew Hodgson
7c98558b6a fix neglible race when loading CSS 2017-11-14 16:07:48 +00:00
Matthew Hodgson
1fd7ac30e4 turns out i made up the .complete property on link elements 2017-11-14 16:04:11 +00:00
Matthew Hodgson
8d6e3dd27d fix lint 2017-11-14 15:37:03 +00:00
Matthew Hodgson
dcfbe93409 fix race when loading CSS 
fixes https://github.com/vector-im/riot-web/issues/5590
 2017-11-14 15:28:34 +00:00
Matthew Hodgson
8c218557df fix disable_custom_urls 2017-11-14 15:17:50 +00:00
David Baker
55260becc9 Revert "Lowercase all usernames" 2017-11-14 14:13:22 +00:00