gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,561 Commits 2 Branches 0 Tags 25 MiB
Commit Graph

4561 Commits

Author SHA1 Message Date
David Baker 3eeabe8d91 Merge pull request #4775 from vector-im/luke/fix-user-url-no-middle-panel 
Remove userId property on RightPanel
 2017-08-11 10:49:25 +01:00
Oon Arfiandwi eb036bd8f1 Translated using Weblate (Indonesian) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/id/
 2017-08-10 21:15:51 +00:00
Weblate 72cbdb2e39 Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 17:20:25 +00:00
Luke Barnard 752934350f Merge pull request #4776 from shvchk/patch-2 
Make member device info buttons fluid and stackable with flexbox
 2017-08-10 18:20:22 +01:00
Matthew Hodgson 5bfb5d4c3c move focus-via-up/down cursors to LeftPanel 
Conflicts:
	src/components/structures/LeftPanel.js
 2017-08-10 18:18:15 +01:00
Andrei Shevchuk a72fc80ef6 Remove width 100% from device info buttons wrapper 2017-08-10 20:08:46 +03:00
Luke Barnard 44c6f3fafc Add todo to make RP listen to RVS 2017-08-10 16:59:12 +01:00
Andrei Shevchuk 68dd47aa7b Make member device info buttons fluid and stackable with flexbox 
Buttons with short text stay as they are, buttons with long text don't get overflowed, but just grow and wrap on a new line if needed, still remaining aligned with others (see screenshot in PR comments)

Signed-off-by: Andrei Shevchuk <andrei@shevchuk.co>
 2017-08-10 17:50:09 +03:00
Weblate a13c0b12cb Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 14:36:08 +00:00
Luke Barnard 535e33509b Merge pull request #4688 from vector-im/t3chguy/i18n_analytics 
un-i18n Modal Analytics
 2017-08-10 15:36:04 +01:00
