  David BakerandGitHub
|
3b908f4a33
|
Merge pull request #10551 from vector-im/t3chguy/i18n_config_default
Load config.json before loading language so default can apply
|
2019-08-14 15:51:54 +01:00 |
|
|
David BakerandGitHub
|
5fe8443ff4
|
Merge pull request #10436 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-07-29 09:33:58 +01:00 |
|
|
David BakerandGitHub
|
9de26ed062
|
Merge pull request #10219 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-07-01 10:40:32 +01:00 |
|
|
David BakerandGitHub
|
fceb05e646
|
Merge pull request #10124 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-06-20 11:00:34 +01:00 |
|
|
David BakerandGitHub
|
8458aa7978
|
Merge pull request #10012 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-06-11 14:06:29 +01:00 |
|
|
David BakerandGitHub
|
260f819e38
|
Merge pull request #9802 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-05-22 12:45:41 +01:00 |
|
|
David BakerandGitHub
|
9cd4ac1df4
|
Merge pull request #9628 from vector-im/dbkr/thanks_you_junit_but_its_not_2005_anymore
Remove karma junit output
|
2019-05-03 12:43:04 +01:00 |
|
|
David BakerandGitHub
|
0c36849c0f
|
Merge pull request #9626 from vector-im/dbkr/yarn_upgrade_may19
yarn upgrade
|
2019-05-03 12:36:26 +01:00 |
|
|
David BakerandGitHub
|
2fe6b5074d
|
Merge pull request #9617 from vector-im/dbkr/arghbuildkite
Respond quickly to buildkite pokes
|
2019-05-02 18:13:38 +01:00 |
|
|
David BakerandGitHub
|
f98870db1f
|
Merge pull request #9601 from vector-im/dbkr/add_scalar_staging_vector_im
Add new scalar staging url
|
2019-05-01 11:51:08 +01:00 |
|
|
David BakerandGitHub
|
00d33599f0
|
Merge pull request #9577 from vector-im/dbkr/convert_redeploy_server_to_buildkite
Convert redeploy.py to buildkite
|
2019-04-26 16:04:04 +01:00 |
|
|
David BakerandGitHub
|
ae62a46a97
|
Merge pull request #9568 from vector-im/dbkr/buildkite_cd
Add package step to buildkite pipeline
|
2019-04-26 14:43:43 +01:00 |
|
|
David BakerandGitHub
|
03b1914112
|
Merge pull request #9571 from vector-im/dbkr/package_dont_fail_if_no_local_config
Don't fail if there's no local config to remove
|
2019-04-26 14:36:28 +01:00 |
|
|
David BakerandGitHub
|
a67fd48720
|
Merge pull request #9567 from vector-im/dbkr/bye_bye_jenkins
Change jenkins script to package script
|
2019-04-26 13:19:33 +01:00 |
|
|
David BakerandGitHub
|
597b3e16e0
|
Merge pull request #9517 from vector-im/dbkr/fix_deploy_script_include_default
Fix default for --include arg
|
2019-04-17 18:46:56 +01:00 |
|
|
David BakerandGitHub
|
2c0504d596
|
Merge pull request #9500 from axelsimon/patch-1
update installation instructions with new repo
|
2019-04-17 09:34:35 +01:00 |
|
|
147f77f1dc
|
Update README.md
better wording
Co-Authored-By: axelsimon <github@axelsimon.net>
|
2019-04-16 17:55:49 +02:00 |
|
|
David BakerandGitHub
|
26955d2b79
|
Merge pull request #9398 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-04-08 09:40:59 +01:00 |
|
|
David BakerandGitHub
|
9cb452ad20
|
Merge pull request #9333 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-04-01 12:03:18 +01:00 |
|
|
David BakerandGitHub
|
5fcf884303
|
Merge pull request #9223 from vector-im/dbkr/buildkite_group_logs
Add log grouping to buildkite
|
2019-03-20 21:47:28 +00:00 |
|
|
David BakerandGitHub
|
e6addecd8f
|
Merge pull request #9199 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-03-18 10:18:54 +00:00 |
|
|
David BakerandGitHub
|
2d8dae4723
|
Merge pull request #9152 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-03-13 14:05:30 +00:00 |
|
|
David BakerandGitHub
|
645f4e9a80
|
Merge pull request #9151 from jryans/yarn-ci
Use modern Yarn version on Travis CI
|
2019-03-13 13:23:36 +00:00 |
|
|
David BakerandGitHub
|
acacc61f1c
|
Merge pull request #9104 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate
|
2019-03-11 10:02:11 +00:00 |
|
|
David BakerandGitHub
|
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 BakerandGitHub
|
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 BakerandGitHub
|
164de5faa5
|
Merge pull request #9051 from vector-im/dbkr/hosting_link_2
Add modular.im hosting link to electron app config
|
2019-03-05 18:28:03 +00:00 |
|
|
David BakerandGitHub
|
3a77b8ee64
|
Merge pull request #9047 from vector-im/dbkr/hosting_link
Add modular.im hosting link to electron app config
|
2019-03-05 18:21:55 +00:00 |
|
|
David BakerandGitHub
|
4a5a73597c
|
Merge pull request #9014 from vector-im/dbkr/langs_file_resolve_alias
Set a require alias for the webapp directory
|
2019-03-01 12:13:28 +00:00 |
|
|
David BakerandGitHub
|
4f58deac1f
|
Merge pull request #8973 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-02-28 14:12:15 +00:00 |
|
|
David BakerandGitHub
|
e37a8dc8a1
|
Merge pull request #8984 from vector-im/nadonomy/electron-spinner
Updated install spinner
|
2019-02-28 10:20:51 +00:00 |
|
|
David BakerandGitHub
|
ec2af993da
|
Merge pull request #8625 from vector-im/dbkr/remove_white_screen_of_welcome
Add home page to fix loading tests
|
2019-02-14 13:46:39 +00:00 |
|
|
David BakerandGitHub
|
f6dc8a946e
|
Merge pull request #8615 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-02-14 09:36:50 +00:00 |
|
|
David BakerandGitHub
|
4f1a18b620
|
Merge pull request #8566 from vector-im/dbkr/readme_fetch_develop_deps_order_again
Fix order of fetch-develop-deps / npm install
|
2019-02-13 13:42:28 +00:00 |
|
|
David BakerandGitHub
|
a64b1c4b51
|
Merge pull request #8546 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-02-13 09:47:57 +00:00 |
|
|
David BakerandGitHub
|
1ec9763566
|
Merge pull request #8518 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-02-11 10:28:04 +00:00 |
|
|
David BakerandGitHub
|
0f6e614223
|
Merge pull request #8514 from jryans/doc-embedded-pages
Document `embeddedPages` configuration
|
2019-02-11 10:07:27 +00:00 |
|
|
David BakerandGitHub
|
6161495058
|
Merge pull request #8475 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-02-08 18:01:22 +00:00 |
|
|
David BakerandGitHub
|
fdb7a781e0
|
Merge pull request #8466 from vector-im/jryans/add-welcome-page
Add configurable welcome page
|
2019-02-08 17:17:24 +00:00 |
|
|
David BakerandGitHub
|
1391706573
|
Merge pull request #8318 from vector-im/travis/fix-build
Disable room directory test because it doesn't work
|
2019-01-30 08:18:44 +00:00 |
|
|
David BakerandGitHub
|
99150b9b49
|
Merge pull request #8283 from vector-im/dbkr/bustin_makes_me_feel_good
Cache-bust olm.wasm
|
2019-01-28 14:32:19 +00:00 |
|
|
David BakerandGitHub
|
3c0e8757c9
|
Merge pull request #8248 from vector-im/dbkr/target_blank
Add target="_blank" to footer links
|
2019-01-24 17:20:53 +00:00 |
|
|
David BakerandGitHub
|
0022834af4
|
Merge pull request #8241 from vector-im/dbkr/fix_platform_name
Fix device names on desktop
|
2019-01-23 17:15:56 +00:00 |
|
|
David BakerandGitHub
|
9aa8b32df8
|
Merge pull request #8238 from vector-im/dbkr/lt_gt_desktop_notifs
Fix literal </> in notifications
|
2019-01-23 16:14:39 +00:00 |
|
|
David BakerandGitHub
|
4f32be9766
|
Merge pull request #8239 from vector-im/dbkr/desktop_app_email_link
Fix registration nextLink on desktop
|
2019-01-23 16:14:20 +00:00 |
|
|
David BakerandGitHub
|
697c7f9fe9
|
Merge pull request #8233 from vector-im/dbkr/fetch_develop_deps_return
Add returns to fetch-develop-deps
|
2019-01-23 14:29:53 +00:00 |
|
|
David BakerandGitHub
|
f7c2603d7c
|
Merge pull request #8231 from vector-im/dbkr/electron_builder_20_38_5
Update electron builder
|
2019-01-23 11:41:21 +00:00 |
|
|
David BakerandGitHub
|
91c037e578
|
Merge pull request #8225 from jryans/fetch-more-branches
Try fetching more branches for PRs
|
2019-01-23 11:12:01 +00:00 |
|
|
David BakerandGitHub
|
ea17711616
|
Merge pull request #8150 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2019-01-17 10:27:05 +00:00 |
|
|
David BakerandGitHub
|
373c587ef8
|
Merge pull request #8003 from vector-im/develop
Merge develop into experimental
|
2019-01-03 18:56:03 +00:00 |
|
|
David BakerandGitHub
|
9e085511fd
|
Merge pull request #7943 from vector-im/dbkr/electron_custom_protocol
Electron: Load app from custom protocol
|
2019-01-03 10:09:31 +00:00 |
|
|
David BakerandGitHub
|
baf3df5736
|
Merge pull request #7920 from vector-im/dbkr/fix_indexeddb_worker
Fix the IndexedDB worker
|
2018-12-20 07:49:29 +00:00 |
|
|
David BakerandGitHub
|
b35903bb19
|
Merge pull request #7907 from vector-im/dbkr/electron_sandbox
Run the Desktop app in a sandbox
|
2018-12-19 09:48:10 +00:00 |
|
|
David BakerandGitHub
|
5a549519a6
|
Merge pull request #7908 from vector-im/dbkr/electron_singleinstance_apiupdate
Update to new electron single instance API
|
2018-12-18 19:14:22 +00:00 |
|
|
David BakerandGitHub
|
69567f9806
|
Merge pull request #7784 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-12-05 16:00:19 +00:00 |
|
|
David BakerandGitHub
|
b5c27ca074
|
Merge pull request #7738 from vector-im/revert-7737-revert-7490-lint
Re-apply "Run lint on travis builds and use modern node versions"
|
2018-11-23 07:53:11 +00:00 |
|
|
David BakerandGitHub
|
1dfaf70562
|
Revert "Revert "Run lint on travis builds and use modern node versions""
|
2018-11-22 18:25:55 +00:00 |
|
|
David BakerandGitHub
|
c6f70cb72c
|
Merge pull request #7737 from vector-im/revert-7490-lint
Revert "Run lint on travis builds and use modern node versions"
|
2018-11-22 18:18:01 +00:00 |
|
|
David BakerandGitHub
|
f701e2601a
|
Revert "Run lint on travis builds and use modern node versions"
|
2018-11-22 18:17:09 +00:00 |
|
|
David BakerandGitHub
|
a7a5679bfa
|
Merge pull request #7490 from aaronraimist/lint
Run lint on travis builds and use modern node versions
|
2018-11-22 18:01:04 +00:00 |
|
|
David BakerandGitHub
|
03587abff1
|
Update .travis.yml
Remove node 6
|
2018-11-22 17:54:02 +00:00 |
|
|
David BakerandGitHub
|
4805858ecb
|
Merge pull request #7736 from vector-im/dbkr/fix_missing_logging
Fix missing js-sdk logging
|
2018-11-22 16:32:39 +00:00 |
|
|
David BakerandGitHub
|
bbb128b672
|
Merge branch 'develop' into lint
|
2018-11-22 11:23:02 +00:00 |
|
|
David BakerandGitHub
|
0aeef3187a
|
Merge pull request #7708 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-11-15 12:13:47 +00:00 |
|
|
David BakerandGitHub
|
b53c86c5f4
|
Merge pull request #7673 from aaronraimist/add-japanese
Add Japanese (#7599)
|
2018-11-09 10:53:43 +00:00 |
|
|
David BakerandGitHub
|
9b80aa76ce
|
Merge pull request #7385 from vector-im/dbkr/wasm
Support WebAssembly version of Olm
|
2018-10-25 15:58:24 +01:00 |
|
|
David BakerandGitHub
|
fd31d58128
|
Merge pull request #7549 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-10-24 10:26:13 +01:00 |
|
|
David BakerandGitHub
|
c1dfbd6993
|
Merge pull request #7518 from vector-im/dbkr/better_fix_for_windows_crashes
Don't set tags on notifications
|
2018-10-18 19:26:08 +01:00 |
|
|
David BakerandGitHub
|
40cb46de46
|
Merge pull request #7517 from vector-im/dbkr/stop_electron_crashing
Stop electron crashing
|
2018-10-18 18:35:38 +01:00 |
|
|
David BakerandGitHub
|
05884ba279
|
Merge pull request #7501 from vector-im/dbkr/update_electron_builder_relbranch
Update to latest electron builder
|
2018-10-16 09:40:30 +01:00 |
|
|
David BakerandGitHub
|
f483fd3916
|
Merge pull request #7498 from vector-im/dbkr/update_electron_builder
Update to latest electron builder
|
2018-10-16 09:37:27 +01:00 |
|
|
David BakerandGitHub
|
df1eb9f5cb
|
Merge pull request #7483 from vector-im/revert-7429-bwindels/alsocommitlockfile
Revert "also commit the lock file when bumping version as it is now committed to the repo"
|
2018-10-11 16:02:09 +01:00 |
|
|
David BakerandGitHub
|
aaa9c82758
|
Revert "also commit the lock file when bumping version as it is now committed to the repo"
|
2018-10-11 16:01:56 +01:00 |
|
|
David BakerandGitHub
|
69adab2c9f
|
Merge pull request #7478 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-10-11 11:08:59 +01:00 |
|
|
David BakerandGitHub
|
e28180f3d5
|
Merge pull request #7462 from vector-im/dbkr/gone_away_is_the_bluebird
Silence bluebird warnings
|
2018-10-05 13:25:26 +01:00 |
|
|
David BakerandGitHub
|
f69869ac1e
|
Merge pull request #7429 from vector-im/bwindels/alsocommitlockfile
also commit the lock file when bumping version as it is now committed to the repo
|
2018-10-02 12:13:04 +01:00 |
|
|
David BakerandGitHub
|
894ad32e83
|
Merge pull request #7393 from vector-im/dbkr/update_deps_2
Update a bunch of deps
|
2018-10-01 09:41:14 +01:00 |
|
|
David BakerandGitHub
|
ac81080185
|
Merge pull request #7408 from vector-im/dbkr/unnecessary_custom_server
Don't show custom server bit on matrix.org
|
2018-09-28 10:32:06 +01:00 |
|
|
David BakerandGitHub
|
73239f5535
|
Merge pull request #7296 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-09-07 14:07:30 +01:00 |
|
|
David BakerandGitHub
|
736450e184
|
Merge pull request #7288 from vector-im/bwindels/fixmobileguideloadedonriot
Fix config not loading & mobileguide script being loaded in riot
|
2018-09-05 15:48:04 +01:00 |
|
|
David BakerandGitHub
|
52bbd8c764
|
Merge pull request #7272 from vector-im/dbkr/mobileguide
Instructions for installing mobile apps
|
2018-09-05 11:31:00 +01:00 |
|
|
David BakerandGitHub
|
86b738dd79
|
Merge pull request #7245 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-08-30 11:43:37 +01:00 |
|
|
David BakerandGitHub
|
0ab6d81abb
|
Merge pull request #7178 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-08-16 14:40:41 +01:00 |
|
|
David BakerandGitHub
|
53b179b22b
|
Merge pull request #7128 from vector-im/revert-7115-dbkr/remove_package_lock
Revert "Remove package-lock.json for now"
|
2018-08-02 10:02:57 +01:00 |
|
|
David BakerandGitHub
|
dcde74bc09
|
Revert "Remove package-lock.json for now"
|
2018-08-02 10:02:09 +01:00 |
|
|
David BakerandGitHub
|
b361241c29
|
Merge pull request #7082 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-07-24 18:16:45 +01:00 |
|
|
David BakerandGitHub
|
0458aec320
|
Merge pull request #7055 from vector-im/dbkr/use_configured_integ_url
Sample config for jitsi integration URL
|
2018-07-20 15:01:34 +01:00 |
|
|
David BakerandGitHub
|
9030435ba4
|
Merge pull request #6915 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-06-20 14:04:38 +01:00 |
|
|
David BakerandGitHub
|
3847388ed0
|
Merge pull request #6805 from vector-im/t3chguy/electron_changes
[electron] Fix desktop app --hidden flag
|
2018-06-14 12:04:48 +01:00 |
|
|
David BakerandGitHub
|
50e35de609
|
Merge pull request #6846 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-06-06 15:51:26 +01:00 |
|
|
David BakerandGitHub
|
b97ae0246d
|
Merge pull request #6792 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-05-24 18:04:46 +01:00 |
|
|
David BakerandGitHub
|
2e7da36af0
|
Merge pull request #6765 from vector-im/dbkr/electron_hide_nonsensical_menu_options
Hide URL options for e2e blob: URL images
|
2018-05-18 12:18:09 +01:00 |
|
|
David BakerandGitHub
|
e5fd579935
|
Merge pull request #6763 from vector-im/dbkr/fix_electron_menus
Fix right click menu in electron
|
2018-05-18 11:55:41 +01:00 |
|
|
David BakerandGitHub
|
1e8bb5e852
|
Merge pull request #6764 from vector-im/dbkr/electron_201
Update to electron 2.0.1
|
2018-05-18 11:47:02 +01:00 |
|
|
David BakerandGitHub
|
6bfc90bbe1
|
Merge pull request #6528 from aidalgol/string-translation-change-doc
Add instructions for changing translated strings
|
2018-05-16 16:51:56 +01:00 |
|
|
David BakerandGitHub
|
8f4953c182
|
Merge branch 'develop' into webpack4
|
2018-05-11 16:27:50 +01:00 |
|
|
David BakerandGitHub
|
d6a226e6bd
|
Put webpack-dev-server in development mode
https://github.com/webpack/webpack-dev-server/issues/1327
|
2018-05-04 18:37:29 +01:00 |
|
|
David BakerandGitHub
|
0e2ee5f127
|
Merge pull request #6638 from vector-im/dbkr/disable_presence_for_matrix_org
Don't show presence on matrix.org
|
2018-04-30 16:18:26 +01:00 |
|
|
David BakerandGitHub
|
5c722f31ff
|
Merge pull request #6625 from vector-im/luke/fix-compatibility-page
Enforce loading babel-polyfill first
|
2018-04-27 15:42:37 +01:00 |
|
|
David BakerandGitHub
|
864057e8ee
|
Merge pull request #6602 from RiotTranslateBot/weblate-riot-web-riot-web
Update from Weblate.
|
2018-04-25 15:17:32 +01:00 |
|