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

5751 Commits

Author SHA1 Message Date
Weblate 152f28bf2a Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 13:45:20 +00:00
David Baker f940dfdd79
Merge pull request #5984 from vector-im/t3chguy/datesep 
fix&refactor DateSeparator and MessageTimestamp
 2018-01-15 13:45:14 +00:00
Weblate cf00ac34d9 Merge remote-tracking branch 'origin/develop' into develop 2018-01-15 10:06:12 +00:00
toriko a50e9d2b6b Translated using Weblate (Japanese) 
Currently translated at 33.1% (73 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ja/
 2018-01-15 10:06:11 +00:00
Jeff Huang e2ef885aa6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2018-01-15 10:06:10 +00:00
David Baker fc844567a6
Merge pull request #5978 from vector-im/t3chguy/nvl/rich_quoting 
Iterative fixes on Rich Quoting
 2018-01-15 10:06:05 +00:00
Michael Telatynski f97395f40f change exports to default to retain compatibility with existing imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:41:44 +00:00
Michael Telatynski b65fdf6ab0 refactor MessageTimestamp, as it was missing a PropTypes def for ts 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:35:53 +00:00
Michael Telatynski 22c024cc94 Refactor DateSep, use new Dateutils.formatFullDateNoTime 
as it is not desired for it to include the time.

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-14 18:34:38 +00:00
Neo_Chen b99e87ba0a Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/zh_Hant/
 2018-01-13 00:44:59 +00:00
Weblate e82a95a0b5 Merge remote-tracking branch 'origin/develop' into develop 2018-01-12 09:32:21 +00:00
Klaus Marx b023cc790b Translated using Weblate (German) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-01-12 09:32:20 +00:00
David Baker d3811e3287
Merge pull request #5653 from vector-im/t3chguy/analytics_info 
move piwik whitelists to conf and add piwik config.json info to readme
 2018-01-12 09:32:15 +00:00
Michael Telatynski 5aec6840bf
Add cursor:pointer so that it actually looks clickable 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:33:21 +00:00
Michael Telatynski 17c4839029
only show reply button on REAL (not pending) m.room.message events 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-11 19:21:02 +00:00
Osoitz 26f377decf Translated using Weblate (Basque) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/eu/
 2018-01-11 12:55:14 +00:00
Szimszon 004ccc47b3 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2018-01-11 12:34:32 +00:00
Andrey fbd7860a9b Translated using Weblate (Russian) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/ru/
 2018-01-11 10:47:32 +00:00
Kévin C 586533d6ea Translated using Weblate (French) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2018-01-11 10:36:52 +00:00
Bamstam c8bd89ce4c Translated using Weblate (German) 
Currently translated at 100.0% (220 of 220 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/de/
 2018-01-11 10:36:29 +00:00
Weblate 1a9b86b27f Merge remote-tracking branch 'origin/develop' into develop 2018-01-11 10:34:48 +00:00
David Baker 56300f9578
Merge pull request #5804 from vector-im/t3chguy/nvl/rich_quoting 
Implement Rich Quoting/Replies
 2018-01-11 10:34:43 +00:00
Michael Telatynski 77e2ceba9e
switch to new ES6 DateUtils imports 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-10 21:50:32 +00:00
Weblate 89c5be39d1 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 21:33:27 +00:00
Matthew Hodgson c8e87cb5a2
Merge pull request #5950 from vector-im/t3chguy-patch-1 
Change author
 2018-01-08 21:33:22 +00:00
Michael Telatynski 627ebb848d
Change author 2018-01-08 21:32:25 +00:00
Weblate 54cafec57a Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:18:08 +00:00
David Baker 1405859d2c
Merge pull request #5944 from vector-im/revert-3046-patch-1 
Revert "Add a &nbsp; after timestamp"
 2018-01-08 15:18:03 +00:00
David Baker 24e16e5c18
Revert "Add a &nbsp; after timestamp" 2018-01-08 15:17:05 +00:00
Weblate 9c7783b439 Merge remote-tracking branch 'origin/develop' into develop 2018-01-08 15:00:51 +00:00
David Baker a21bbd15c5
Merge pull request #3046 from rubo77/patch-1 
Add a &nbsp; after timestamp
 2018-01-08 15:00:45 +00:00
David Baker b6c002b587
Fix merge 2018-01-08 14:35:39 +00:00
David Baker 9c3e4a1202
Merge branch 'develop' into patch-1 2018-01-08 14:31:21 +00:00
Iru Cai (vimacs) 97cc7f88ef Translated using Weblate (Chinese (Simplified)) 
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_Hans/
 2018-01-08 02:02:11 +00:00
Weblate 5a5b0568f2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-07 20:34:24 +00:00
Matthew Hodgson bddab533a3
Merge pull request #5938 from osoitz/master 
Corrected language name
 2018-01-07 20:34:19 +00:00
osoitz 5106809394
Update copy-res.js 
Corrected Basque name
 2018-01-07 20:39:24 +01:00
Michael Telatynski 290bf54d4f pluralise properly 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:55:32 +00:00
Michael Telatynski c68c54618f delint 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:19:43 +00:00
Michael Telatynski 3788fde711 Add a tooltip to members button and badge with actual count 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-05 23:16:21 +00:00
Weblate 9289d1a57d Merge remote-tracking branch 'origin/develop' into develop 2018-01-05 14:30:51 +00:00
David Baker d6942a455d Merge branch 'rubo77-hide-options-cp' into develop 2018-01-05 14:30:36 +00:00
David Baker c8af65fff4 Merge branch 'hide-options-cp' of https://github.com/rubo77/vector-web into rubo77-hide-options-cp 2018-01-05 14:30:21 +00:00
Weblate 94aa5b5f1b Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 16:15:57 +00:00
David Baker 38e0b26153 Merge branch 'master' into develop 2018-01-03 16:15:46 +00:00
David Baker 5635614549 v0.13.4 2018-01-03 16:13:24 +00:00
David Baker 1bb861f6cf Prepare changelog for v0.13.4 2018-01-03 16:13:24 +00:00
David Baker 2eb433157a v0.13.4 2018-01-03 16:08:38 +00:00
Michael Telatynski d71af40967 add missing config.json entry such that scalar-staging widgets work 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2018-01-03 16:06:58 +00:00
Weblate d2a676cad2 Merge remote-tracking branch 'origin/develop' into develop 2018-01-03 15:48:44 +00:00