Michael Telatynski 4c6836bc3f
don't track error messages .2 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 15:13:30 +01:00
Michael Telatynski 9c5ceb6775
don't track error messages 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2017-08-10 13:56:01 +01:00
Weblate d20c1fe029 Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 12:29:44 +00:00
Marcel aae7515339 Add Login Page LanguageDropdown CSS (#4767) 2017-08-10 13:29:41 +01:00
Luke Barnard 7269e7b84a Remove userId property on RightPanel 
because we shouldn't have a dispatch AND have a property that do vaguely similar things. Ideally, the dispatch would send a userId and RP would do async work to get the member/avatar/displayname.
 2017-08-10 13:16:31 +01:00
Weblate 81d123f652 Merge remote-tracking branch 'origin/develop' into develop 2017-08-10 09:35:49 +00:00
Sri Lakshmi b8c0e844ea Translated using Weblate (Telugu) 
Currently translated at 60.8% (126 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-10 09:35:49 +00:00
Alexandre Franke 6cab2ed6b9 Translated using Weblate (French) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/fr/
 2017-08-10 09:35:49 +00:00
Luke Barnard 72d250d8c4 Merge pull request #4773 from vector-im/luke/fix-quote-innerText 
Quote using innerText
 2017-08-10 10:35:45 +01:00
Luke Barnard 57f82c3c9e Quote using innerText 
codep matrix-org/matrix-react-sdk#1289
 2017-08-10 10:18:37 +01:00
Nathan van Beelen 918d0eb4fd Translated using Weblate (Dutch) 
Currently translated at 100.0% (207 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/nl/
 2017-08-09 19:40:13 +00:00
Richard Lewis 435ec448d6 Add improved icons from Matthew 2017-08-09 16:21:15 +01:00
Bhuvan Krishna 1e4d621ee7 Translated using Weblate (Telugu) 
Currently translated at 60.8% (126 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-09 15:11:30 +00:00
Sri Lakshmi 370268bba8 Translated using Weblate (Telugu) 
Currently translated at 60.3% (125 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-09 15:11:14 +00:00
Sri Lakshmi 8906aeb766 Translated using Weblate (Telugu) 
Currently translated at 60.3% (125 of 207 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/te/
 2017-08-09 14:45:33 +00:00
Richard Lewis d9ebb11ba9 Merge branch 'develop' of https://github.com/vector-im/riot-web into rxl881/appFixes 2017-08-09 14:08:13 +01:00
Weblate 906ed3c78f Merge remote-tracking branch 'origin/develop' into develop 2017-08-09 08:30:53 +00:00
Luke Barnard ee2fb17945 Merge pull request #4765 from vector-im/rav/karma-bits 
Karma tweaks for riot-web
 2017-08-09 09:30:49 +01:00
Richard van der Hoff 06ef674597 Enable fancy karma reporters 
cargo-cult luke's stuff from react-sdk
 2017-08-08 19:05:58 +01:00
Richard van der Hoff df33d40285 Enable karma-sourcemap-loader 
This turns (some) stacktraces back into something useful, so that unpicking
test failures is vaguely tractable
 2017-08-08 19:05:49 +01:00
Weblate b3108e4dff Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 17:23:49 +00:00
Richard van der Hoff 0b2120e423 Merge pull request #4764 from MTRNord/patch-5 
Fix typo with scripts/fetch-develop-deps.sh in Building From Source
 2017-08-08 18:23:44 +01:00
Marcel a3525f411d Fix typo with scripts/fetch-develop-deps.sh in Building From Source 
scripts/fetch-develop-deps.sh vs scripts/fetch-develop.deps.sh
 2017-08-08 19:22:07 +02:00
Weblate f7c38992cc Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 13:01:34 +00:00
David Baker 3e96892a91 Merge pull request #4757 from vector-im/luke/css-feature-pills-hide-avatar-setting 
Adjust CSS for optional avatars in pills
 2017-08-08 14:01:29 +01:00
Luke Barnard 274fc34868 Adjust CSS for optional avatars in pills 
codep matrix-org/matrix-react-sdk#1277
 2017-08-08 11:14:52 +01:00
Weblate 6cb979fc6f Merge remote-tracking branch 'origin/develop' into develop 2017-08-08 09:13:10 +00:00
Richard van der Hoff 10ee9f4de4 Merge pull request #4754 from vector-im/rav/fix_crypto_build 
Fix crypto on develop
 2017-08-08 10:13:06 +01:00
Richard van der Hoff c31f66aed5 Jenkins.sh: only fetch head of dependency branches 2017-08-08 09:50:49 +01:00
Richard van der Hoff 7b024751d1 fetch-develop-deps: avoid breaking js-sdk 
do `npm i` in react-sdk *before* symlinking js-sdk, to avoid moving a load of
deps from js-sdk to react-sdk and hence breaking the build.
 2017-08-08 09:50:49 +01:00
Richard van der Hoff 9c3c1b7608 Make webpack exit non-zero on error 
Pass `--bail` to webpack, so that if we can't find a module, we bail out rather
than deploy a broken version to /develop.

https://github.com/webpack/webpack/issues/708 is somewhat relevant.
 2017-08-08 09:50:49 +01:00
Weblate a8ddf528a8 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:11:38 +00:00
Matthew Hodgson 9f3c33758c Merge pull request #4464 from vsund/patch-1 
Fix signing key url in readme
 2017-08-06 20:11:32 +01:00
Weblate ed9a4a3933 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:11:06 +00:00
Matthew Hodgson bf38fead18 Merge pull request #4749 from jfmherokiller/gitignore-update 
update gitignore to allow .idea directory to exist in subdirs
 2017-08-06 20:11:00 +01:00
Weblate b75402e772 Merge remote-tracking branch 'origin/develop' into develop 2017-08-06 19:10:34 +00:00
Matthew Hodgson a98c734eb5 Merge pull request #4665 from uhoreg/compact 
tweak compact theme
 2017-08-06 20:10:27 +01:00
Jordan Moran Meyers fb69ac33a0
update gitignore to allow .idea directory to exist in subdirs 2017-08-05 15:50:47 -05:00
Richard Lewis 25d1d785ba Updated icons 2017-08-05 00:23:55 +01:00
Richard Lewis 41afbb117d Add show and hide icons 2017-08-04 23:44:52 +01:00