gaja-group
/
element-web
forked from matrix/element-web
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,470 Commits 964 Branches 0 Tags 74 MiB
Commit Graph

5470 Commits

Author SHA1 Message Date
Weblate 41c7d0cb41 Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 11:07:38 +00:00
Luke Barnard 4e7a1e9653 Correctly position TagPanel createGroupButton 2017-11-30 11:07:27 +00:00
Weblate 0061d9ad6c Merge remote-tracking branch 'origin/develop' into develop 2017-11-30 10:12:46 +00:00
Matthew Hodgson 2a402985aa
Merge pull request #5685 from aidalgol/root-lang-attrib-fix 
Set html lang attribute from language setting
 2017-11-30 10:12:40 +00:00
Weblate 8c315c7e0b Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 22:04:48 +00:00
Matthew Hodgson f72b44650b fix tertiary accent colors 2017-11-29 22:04:40 +00:00
Weblate 8da2a29f86 Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 18:50:31 +00:00
Luke Barnard 72563e6114 overflow hidden for groupPublicity scrollbox 2017-11-29 18:50:22 +00:00
Weblate 7153d03660 Merge remote-tracking branch 'origin/develop' into develop 2017-11-29 17:30:46 +00:00
Milan Korecký fd63aac406 Translated using Weblate (Czech) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-11-29 17:30:44 +00:00
Luke Barnard 123ad19b28
Merge pull request #5723 from vector-im/luke/feature-tag-panel 
CSS for new TagPanel
 2017-11-29 17:30:40 +00:00
Luke Barnard 28132eaf36 Correct comment 2017-11-29 17:17:09 +00:00
Luke Barnard 0c43edb629 CSS for new TagPanel 2017-11-29 16:41:00 +00:00
Weblate 59f1cc3922 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 14:09:45 +00:00
Luke Barnard 63bedc440b
Merge pull request #5707 from vector-im/luke/allow-guest-view-group 
getGroupStore no longer needs a matrix client
 2017-11-28 14:09:39 +00:00
Luke Barnard bbdafeff77 getGroupStore no longer needs a matrix client 2017-11-28 13:17:30 +00:00
Weblate d02ae30023 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:25:49 +00:00
Luke Barnard 58b7530134
Merge pull request #5702 from vector-im/luke/move-group-flair-toggle-to-user-settings 
CSS required for moving group publication toggles to UserSettings
 2017-11-28 11:25:45 +00:00
Weblate 4f384b2325 Merge remote-tracking branch 'origin/develop' into develop 2017-11-28 11:22:34 +00:00
Richard van der Hoff 93f05ceea3 Merge branch 'master' into develop 2017-11-28 11:22:16 +00:00
Richard van der Hoff 5fff46fdac v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff 0f5785c27b Prepare changelog for v0.13.2 2017-11-28 11:17:57 +00:00
Richard van der Hoff 854a665627 v0.13.2 2017-11-28 11:16:45 +00:00
Richard van der Hoff 2e9f309415 Bump to react-sdk 0.11.2 2017-11-28 11:16:13 +00:00
Luke Barnard 6fc173eaa9 CSS required for moving group publication toggles to UserSettings 
See https://github.com/matrix-org/matrix-react-sdk/pull/1634
 2017-11-27 18:59:33 +00:00
Weblate 15e5f13969 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:59:00 +00:00
Luke Barnard 5f4d011606 Merge branch 'develop' of github.com:vector-im/riot-web into develop 2017-11-27 18:58:42 +00:00
Luke Barnard 9da799c2dd GroupTile h3 becomes div for simpler reuse 2017-11-27 18:57:59 +00:00
Weblate 21b693f3c8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-27 18:11:12 +00:00
Mateo Castro a7ac003064 Translated using Weblate (Spanish) 
Currently translated at 95.8% (210 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/es/
 2017-11-27 18:11:12 +00:00
xmeta 9ec1f9b07d Translated using Weblate (Japanese) 
Currently translated at 32.8% (72 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2017-11-27 18:11:11 +00:00
Neo_Chen 57f1dd1d68 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-11-27 18:11:11 +00:00
David Baker a346cf393d
Merge pull request #5630 from turt2live/travis/granular-theme 
Make sure the SettingsStore is ready to load the theme before loading it
 2017-11-27 18:11:07 +00:00
Travis Ralston c825ab0fa3
Add comment about why we call SdkConfig twice 
Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-27 11:03:58 -07:00
Aidan Gauland c4dc59dc41 Use documentElement instead of getElementById 
Use documentElement to get the root <html> element instead of adding an id to
the root element.
 2017-11-26 13:46:47 +13:00
Aidan Gauland 43b3c013f2 Change html root id 
Change the root <html> element id to follow Matrix naming conventions.
 2017-11-26 09:49:39 +13:00
Aidan Gauland c0a5c28d80 Set html lang attribute from language setting 2017-11-25 22:58:52 +13:00
Weblate 6e477b66c6 Merge remote-tracking branch 'origin/develop' into develop 2017-11-21 18:47:41 +00:00
Matthew Hodgson c28d9e5cde
Merge pull request #5661 from pafcu/sidebar-a11y 
Add some aria-labels to RightPanel
 2017-11-21 18:47:37 +00:00
Stefan Parviainen 0bd68ce068 Add some aria-labels to RightPanel 
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
 2017-11-21 09:18:59 +01:00
Weblate c3a0c26610 Merge remote-tracking branch 'origin/develop' into develop 2017-11-20 13:30:46 +00:00
Luke Barnard f2e66590da
Merge pull request #5657 from vector-im/luke/fix-member-count-format 
Use badge count format for member count in RightPanel
 2017-11-20 13:30:40 +00:00
lukebarnard 7cb59bddb0 Use badge count format for member count in RightPanel 
(to avoid cosmetic disasters with >9999 members in a room, e.g. HQ)
 2017-11-20 13:12:55 +00:00
Jan Kudrik cecaca61a3 Translated using Weblate (Czech) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/cs/
 2017-11-19 13:52:20 +00:00
Jeff Huang e4f7cbe85c Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2017-11-19 03:12:10 +00:00
Марко М. Костић 08be00a154 Translated using Weblate (Serbian) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/sr/
 2017-11-18 21:37:55 +00:00
dark159123 5132d2132b Translated using Weblate (Danish) 
Currently translated at 100.0% (219 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/da/
 2017-11-18 20:45:18 +00:00
Weblate 1b24e643de Merge remote-tracking branch 'origin/develop' into develop 2017-11-18 12:25:54 +00:00
Matthew Hodgson 21d7c4d92a
Merge pull request #5640 from turt2live/travis/granular-language 
Exclude the default language on page load
 2017-11-18 12:25:50 +00:00
Travis Ralston aab044a14c Exclude the default language on page load 
This is so we correctly detect the browser language.

Fixes https://github.com/vector-im/riot-web/issues/5632

Signed-off-by: Travis Ralston <travpc@gmail.com>
 2017-11-17 22:15:35 -07:00