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

5442 Commits

Author SHA1 Message Date
Sulejman Delic fb1afdab1c Added translation using Weblate (Bosnian) 2017-12-08 09:19:01 +00:00
Weblate 33446bf4ff Merge remote-tracking branch 'origin/develop' into develop 2017-12-04 18:09:30 +00:00
Matthew Hodgson 9835e2e0b4
Merge pull request #5759 from vector-im/luke/renumerate-broken-ordered-sublists 
Implement renumeration of ordered tags upon collision
 2017-12-04 18:09:23 +00:00
Weblate f08b0f7800 Merge remote-tracking branch 'origin/develop' into develop 2017-12-04 12:36:51 +00:00
Luke Barnard 95c746936a Merge branch 'master' into develop 2017-12-04 12:36:42 +00:00
Luke Barnard b73f0c7b90 v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard 8ec48db86c Prepare changelog for v0.13.3 2017-12-04 12:31:50 +00:00
Luke Barnard 5fba5b30e9 v0.13.3 2017-12-04 12:29:32 +00:00
Luke Barnard c685546e9a Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:27:49 +00:00
Weblate bb6aabc017 Merge remote-tracking branch 'origin/develop' into develop 2017-12-04 12:26:11 +00:00
Luke Barnard 1a0c0af447 Bump js-sdk to 0.9.2, react-sdk to 0.11.3 2017-12-04 12:25:54 +00:00
Moo 491bb4fd1d Translated using Weblate (Lithuanian) 
Currently translated at 39.7% (87 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/lt/
 2017-12-04 11:32:10 +00:00
Tirifto a3e2698223 Translated using Weblate (Esperanto) 
Currently translated at 84.4% (185 of 219 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eo/
 2017-12-04 11:32:09 +00:00
Moo 452fe44795 Added translation using Weblate (Lithuanian) 2017-12-01 22:15:02 +00:00
Luke Barnard b0d115a64a Implement renumeration of ordered tags upon collision 
I was being bitten by this enough for me to want to fix it. This implementation really ought to be improved such that it doesnt tend towards being broken the more it is used.
 2017-12-01 18:20:38 +00:00
Luke Barnard e80c4fadea Linting 2017-12-01 18:18:48 +00:00
Weblate 04ed2a3d09 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 14:12:39 +00:00
Luke Barnard cc4890f0b8 Fix TagPanel bg on status theme 2017-12-01 14:12:31 +00:00
Weblate 7924ee65e0 Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 12:04:15 +00:00
Luke Barnard 0aaae9bca5
Merge pull request #5751 from vector-im/luke/refactor-keycode-to-keyboard 
Update imports for accessing KeyCode
 2017-12-01 12:04:10 +00:00
Weblate fb7a071c2a Merge remote-tracking branch 'origin/develop' into develop 2017-12-01 11:04:56 +00:00
Luke Barnard a24c42b3a8 Realign collpased BottomLeftMenu with create group button 2017-12-01 11:04:46 +00:00
Luke Barnard 1ccffb7e58 Update imports for accessing KeyCode 2017-12-01 10:56:25 +00:00
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