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

8835 Commits

Author SHA1 Message Date
Travis Ralston d3d6e4ae77 Switch back to legacy decorators 
For https://github.com/matrix-org/matrix-react-sdk/pull/3961
 2020-01-28 16:46:02 +00:00
Travis Ralston daf6aaaf30
Merge pull request #12102 from vector-im/travis/babel-skinning 
Update babel targets
 2020-01-28 14:50:25 +00:00
Travis Ralston d50b52cdc5 Try to fix Jest 2020-01-28 14:31:09 +00:00
Travis Ralston cff4ad9e82 Remove legacy and stop using deprecated things 2020-01-28 14:21:26 +00:00
Travis Ralston e3e7a47aea Update babel targets 2020-01-28 12:48:27 +00:00
J. Ryan Stinnett c30f901716
Merge pull request #12076 from vector-im/jryans/fetch-deps-lint 
Install deps for linting
 2020-01-27 16:13:10 +00:00
J. Ryan Stinnett 0ad0cbeb35 Install deps for linting 2020-01-27 16:05:41 +00:00
J. Ryan Stinnett 8ca6c2c433 Flip SDKs back to develop 2020-01-27 16:01:12 +00:00
RiotRobot 9782599c69 Merge branch 'master' into develop 2020-01-27 12:02:44 +00:00
RiotRobot 768cabe4bb v1.5.8 2020-01-27 11:57:49 +00:00
RiotRobot 5d01384af2 Prepare changelog for v1.5.8 2020-01-27 11:57:49 +00:00
RiotRobot 15a77e8826 v1.5.8 2020-01-27 11:52:56 +00:00
RiotRobot dd26d43173 js-sdk 4.0.0 & react-sdk 2.0.0 2020-01-27 11:52:18 +00:00
David Baker 59d3bd2746
Merge pull request #12062 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2020-01-27 10:07:37 +00:00
Weblate 1bbb104600 Merge branch 'origin/develop' into Weblate. 2020-01-24 22:47:37 +00:00
J. Ryan Stinnett 9c258f9da9
Merge pull request #12049 from vector-im/jryans/webpack-minimal 
Change to minimal Webpack output
 2020-01-24 22:47:32 +00:00
J. Ryan Stinnett 4c4f885f25 Change to minimal Webpack output 
This changes Webpack to only output errors, warnings, or new compilations.
This has the effect of hiding the massive list of modules. The giant list was
actually _hiding_ warnings because they appear first and scroll off the
terminal.
 2020-01-24 22:34:15 +00:00
Weblate fb32d41b3e Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:42 +00:00
Travis Ralston 2445f19431
Merge pull request #12015 from vector-im/travis/user-lists-labs 
Remove docs for new invite dialog labs feature
 2020-01-24 08:57:36 -07:00
Damir Jelić 7aff020d4d Merge branch 'poljar/seshat-ui' into develop 2020-01-24 14:40:54 +01:00
Weblate 192f2b8892 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:40:37 +00:00
Weblate 3d804665da Merge branch 'origin/develop' into Weblate. 2020-01-24 13:39:07 +00:00
Damir Jelić c0558f3527 Merge branch 'poljar/seshat-filepanel' into develop 2020-01-24 14:38:20 +01:00
Balázs Meskó d6a5d701fe Translated using Weblate (Hungarian) 
Currently translated at 100.0% (23 of 23 strings)

Translation: Riot Web/riot-web
Translate-URL: https://translate.riot.im/projects/riot-web/riot-web/hu/
 2020-01-24 10:23:08 +00:00
Travis Ralston a34507f6e1 Remove DMs flag from the config too 2020-01-23 17:15:53 -07:00
Travis Ralston 8b08ba05c2 Remove docs for new invite dialog labs feature 
It's the default now: https://github.com/matrix-org/matrix-react-sdk/pull/3906
 2020-01-22 21:16:18 -07:00
Travis Ralston 9ee7febd9b
Merge pull request #12008 from vector-im/travis/more-legal 
Fix the remainder of the cookie links
 2020-01-22 20:29:41 -07:00
Travis Ralston 47d88d6b79 Fix the remainder of the cookie links 
Fixes https://github.com/vector-im/riot-web/issues/10362

Per https://github.com/vector-im/riot-web/pull/11998#issuecomment-577329852
 2020-01-22 11:55:09 -07:00
J. Ryan Stinnett d7e47841e5
Merge pull request #12001 from vector-im/jryans/bash-docker 
Use bash in Docker scripts
 2020-01-22 17:48:57 +00:00
J. Ryan Stinnett b6963d0e5c Use bash in Docker scripts 
Our Docker scripts use Bash-style conditionals that aren't supported by the
default Debian shell.
 2020-01-22 17:45:22 +00:00
Travis Ralston 1b8ea4b6d7
Merge pull request #11999 from vector-im/travis/develop-docker 
Use debian to build the Docker image
 2020-01-22 10:04:01 -07:00
Travis Ralston 51a97571a0 Use debian to build the Docker image 
Fixes not having certain OS capabilities to build some packages.
 2020-01-22 09:08:05 -07:00
Michael Telatynski 1d53fc41ea
Merge pull request #11998 from vector-im/t3chguy/update_config 
Update cookie policy urls on /app and /develop config.json
 2020-01-22 15:58:13 +00:00
Michael Telatynski 0798945109 Update cookie policy urls on /app and /develop config.json 2020-01-22 15:49:00 +00:00
Michael Telatynski 8d769dafca
Merge pull request #11996 from vector-im/t3chguy/buildkite 
BuildKite: Only deploy to /develop if everything else passed
 2020-01-22 15:25:15 +00:00
Michael Telatynski 5d95a3ef7e Only deploy to /develop if everything else passed 2020-01-22 15:04:31 +00:00
J. Ryan Stinnett 0f24950466
Merge pull request #11995 from vector-im/jryans/extra-report-content 
Add docs for admin report content message
 2020-01-22 14:25:52 +00:00
RiotRobot 902252ad93 v1.5.8-rc.2 2020-01-22 14:24:50 +00:00
RiotRobot 43c35a760b Prepare changelog for v1.5.8-rc.2 2020-01-22 14:24:49 +00:00
RiotRobot cd3fafb2b0 v1.5.8-rc.2 2020-01-22 14:22:40 +00:00
David Baker eb5e14661d Actually pull in react-sdk rc.2 2020-01-22 14:20:46 +00:00
J. Ryan Stinnett fe15d3b7c1 Add docs for admin report content message 
Part of https://github.com/vector-im/riot-web/issues/11992
 2020-01-22 14:18:29 +00:00
RiotRobot ebd3f0e4e1 v1.5.8-rc.1 2020-01-22 13:22:19 +00:00
RiotRobot 5673d51cec Prepare changelog for v1.5.8-rc.1 2020-01-22 13:22:18 +00:00
RiotRobot 323762ffa7 v1.5.8-rc.1 2020-01-22 13:16:19 +00:00
David Baker 8913eba60d react-sdk rc.2 2020-01-22 13:06:37 +00:00
David Baker a90e56a22b
Merge pull request #11994 from vector-im/dbkr/steal-daves-webpack_rel 
Fix webpack config (by stealing Dave's config)
 2020-01-22 13:04:38 +00:00
David Baker d4e46108c4 path.resolve does joining too so path.join is redundant 2020-01-22 13:02:46 +00:00
Travis Ralston 8c103b50af Fix webpack config (by stealing Dave's config) 
Without doing something like this it's hard to use `yarn link`ed resources.
 2020-01-22 13:02:41 +00:00
David Baker c197c2f4fd Third try at fixing build 2020-01-22 13:02:35 +00:00