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

7622 Commits

Author SHA1 Message Date
Andrew Morgan 90c2348e5f Add deps to iohook docs 2019-07-19 10:20:29 +01:00
Andrew Morgan 62cfd3ba12 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (22 commits)
  v1.3.0
  Prepare changelog for v1.3.0
  v1.3.0
  Upgrade to JS SDK 2.2.0 and React SDK 1.4.0
  Remove reactions feature flag from docs and config
  Remove edits feature flag from docs and config
  Remove reactions feature flag from docs and config
  Remove edits feature flag from docs and config
  cachebust config file requests
  v1.3.0-rc.3
  Prepare changelog for v1.3.0-rc.3
  v1.3.0-rc.3
  react-sdk rc.3
  v1.3.0-rc.2
  Prepare changelog for v1.3.0-rc.2
  v1.3.0-rc.2
  Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2
  Convert install-app-deps to subcommand
  v1.3.0-rc.1
  Prepare changelog for v1.3.0-rc.1
  ...
 2019-07-19 10:10:18 +01:00
RiotRobot e71fcc33f9 Merge branch 'master' into develop 2019-07-18 15:58:43 +01:00
RiotRobot 7d07642bef v1.3.0 2019-07-18 15:56:14 +01:00
RiotRobot 096303955e Prepare changelog for v1.3.0 2019-07-18 15:56:14 +01:00
RiotRobot 1bd846454c v1.3.0 2019-07-18 15:53:39 +01:00
RiotRobot 72f3f1afee Upgrade to JS SDK 2.2.0 and React SDK 1.4.0 2019-07-18 15:53:25 +01:00
J. Ryan Stinnett 48759fd66d
Merge pull request #10365 from vector-im/jryans/v1.3.0/rm-reactions-edits-flags 
Remove edits and reactions feature flags from docs and config
 2019-07-18 14:26:34 +01:00
J. Ryan Stinnett 06ce10b351 Remove reactions feature flag from docs and config 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 14:24:00 +01:00
J. Ryan Stinnett b403828791 Remove edits feature flag from docs and config 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 14:23:24 +01:00
J. Ryan Stinnett f4ee5d0a4b
Merge pull request #10363 from vector-im/jryans/rm-reactions-edits-flags 
Remove edits and reactions feature flags from docs and config
 2019-07-18 14:16:32 +01:00
J. Ryan Stinnett 8398ec5358 Remove reactions feature flag from docs and config 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:48:43 +01:00
J. Ryan Stinnett 7731f93676 Remove edits feature flag from docs and config 
Part of https://github.com/vector-im/riot-web/issues/10282
 2019-07-18 10:46:19 +01:00
Bruno Windels 8a022a4be0
Merge pull request #10349 from vector-im/bwindels/cachebust-config 
Cachebust config file requests
 2019-07-16 11:06:57 +00:00
Bruno Windels 2cf1aabcba cachebust config file requests 2019-07-16 12:49:10 +02:00
RiotRobot 343279ee5d v1.3.0-rc.3 2019-07-15 17:34:38 +01:00
RiotRobot 8b215bf6d4 Prepare changelog for v1.3.0-rc.3 2019-07-15 17:34:37 +01:00
RiotRobot f20d38f131 v1.3.0-rc.3 2019-07-15 17:32:06 +01:00
RiotRobot fab0d70f21 react-sdk rc.3 2019-07-15 17:31:13 +01:00
Andrew Morgan ccb0ce0e9d Fix options and usage text 2019-07-15 16:04:26 +01:00
Andrew Morgan 2e5ab3f9d8 Run yarn clean 2019-07-15 15:55:12 +01:00
Andrew Morgan 4a75b532d8 Allow script to output to curr. dir 2019-07-15 15:54:10 +01:00
Andrew Morgan da69384772 Update build script 2019-07-15 15:44:00 +01:00
Andrew Morgan 98cd405f2c Set MACHINE_TYPE 2019-07-15 15:15:41 +01:00
Andrew Morgan 51c355824c fix issues 2019-07-15 15:14:06 +01:00
Andrew Morgan 4ec456df37 fix case statement 2019-07-15 15:09:12 +01:00
Andrew Morgan dc1ff1c085 Make build script executable 2019-07-15 15:08:39 +01:00
Andrew Morgan 28440af84e Add native module build script 2019-07-15 15:06:26 +01:00
Andrew Morgan 796016afd3 Fix merge 2019-07-15 14:50:52 +01:00
Travis Ralston 8edb74168b
Merge pull request #10334 from vector-im/anoa/install_app_deps 
Convert install-app-deps to subcommand
 2019-07-12 14:33:15 -06:00
