OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
7,994 Commits
202 Branches
553 Tags
504 MiB
Commit Graph

7994 Commits (6eeeaff399a456354a1b3d4542282b4f80acc7e3)

Author SHA1 Message Date
Weblate 6eeeaff399 Merge branch 'origin/develop' into Weblate. 2019-11-08 22:05:21 +00:00
Travis Ralston c14bbea0a1
Merge pull request #11356 from vector-im/travis/verif-dm-docs 
Add DM verification feature to labs.md
 2019-11-08 15:05:17 -07:00
Weblate 43171c05d3 Merge branch 'origin/develop' into Weblate. 2019-11-08 21:56:17 +00:00
Travis Ralston 8c899ab13f
Merge pull request #11355 from vector-im/travis/labs-dm-verif 
Add feature_dm_verification to labs
 2019-11-08 14:56:10 -07:00
Travis Ralston 4eb0f014b8
Add DM verification feature to labs.md 2019-11-08 14:54:24 -07:00
Travis Ralston 8f13e8b2bb
Add feature_dm_verification to labs 2019-11-08 14:51:07 -07:00
Weblate 4903089e41 Merge branch 'origin/develop' into Weblate. 2019-11-08 15:58:39 +00:00
J. Ryan Stinnett 2db876d12c
Merge pull request #11341 from vector-im/jryans/feature-flag-process 
Document feature flag process
 2019-11-08 17:58:33 +02:00
J. Ryan Stinnett d373e2891e Describe regular setting path 2019-11-08 15:57:46 +00:00
J. Ryan Stinnett 8b0257d24b Apply suggestions from code review 
Co-Authored-By: Travis Ralston <travpc@gmail.com>
 2019-11-08 15:57:09 +00:00
J. Ryan Stinnett fa3d3aa4dd Absolute URLs 2019-11-08 15:55:01 +00:00
J. Ryan Stinnett 9ca438087e Add numbers 2019-11-08 15:55:01 +00:00
J. Ryan Stinnett 037d8c071c Document feature flag process 
This records the feature flag process we intend to use with Riot and also how
that interacts with other teams and configuration.

Fixes https://github.com/vector-im/riot-web/issues/11116
 2019-11-08 15:55:01 +00:00
Weblate 89bb2dba38 Merge branch 'origin/develop' into Weblate. 2019-11-08 11:23:24 +00:00
shuji narazaki f61aae7e3f Translated using Weblate (Japanese) 
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/ja/
 2019-11-08 11:23:24 +00:00
J. Ryan Stinnett ceacf3bf54
Merge pull request #11343 from vector-im/jryans/clean-flags 
Remove unused feature flags
 2019-11-08 13:23:17 +02:00
J. Ryan Stinnett 5e4e382dec Remove unused feature flags 2019-11-07 15:01:39 +00:00
Weblate 36f9d37487 Merge branch 'origin/develop' into Weblate. 2019-11-06 14:33:27 +00:00
RiotRobot 5bc15cf83c v1.5.3 2019-11-06 14:28:59 +00:00
RiotRobot ab180bc98d Prepare changelog for v1.5.3 2019-11-06 14:28:58 +00:00
RiotRobot a13fbab4e4 v1.5.3 2019-11-06 14:27:50 +00:00
David Baker f522305593 Bump to electron 6.1.4 2019-11-06 14:26:45 +00:00
RiotRobot 15c0561588 released react-sdk 2019-11-06 14:24:59 +00:00
dreamerchris 146ccc37a2 Translated using Weblate (Greek) 
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/el/
 2019-11-06 13:44:29 +00:00
David Baker c22199f92f
Merge pull request #11326 from vector-im/dbkr/no_menubar_on_mac 
Remove the 'auto hide menu bar' option on Mac
 2019-11-05 20:39:27 +00:00
David Baker 7af68bddea Remove the 'auto hide menu bar' option on Mac 
The menu bar is at the top of the screen on Mac so this setting
does absolutely nothing.
 2019-11-05 20:31:08 +00:00
Michael Telatynski 7ca40bed32
Merge pull request #11304 from vector-im/t3chguy/riot.im/develop/feature_user_info_panel 
Expose feature_user_info_panel on riot.im/develop
 2019-11-05 13:04:33 +00:00
Michael Telatynski e8913b843d Merge branches 'develop' and 't3chguy/riot.im/develop/feature_user_info_panel' of https://github.com/vector-im/riot-web into t3chguy/riot.im/develop/feature_user_info_panel 2019-11-05 11:58:47 +00:00
David Baker 1088a78720
Merge pull request #11312 from vector-im/dbkr/upgrade_electron_notarize 
Upgrade electron-notarize
 2019-11-05 10:16:54 +00:00
David Baker e006e92255 Upgrade electron-notarize 
To include https://github.com/electron/electron-notarize/pull/14
 2019-11-04 18:56:41 +00:00
RiotRobot 12bdb5ffe5 Merge branch 'master' into develop 2019-11-04 18:34:20 +00:00
RiotRobot a92e676e28 Merge branch 'release-v1.5.2' 2019-11-04 18:34:12 +00:00
RiotRobot 17027cb515 v1.5.2 2019-11-04 18:30:37 +00:00
RiotRobot 3cd7e1c18c Prepare changelog for v1.5.2 2019-11-04 18:30:36 +00:00
RiotRobot 6f85fc9e8c v1.5.2 2019-11-04 18:27:35 +00:00
David Baker 0401e86216
Merge pull request #11311 from vector-im/dbkr/hotfix_macos_151_2 
Fix close window behaviour on Macos
 2019-11-04 18:25:36 +00:00
Michael Telatynski fbd5ffc198 Fix close window behaviour on Macos 2019-11-04 18:23:47 +00:00
David Baker d1d626fb6f
Merge pull request #11309 from vector-im/t3chguy/hotfix_macos_1.5.1 
Fix close window behaviour on Macos
 2019-11-04 18:22:16 +00:00
Michael Telatynski 03887f9d1b Fix close window behaviour on Macos 2019-11-04 18:02:33 +00:00
Travis Ralston ad55924af5
Merge pull request #11307 from vector-im/master 
Merge: Add dependency to eslint-plugin-react-hooks as react-sdk did
 2019-11-04 10:58:27 -07:00
Michael Telatynski 7391846eda
Merge pull request #11306 from vector-im/t3chguy/add_eslint-plugin-react-hooks 
Add dependency to eslint-plugin-react-hooks as react-sdk did
 2019-11-04 16:58:26 +00:00
Michael Telatynski f3656c2792 Add dependency to eslint-plugin-react-hooks as react-sdk did 2019-11-04 16:52:23 +00:00
Michael Telatynski b56a97ab3d
Expose feature_user_info_panel on riot.im/develop 2019-11-04 16:26:57 +00:00
RiotRobot 3735dc9fa3 Merge branch 'master' into develop 2019-11-04 15:51:46 +00:00
David Baker 7a7ea8c7f6 I meant 6.1.2. There is no 6.1.12 2019-11-04 15:33:25 +00:00
RiotRobot 9b7e03d557 Merge branch 'master' into develop 2019-11-04 15:20:47 +00:00
RiotRobot fb64a0a46c v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot dd4f5131c7 Prepare changelog for v1.5.1 2019-11-04 15:17:30 +00:00
RiotRobot f48ca740fc v1.5.1 2019-11-04 15:15:52 +00:00
RiotRobot 6d553d1ecd Released react-sdk & js-sdk 2019-11-04 15:14:59 +00:00