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

7223 Commits

Author SHA1 Message Date
Travis Ralston f6d4c6a5a3 Lint doesn't need develop deps 2019-03-13 18:40:48 -06:00
Travis Ralston 0b4c52c032 Remove Travis (CI) 
We're using BuildKite now
 2019-03-13 18:40:48 -06:00
Travis Ralston b6cdaa8597 Add a basic BuildKite :pipeline: 2019-03-13 18:40:47 -06:00
Travis Ralston 1d51507134
Merge pull request #9159 from vector-im/travis/node-8-isnt-real 
Remove node 8.x from the build matrix
 2019-03-13 14:48:33 -06:00
Travis Ralston 789a0da176 Remove irrelevant warning 2019-03-13 14:39:10 -06:00
Travis Ralston df164d7489 Remove node 8.x from the build matrix 
We don't support Node 8 anymore. Also the build is broken.
 2019-03-13 14:10:12 -06:00
Travis Ralston 6ac69c109c
Merge pull request #9157 from aaronraimist/electron-help 
Update Electron help menu link
 2019-03-13 13:52:31 -06:00
Aaron Raimist b40ed7cb11
Update Electron help menu link 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2019-03-13 14:43:24 -05:00
Ben Parsons ee85c04796 "Render simple counters in room header" details 2019-03-13 17:54:46 +00:00
J. Ryan Stinnett 660a160c8e Ignore package-lock.json in case of confused npm users 2019-03-13 15:49:07 +00:00
J. Ryan Stinnett ef090846e2 Deduplicate log ignore 2019-03-13 15:46:01 +00:00
J. Ryan Stinnett 75a7e7ce82 Update webpack-dev-server 2019-03-13 15:07:50 +00:00
David Baker bf721d031a v1.0.4-rc.1 2019-03-13 15:00:17 +00:00
David Baker 98ed6a6a29 Prepare changelog for v1.0.4-rc.1 2019-03-13 15:00:17 +00:00
David Baker 958e8662d9 v1.0.4-rc.1 2019-03-13 14:58:28 +00:00
David Baker 9280d1ff49 yarn neds --new-version to make a new version 2019-03-13 14:57:52 +00:00
David Baker a3585c1feb react-sdk & js-sdk rc.1 2019-03-13 14:56:24 +00:00
J. Ryan Stinnett aae5ca0763 Ignore *.log files, such as from npm or Yarn 2019-03-13 14:44:01 +00:00
David Baker d6942353f1 Electron 4.0.8 2019-03-13 14:15:47 +00:00
David Baker 2d8dae4723
Merge pull request #9152 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-03-13 14:05:30 +00:00
Weblate ff944092ac Merge branch 'origin/develop' into Weblate. 2019-03-13 14:04:18 +00:00
Paulo Miranda fa44eccf6b Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/pt_BR/
 2019-03-13 14:04:16 +00:00
Sheogorath 1f9e518535 Translated using Weblate (German) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/de/
 2019-03-13 14:04:16 +00:00
David Baker 645f4e9a80
Merge pull request #9151 from jryans/yarn-ci 
Use modern Yarn version on Travis CI
 2019-03-13 13:23:36 +00:00
J. Ryan Stinnett a05e5d1e86 Use modern Yarn version on Travis CI 
Travis CI uses a quite old version of Yarn by default. This adds Yarn's
recommended incantation for using the latest stable version.
 2019-03-13 12:32:46 +00:00
J. Ryan Stinnett fcaf0a5503 Recommend using the latest Node LTS version 2019-03-13 10:54:36 +00:00
J. Ryan Stinnett 1abaf50633
Merge pull request #9132 from jryans/yarn 
Switch to `yarn` for dependency management
 2019-03-13 09:37:53 +00:00
Tom Lant 00cd9b2ecc
Update issue templates 2019-03-12 17:01:17 +01:00
J. Ryan Stinnett 1312ba537a Update scripts and docs to use `yarn` where appropriate 
Most `npm` operations are replaced with `yarn`, which generally has better
behavior. However, steps like publish that write to the NPM registry are left to
`npm`, which currently handles these tasks best.
 2019-03-12 11:06:57 +00:00
J. Ryan Stinnett 13aca0716a Add yarn lock file for Electron app 
We did not previously commit lock files for the Electron app, so there is no
correct copy to import from. For this directory, I created a fresh yarn lock
file using yarn install.
 2019-03-11 15:33:00 +00:00
J. Ryan Stinnett a5b8d6381f Convert from npm to yarn lock file 
The npm lock file was imported into yarn. A yarn install pass was then run to
double-check the lock file for sanity.
 2019-03-11 14:35:03 +00:00
David Baker acacc61f1c
Merge pull request #9104 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-03-11 10:02:11 +00:00
Weblate 837abe3bb8 Merge branch 'origin/develop' into Weblate. 2019-03-11 10:00:55 +00:00
roket1428 eb40efefd1 Translated using Weblate (Turkish) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/tr/
 2019-03-11 10:00:49 +00:00
pogback e7625d48f6 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (19 of 19 strings)

Translation: Riot Web/riot-web
Translate-URL: http://translate.riot.im/projects/riot-web/riot-web/zh_Hans/
 2019-03-11 10:00:49 +00:00
Andrew Morgan dc96f1c70e Remove duped code 2019-03-08 11:03:39 +00:00
Andrew Morgan d4984e3d68 Remove duplicate import 2019-03-08 11:01:07 +00:00
Andrew Morgan c3d3034965 lint 2019-03-08 10:59:15 +00:00
Andrew Morgan 600b8690d7 Remove more merge markers 2019-03-08 10:26:51 +00:00
Andrew Morgan 8b60fe9fff Remove merge markers 2019-03-08 09:52:55 +00:00
Andrew Morgan 94b6396e0c Prevent erroneously setting state outside of settings window 2019-03-07 16:26:53 +00:00
Andrew Morgan 012ad9ef56 Merge branch 'anoa/jitsi_ptt' of github.com:anoadragon453/riot-web into anoa/jitsi_ptt 2019-03-07 16:26:36 +00:00
David Baker b3aeb53763
Merge pull request #9075 from vector-im/dbkr/no_32_bit_linux 
Don't copy the 32 bit linux deb
 2019-03-07 11:54:55 +00:00
David Baker 12a56e37ba Don't copy the 32 bit linux deb 
As per comment
 2019-03-07 11:12:43 +00:00
David Baker 1b6da01734
Merge pull request #9068 from vector-im/dbkr/olm_isnt_optional 
Change olm dependency to normal dep
 2019-03-06 17:26:04 +00:00
David Baker 34d875ca57 remove empty section 2019-03-06 16:51:58 +00:00
David Baker 7b684aee0c Also makes this unnecessary 2019-03-06 16:48:58 +00:00
David Baker 4078443265 Change olm dependency to normal dep 
It would be nice if it were actually an optional dependency and you
could just not install olm and get a Riot without olm, but you can't:
what you get is a broken Riot, so having it as an optional dep isn't
helping anyone.

Also whatever other package-lock changes npm has decided are
necessary today.
 2019-03-06 16:44:36 +00:00
David Baker acb8afaeb7 Merge branch 'master' into develop 2019-03-06 16:07:05 +00:00
David Baker fbce9c0ecf Merge branch 'release-v1.0.3' 2019-03-06 16:06:45 +00:00