RiotRobot 6259fba6ad v1.3.0-rc.2 2019-07-12 17:40:07 +01:00
RiotRobot 4f7061aaa8 Prepare changelog for v1.3.0-rc.2 2019-07-12 17:40:07 +01:00
Andrew Morgan f4a7f0dedd Fix some merge conflicts and up to electron 4.2.6 2019-07-12 17:39:31 +01:00
RiotRobot 88c8ea0d5a v1.3.0-rc.2 2019-07-12 17:38:06 +01:00
RiotRobot be601d4654 Upgrade to JS SDK 2.2.0-rc.2 and React SDK 1.4.0-rc.2 2019-07-12 17:37:01 +01:00
Andrew Morgan fde90afe58 Convert install-app-deps to subcommand 2019-07-12 17:02:12 +01:00
Andrew Morgan b7781ab503 Merge branch 'develop' into anoa/jitsi_ptt 
* develop: (249 commits)
  Clarify deployment scripts
  Add riot.im configuration files
  Enable reactions and edits for desktop
  Remove unused disable_identity_server config flag
  Improve wording in debug log sending in issue templates
  Require a rageshake description in mxSendRageshake
  Fetch deps
  Verify i18n in CI
  Upgrade dependencies
  v1.2.4
  Prepare changelog for v1.2.4
  v1.2.4
  Upgrade lodash
  Upgrade to JS SDK 2.1.1 and React SDK 1.3.1
  v1.2.3
  Prepare changelog for v1.2.3
  v1.2.3
  Upgrade to JS SDK 2.1.0 and React SDK 1.3.0
  Upgrade dependencies
  v1.2.3-rc.1
  ...
 2019-07-12 16:57:01 +01:00
J. Ryan Stinnett 7dcb9c830f
Merge pull request #10327 from vector-im/jryans/deployment-configs 
Add riot.im configuration files
 2019-07-12 16:49:00 +01:00
J. Ryan Stinnett 7ccddfb755 Clarify deployment scripts 2019-07-12 16:46:38 +01:00
Travis Ralston a1432ef0f7
Merge pull request #10321 from vector-im/travis/rageshake-required 
Require descriptions in mxSendRageshake and remove infinite loop in issue templates
 2019-07-12 08:12:03 -06:00
Travis Ralston 5379a26a1a
Merge pull request #10322 from vector-im/travis/remove-is-flag 
Remove unused disable_identity_server config flag
 2019-07-12 08:11:52 -06:00
Travis Ralston 6762727826
Merge pull request #10320 from vector-im/travis/ci-i18n 
Verify i18n in CI
 2019-07-12 08:11:03 -06:00
RiotRobot a28144bbc0 v1.3.0-rc.1 2019-07-12 11:43:41 +01:00
RiotRobot 56b0c333c0 Prepare changelog for v1.3.0-rc.1 2019-07-12 11:43:40 +01:00
RiotRobot a23386bdb4 v1.3.0-rc.1 2019-07-12 11:39:59 +01:00
RiotRobot f771f607d6 Upgrade to React SDK 1.4.0-rc.1 and JS SDK 2.2.0-rc.1 2019-07-12 11:39:07 +01:00
J. Ryan Stinnett c7b24f7ce9
Merge pull request #10328 from RiotTranslateBot/weblate-riot-web-riot-web 
Update from Weblate
 2019-07-12 10:53:48 +01:00
J. Ryan Stinnett f1a680322b Add riot.im configuration files 2019-07-12 10:48:34 +01:00
Weblate ad4f05a0cd Merge branch 'origin/develop' into Weblate. 2019-07-12 09:24:37 +00:00
J. Ryan Stinnett d47d0e4097 Enable reactions and edits for desktop 2019-07-12 10:23:14 +01:00