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

7589 Commits

Author SHA1 Message Date
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
Andrew Morgan f4a7f0dedd Fix some merge conflicts and up to electron 4.2.6 2019-07-12 17:39:31 +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
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
Travis Ralston f3e82b56e9 Remove unused disable_identity_server config flag 
Fixes https://github.com/vector-im/riot-web/issues/10229
 2019-07-11 15:11:59 -06:00
Travis Ralston 604e4bbfee Improve wording in debug log sending in issue templates 2019-07-11 12:59:29 -06:00
Travis Ralston 79b519be72 Require a rageshake description in mxSendRageshake 2019-07-11 12:58:35 -06:00
Travis Ralston c22e03a222 Fetch deps 2019-07-11 12:48:22 -06:00
Travis Ralston 6b07186078 Verify i18n in CI 2019-07-11 12:45:06 -06:00
Weblate b18acd5978 Merge branch 'origin/develop' into Weblate. 2019-07-11 12:17:04 +00:00
J. Ryan Stinnett bba167c433
Merge pull request #10308 from vector-im/jryans/upgrade-deps-2 
Upgrade dependencies
 2019-07-11 13:16:59 +01:00
J. Ryan Stinnett 1199554be7 Upgrade dependencies 2019-07-11 11:49:12 +01:00
Weblate 9cc6d1439e Merge branch 'origin/develop' into Weblate. 2019-07-11 10:32:06 +00:00
RiotRobot d3a3115298 Merge branch 'master' into develop 2019-07-11 11:31:48 +01:00
RiotRobot da5ddb2518 v1.2.4 2019-07-11 11:29:11 +01:00
RiotRobot 9b7dcf5d88 Prepare changelog for v1.2.4 2019-07-11 11:29:11 +01:00
RiotRobot e5ffb8de4c v1.2.4 2019-07-11 11:24:52 +01:00
J. Ryan Stinnett ff1a5e0539 Upgrade lodash 2019-07-11 11:13:37 +01:00
J. Ryan Stinnett 6ccf88f808 Upgrade to JS SDK 2.1.1 and React SDK 1.3.1 2019-07-11 11:09:56 +01:00
Weblate 2c863aa3ec Merge branch 'origin/develop' into Weblate. 2019-07-08 10:14:50 +00:00
RiotRobot 5f1d6f333c Merge branch 'master' into develop 2019-07-08 11:14:40 +01:00
RiotRobot 6546108307 v1.2.3 2019-07-08 11:12:04 +01:00
RiotRobot 4a33c0af6e Prepare changelog for v1.2.3 2019-07-08 11:12:03 +01:00
RiotRobot a53d7edc7f v1.2.3 2019-07-08 11:10:31 +01:00
RiotRobot 090b2dbd30 Upgrade to JS SDK 2.1.0 and React SDK 1.3.0 2019-07-08 10:58:13 +01:00
Weblate 68d501fabf Merge branch 'origin/develop' into Weblate. 2019-07-05 16:50:22 +00:00
J. Ryan Stinnett cb92e1d4c9
Merge pull request #10260 from vector-im/jryans/upgrade-deps 
Upgrade dependencies
 2019-07-05 17:50:19 +01:00
J. Ryan Stinnett 7424c776e5 Upgrade dependencies 2019-07-04 15:14:44 +01:00
RiotRobot 6e502478e3 v1.2.3-rc.1 2019-07-03 17:48:55 +01:00
RiotRobot 72052b913f Prepare changelog for v1.2.3-rc.1 2019-07-03 17:48:55 +01:00
RiotRobot 1ce8f3844b v1.2.3-rc.1 2019-07-03 17:47:41 +01:00
RiotRobot 751316f388 Upgrade to JS SDK 2.1.0-rc.1 and React SDK 1.3.0-rc.1 2019-07-03 17:25:05 +01:00
Weblate 1533d50157 Merge branch 'origin/develop' into Weblate. 2019-07-03 15:28:26 +00:00
J. Ryan Stinnett e1282081bf
Merge pull request #10247 from vector-im/jryans/update-base-url 
Change update URL to match new host
 2019-07-03 16:28:21 +01:00
Weblate 9f4dc1936b Merge branch 'origin/develop' into Weblate. 2019-07-03 15:06:43 +00:00
J. Ryan Stinnett ba5cae554c Upgrade electron-builder, electron-builder-squirrel-windows to latest 2019-07-03 16:06:12 +01:00
Weblate bdbc65209c Merge branch 'origin/develop' into Weblate. 2019-07-03 14:53:35 +00:00