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

7780 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
142d23a099
Cap the read pin event IDs to 10 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-07 09:16:19 -07:00
Kévin C
2c096f45c2 Translated using Weblate (French) 
Currently translated at 100.0% (926 of 926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-07 15:34:05 +00:00
Krombel
ed34c1cc63 Translated using Weblate (German) 
Currently translated at 100.0% (926 of 926 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-07 15:24:45 +00:00
Weblate
397d7724e5 Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 15:22:40 +00:00
Andrey
a8ff8973f8 Translated using Weblate (Russian) 
Currently translated at 98.4% (911 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2017-11-07 15:22:39 +00:00
Luke Barnard
4d9f946388
Merge pull request #1582 from matrix-org/luke/group-rooms-tooltip 
Implement tooltip for group rooms
 2017-11-07 15:22:35 +00:00
Luke Barnard
646cabf324 Add missing whitespace 2017-11-07 15:15:10 +00:00
Luke Barnard
ddc1ff2f23 Name things in a sane way 2017-11-07 15:13:26 +00:00
Luke Barnard
62305a1ccd Implement tooltip for group rooms 2017-11-07 14:07:31 +00:00
Krombel
3e29a26766 Translated using Weblate (German) 
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2017-11-07 13:33:46 +00:00
Richard Lewis
96de72ab44 Switch to using existing dep "qs" and record in package.json 2017-11-07 12:45:12 +00:00
Richard Lewis
d3784b4925 Fix URL parameter encoding. 2017-11-07 12:33:38 +00:00
Richard Lewis
eb8c15075a Fix url params parsing. 2017-11-07 11:58:38 +00:00
Luke Barnard
7a09127687 Alter group member api 
To match https://github.com/matrix-org/synapse/pull/2647
 2017-11-07 11:27:42 +00:00
Richard Lewis
70c4100350 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-07 11:04:05 +00:00
Luke Barnard
9019fee49e Adjust long desc placeholder text 2017-11-07 10:48:56 +00:00
Kévin C
b92156a1ff Translated using Weblate (French) 
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2017-11-07 10:47:23 +00:00
Weblate
5e9bb4353a Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:25:54 +00:00
Luke Barnard
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills 
Room notifs in autocomplete & composer
 2017-11-07 10:25:48 +00:00
David Baker
df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
Luke Barnard
956c5ff343 Use a constant for easy reading of long desc placeholder 2017-11-06 18:52:55 +00:00
Luke Barnard
477051cfa6 Add placeholder for when a long desc hasn't been set 
this is only visible to group admins.
 2017-11-06 18:35:52 +00:00
Luke Barnard
137f1311b3 Add useful placeholder for the long description textarea 2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +00:00
Weblate
afc9c36e4e Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 18:02:44 +00:00
Matthew Hodgson
17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug 
Ignore img tags in HTML if src is not specified
 2017-11-06 18:02:38 +00:00
Luke Barnard
d14f943629 Ignore img tags in HTML if src is not specified 
This applies to HTML messages and group summaries.
 2017-11-06 17:52:46 +00:00
Weblate
16771cac4f Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 17:16:39 +00:00
David Baker
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges 
Indicate admins in the group member list with a sheriff badge
 2017-11-06 17:16:34 +00:00
David Baker
08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker
41e7496ff1 unused var 2017-11-06 15:25:25 +00:00
David Baker
adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Weblate
706981688a Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 14:29:30 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop 
Remember whether widget drawer was hidden per-room
 2017-11-06 14:29:25 +00:00
Weblate
0fdde954d4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 13:02:51 +00:00
Walter
cb7b1268fe Translated using Weblate (Ukrainian) 
Currently translated at 10.6% (98 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
 2017-11-06 13:02:51 +00:00
David Baker
48def50fec
Merge pull request #1576 from matrix-org/luke/throw-on-undefined-group 
Throw an error when trying to create a group store with falsey groupId
 2017-11-06 13:02:46 +00:00
Luke Barnard
febeb0429e Throw an error when trying to create a group store with falsey groupId 2017-11-06 10:18:10 +00:00
Travis Ralston
781b94c8f4 Appease the linter 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 15:37:06 -07:00
Travis Ralston
10519f9465 Fix the tests 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 14:56:41 -07:00
Travis Ralston
f0000f7400 Update documentation 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 14:33:40 -07:00
Travis Ralston
50807d498a Use settings in slash commands too 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-05 13:06:55 -07:00
Travis Ralston
e31c89d360 Make the controller work for notifications 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 22:28:35 -07:00
Travis Ralston
7ce4316cc8 Initial support for notification settings 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 21:47:18 -07:00
Travis Ralston
8351ec7e73 Local echo on all setting levels 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 20:32:00 -07:00
Travis Ralston
3958e32672 Ensure blacklistUnverifiedDevices persists reloads 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 20:13:23 -07:00
Travis Ralston
45140cab69 Don't assume false means "use state" 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:42 -07:00
Travis Ralston
ef45d82ec6 Fix URL preview save calls 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:20 -07:00
Travis Ralston
b75be41f94 Fix split-brain for blacklistUnverifiedDevices 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-04 19:52:06 -07:00