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

8931 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
2aa15095f2 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:38:16 +00:00
Luke Barnard
a62a650c5a
Merge pull request #1783 from matrix-org/luke/fix-group-avatar-update 
Fix bug where avatar change not reflected in LLP
 2018-03-01 15:38:12 +00:00
Andrey
379690bcc2 Translated using Weblate (Russian) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-03-01 15:36:58 +00:00
Luke Barnard
86295acba3 Merge branch 'develop' into luke/fix-group-avatar-update 2018-03-01 15:27:06 +00:00
Kévin C
25e8272d2c Translated using Weblate (French) 
Currently translated at 100.0% (990 of 990 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-03-01 15:07:44 +00:00
Luke Barnard
d5908fbc1e Fix FlairStore cache busting 2018-03-01 15:06:05 +00:00
Weblate
8499a95f18 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:51 +00:00
David Baker
e91ae6b5ac
Merge pull request #1782 from matrix-org/luke/fix-drag-drop-click-weirdness 
Workaround for atlassian/react-beautiful-dnd#273
 2018-03-01 15:05:47 +00:00
Weblate
ad2a8469a3 Merge remote-tracking branch 'origin/develop' into develop 2018-03-01 15:05:14 +00:00
Ralitsa Bozhkova
8b51ad7053 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-03-01 15:05:13 +00:00
David Baker
ef58f71152
Merge pull request #1781 from matrix-org/luke/feature-disable-tag-panel 
Add setting to disable TagPanel
 2018-03-01 15:05:09 +00:00
Luke Barnard
61a6f140f5 onClientSync -> _onClientSync 2018-03-01 14:43:26 +00:00
Luke Barnard
4037a22492 Fix bug where avatar change not reflected in LLP 
Fixes vector-im/riot-web#6189
 2018-03-01 14:40:03 +00:00
Luke Barnard
64332b3021 Workaround for atlassian/react-beautiful-dnd#273 
Fix two bugs in Riot due to a single bug in react-b-dnd

Fixes vector-im/riot-web#6253
Fixes vector-im/riot-web#6156
 2018-03-01 13:48:46 +00:00
Krombel
35b42ad729 Translated using Weblate (German) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-03-01 10:33:56 +00:00
Luke Barnard
f29918b766 gen-i18n 2018-02-28 18:18:59 +00:00
Luke Barnard
27c71f15b9 Add setting to disable TagPanel 2018-02-28 18:16:01 +00:00
Weblate
b57c9c579c Merge remote-tracking branch 'origin/develop' into develop 2018-02-28 17:07:36 +00:00
David Baker
1ac62a17ff
Merge pull request #1779 from matrix-org/luke/fix-room-settings-power-levels 
Fix room power level settings
 2018-02-28 17:07:31 +00:00
Weblate
de727b37a8 Merge remote-tracking branch 'origin/develop' into develop 2018-02-28 16:58:32 +00:00
Klaus Marx
14d7e5e73d Translated using Weblate (German) 
Currently translated at 99.6% (986 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2018-02-28 16:58:31 +00:00
RainSlide
a48d17258a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-02-28 16:58:30 +00:00
RainSlide
758bc2976c Translated using Weblate (Chinese (Simplified)) 
Currently translated at 76.3% (755 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hans/
 2018-02-28 16:58:30 +00:00
Ralitsa Bozhkova
a36ff75da7 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-28 16:58:30 +00:00
Luke Barnard
fa9ff4ae6e
Merge pull request #1769 from matrix-org/t3chguy/fix_hide_joins_parts 
fix shouldHideEvent saying an event is a leave/join when a profile ch…
 2018-02-28 16:58:26 +00:00
Luke Barnard
d3dc2a33b4 Fix bug preventing setting room power levels 
- don't use refs, use onChange of PowerSelector
 - store power levels as state in the RoomSetting component
 2018-02-28 16:32:20 +00:00
Luke Barnard
567d83ba52 Update PowerSelector to support powerLevelKey prop 
As a key to send as second argument to onChange. This is useful
when passing the same callback to multiple PowerSelectors.
 2018-02-28 16:15:20 +00:00
Luke Barnard
9a72e69a43 Handle lack of room directory visibility response 2018-02-28 16:14:18 +00:00
Luke Barnard
dd529791fb Remove unused prop 2018-02-28 16:13:01 +00:00
Luke Barnard
d91d1932f4 Add tests for RoomSettings 
For setting:
 - name
 - topic
 - history visibility
 - power levels

Testing RoomSettings required more stubbing on the matrix client.

The power level tests should be failing at this commit, with
fixes being made in upcoming commits.

Some tests are marked as known failures that we should fix but
aren't necessarily bugs:
 - SettingStore.setValue is used when saving despite the user not
   having made a change.
 - Testing directory publicity changes cannot be tested because we
   update state asynchronously in componentWillMount (which we do
   not block on in beforeEach).

Also, we needed to use `export default` to make sure everything
uses the same client peg and client.
 2018-02-28 16:07:21 +00:00
daniel tygel
32c2650452 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-28 13:15:02 +00:00
Jeff Huang
eebf9193ad Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-02-28 06:17:18 +00:00
Michael Telatynski
d66d66b2ec
comment on weirdness 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-28 01:03:58 +00:00
Michael Telatynski
bd4b40309d
fix based on PR review 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-02-28 00:49:14 +00:00
Jeff Huang
753193055b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2018-02-28 00:02:52 +00:00
Andrey
d733e38a8f Translated using Weblate (Russian) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2018-02-27 19:38:08 +00:00
Kévin C
7d92248ae3 Translated using Weblate (French) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-02-27 17:46:29 +00:00
Ralitsa Bozhkova
82592a7024 Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (989 of 989 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-27 17:36:47 +00:00
Weblate
7e3cf89e5a Merge remote-tracking branch 'origin/develop' into develop 2018-02-27 15:11:17 +00:00
Jeff
624188571b Translated using Weblate (French) 
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-02-27 15:11:16 +00:00
Katie Wolfe
15f0ae1986 Translated using Weblate (Esperanto) 
Currently translated at 97.2% (960 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2018-02-27 15:11:16 +00:00
Ralitsa Bozhkova
7d0f6584ab Translated using Weblate (Bulgarian) 
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
 2018-02-27 15:11:16 +00:00
Osoitz
a92e3eac6c Translated using Weblate (Basque) 
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2018-02-27 15:11:16 +00:00
Luke Barnard
b78e248110
Merge pull request #1777 from matrix-org/luke/groups-my-groups-microcopy 
Add "Did you know:..." microcopy to groups view
 2018-02-27 15:11:12 +00:00
Luke Barnard
2b49947e1e Add "Did you know:..." microcopy to groups view 
To explain how to drag group avatars into the TagPanel
 2018-02-27 09:20:06 +00:00
daniel tygel
bc18aecd1e Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (987 of 987 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt_BR/
 2018-02-26 21:41:09 +00:00
Weblate
26c4192cbd Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 16:36:17 +00:00
Matthew Hodgson
3552800d19
Merge pull request #1753 from matrix-org/luke/fix-room-list-drop-target-bg 
Give emptySubListTip a container for correct bg colour
 2018-02-23 16:36:10 +00:00
Weblate
f053a6b623 Merge remote-tracking branch 'origin/develop' into develop 2018-02-23 15:16:01 +00:00
David Baker
d23cb4dc1f
Merge pull request #1776 from matrix-org/luke/fix-to-device-event-bug 
Do proper null-checks on decypted events to fix NPEs
 2018-02-23 15:15:56 +00:00