Граф коммитов

10313 Коммитов

Автор SHA1 Сообщение Дата
Joey Zhou f864c38afb format 2023-05-12 11:27:39 -07:00
Joey Zhou f0643ef8bf add more to unlease 2023-05-12 11:20:43 -07:00
Joey Zhou 574122db90 format 2023-05-12 09:28:27 -07:00
Joey Zhou 194c786b0e review comment 2023-05-12 09:27:07 -07:00
Joey Zhou d11625aef1 review comment 2023-05-12 09:25:42 -07:00
Joey Zhou 9683e4fa84 Merge branch 'MNTOR-24' of github.com:mozilla/blurts-server into MNTOR-24
* 'MNTOR-24' of github.com:mozilla/blurts-server:
  more
  update string
  move premium to the second half of the file
  Add note on running Redis locally
  add comment on settings section
  remove extra <hr> tag
  add brand name Premium
  lint
  apply updated settings styling, rearrange order on settings page
  lint
  lint
  add environment var
  MNTOR-1387 - Cancel premium subscription settings option
2023-05-12 09:23:21 -07:00
Joey Zhou b0c00525e4 naming changes 2023-05-12 09:23:16 -07:00
Joey Zhou 2d53a93490 more 2023-05-11 22:45:23 -07:00
Joey Zhou d66e6c442e Merge branch 'main' into MNTOR-24 2023-05-11 19:49:13 -07:00
Joey Zhou 64a7a82a5c future proof ff 2023-05-11 11:08:55 -07:00
Kaitlyn Andres 2e761315a9
Merge pull request #3022 from mozilla/mntor-1387-settings-cancel
MNTOR-1387 - Cancel premium subscription settings option
2023-05-11 11:54:36 -04:00
Kaitlyn 268ad578ca update string 2023-05-11 10:24:45 -04:00
Kaitlyn 8710a9916a move premium to the second half of the file 2023-05-10 20:41:04 -04:00
Vincent 39ec0871d4 Add note on running Redis locally 2023-05-10 15:38:40 +01:00
Joey Zhou cecb3deec5 env var 2023-05-09 18:06:19 -07:00
Joey Zhou 376c9a3fdd Merge branch 'main' into MNTOR-24 2023-05-09 07:58:51 -07:00
Joey Zhou 2f6de4488d bump seq number 2023-05-09 07:58:44 -07:00
mansaj a2adda0b0b
Merge pull request #3024 from mozilla/fix-circleci-config
MNTOR-1591: fix circle ci config
2023-05-05 15:21:42 -07:00
Joey Zhou 51951b77c8 fix yml 2023-05-05 15:18:46 -07:00
Joey Zhou 71d0305b49 fix circle ci config 2023-05-05 15:14:21 -07:00
Maxx Crawford 72a4d76792
Fix issue where Relay icon was outside of email input (#3020) 2023-05-05 14:42:31 -05:00
Kaitlyn Andres d0abb51146
Merge pull request #3021 from mozilla/mntor-1568-hibp-attribution-string
MNTOR-1568 - Add HIBP Attribution string
2023-05-05 13:12:47 -04:00
Kaitlyn 683f6d8c94 add comment on settings section 2023-05-05 12:16:39 -04:00
Kaitlyn 8927be762a remove extra <hr> tag 2023-05-05 12:14:13 -04:00
Kaitlyn 748a3588ad add brand name Premium 2023-05-05 12:12:00 -04:00
Kaitlyn e7459a799a lint 2023-05-05 12:08:46 -04:00
Kaitlyn 643a1492f7 apply updated settings styling, rearrange order on settings page 2023-05-05 12:05:31 -04:00
Kaitlyn 378b923c2f lint 2023-05-05 11:37:54 -04:00
Kaitlyn 327554bd0f lint 2023-05-05 11:36:22 -04:00
Kaitlyn 25cec4bc97 add environment var 2023-05-05 11:35:33 -04:00
Kaitlyn a7448759fc MNTOR-1387 - Cancel premium subscription settings option 2023-05-04 16:58:10 -04:00
Kaitlyn 07699eb570 format html 2023-05-04 15:23:28 -04:00
Kaitlyn 439b27c7d7 lint 2023-05-04 15:22:04 -04:00
Kaitlyn 8401c71ae7 add to landing page html 2023-05-04 15:20:08 -04:00
Kaitlyn 3635a7e1da MNTOR-1568 - Add HIBP Attribution string 2023-05-04 12:20:01 -04:00
Kaitlyn Andres b9a4dd451c
Merge pull request #3017 from mozilla/edit-readme-postgres
Add Postgres.app option on the readme
2023-05-03 10:47:29 -04:00
Florian Zia a2413ec890
Merge pull request #3009 from mozilla/MNTOR-1486-tab-titles
Add unique page titles
2023-05-03 13:49:23 +02:00
Florian Zia 5afb4f0db2 chore: Remove log 2023-05-03 13:46:03 +02:00
mansaj 8400271149
Merge pull request #3018 from mozilla/fix-circleci-config
Fix Circle CI Deploy
2023-05-02 15:45:22 -07:00
Joey Zhou c9590e649b circle ci yaml 2023-05-02 14:51:53 -07:00
Kaitlyn 0ce5c8fa5d rephrase 2023-05-02 16:35:14 -04:00
Kaitlyn 7efe054233 Add Postgress.app option on the readme 2023-05-02 16:32:26 -04:00
Maxx Crawford 01e7208f74
update codeowners (#3015)
* Remove @toufali from front-end code reviews

* Remove @pdehaan from logo reviews
2023-05-02 11:40:25 -05:00
Amri Toufali d62ab3c569
Merge pull request #3012 from mozilla/MNTOR-1565/update-readme-legacy
Update ReadMe: legacy cleanup
2023-05-01 08:51:46 -07:00
Amri Toufali 0205a44a53
Update ReadMe: legacy cleanup 2023-04-28 14:49:54 -07:00
Amri Toufali 01cec87e38
fix static deploy: disable logo/CDN sync script 2023-04-27 10:25:00 -07:00
Amri Toufali 4022fe86e1
fix deploy: dockerfile package.json path removed 2023-04-27 10:15:24 -07:00
Florian Zia 2a315a2112 chore: Add meta page url 2023-04-27 13:37:48 +02:00
Florian Zia 3ba2afa546 merge: main -> MNTOR-1486-tab-titles 2023-04-27 12:16:28 +02:00
Amri Toufali 01c1a28fea
Merge pull request #3004 from mozilla/MNTOR-1505/legacy-cleanup
Mntor 1505/legacy cleanup
2023-04-26 13:23:36 -07:00