Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Master into the BTM branch. #1099

Merged
merged 103 commits into from Jul 23, 2021
Merged

Merge Master into the BTM branch. #1099

merged 103 commits into from Jul 23, 2021

Commits on Apr 10, 2020

  1. added warning and updated version

    @AndyatFocallocal
    AndyatFocallocal committed Apr 10, 2020
    Copy the full SHA
    a755b3f View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. Add settings for testing server

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    66e1bd2 View commit details
    Browse the repository at this point in the history

  2. First pass at documenting server creation

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    f999b7a View commit details
    Browse the repository at this point in the history

  3. Add tmnulty's GPG key

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    9b8907e View commit details
    Browse the repository at this point in the history

  4. return before using null endingDate

    @artysidorenko
    artysidorenko committed Apr 11, 2020
    Copy the full SHA
    6aff53f View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1045 from focallocal/deploy-phm-handle-null-endin… 

    …gDate

Handle empty endingDate (phm)
    @AndyatFocallocal
    AndyatFocallocal committed Apr 11, 2020
    Copy the full SHA
    85c4d95 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'deploy-phm'

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    76c3cf1 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'deploy-btm'

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    107c9b8 View commit details
    Browse the repository at this point in the history

  8. Document passwordless sudo option on app server

    @zofrex
    zofrex committed Apr 11, 2020
    Copy the full SHA
    2c8aa1b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2020

  1. bug fix

    @Zahra-8d
    Zahra-8d committed Apr 12, 2020
    Copy the full SHA
    f4038d8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1049 from Zahra-8d/master 

    bug fix
    @Zahra-8d
    Zahra-8d committed Apr 12, 2020
    Copy the full SHA
    25da473 View commit details
    Browse the repository at this point in the history

  3. test remove

    @Zahra-8d
    Zahra-8d committed Apr 12, 2020
    Copy the full SHA
    19d3600 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1050 from Zahra-8d/master 

    test remove
    @Zahra-8d
    Zahra-8d committed Apr 12, 2020
    Copy the full SHA
    e3bdc4c View commit details
    Browse the repository at this point in the history

  5. pointless edit to try and kickstart the site.. made on the correct br… 

    …anch
    @AndyatFocallocal
    AndyatFocallocal committed Apr 12, 2020
    Copy the full SHA
    c0b8a2f View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2020

  1. undo last remove

    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    18b3467 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1051 from Zahra-8d/master 

    undo last remove
    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    137a9ba View commit details
    Browse the repository at this point in the history

  3. test fix

    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    2cb757f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1052 from Zahra-8d/master 

    test fix
    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    45f970b View commit details
    Browse the repository at this point in the history

  5. changed to use routematcher to get page name instead

    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    ce60072 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1053 from Zahra-8d/master 

    changed to use routematcher to get page name instead
    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    df50ae9 View commit details
    Browse the repository at this point in the history

  7. test

    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    b1caaa2 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1054 from Zahra-8d/master 

    test
    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    77ce7f4 View commit details
    Browse the repository at this point in the history

  9. wip

    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    d7d2739 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1055 from Zahra-8d/master 

    wip
    @Zahra-8d
    Zahra-8d committed Apr 13, 2020
    Copy the full SHA
    6ac9e36 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. test change

    @Zahra-8d
    Zahra-8d committed Apr 15, 2020
    Copy the full SHA
    91328e5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1058 from Zahra-8d/master 

    test change
    @Zahra-8d
    Zahra-8d committed Apr 15, 2020
    Copy the full SHA
    fad8082 View commit details
    Browse the repository at this point in the history

  3. update dcs client version

    @Zahra-8d
    Zahra-8d committed Apr 15, 2020
    Copy the full SHA
    0ad93d1 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1059 from Zahra-8d/master 

    update dcs client version
    @Zahra-8d
    Zahra-8d committed Apr 15, 2020
    Copy the full SHA
    7d9b26e View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. add function to auto follow discussion

    @Zahra-8d
    Zahra-8d committed Apr 17, 2020
    Copy the full SHA
    aba3b73 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1071 from Zahra-8d/deploy-phm 

    add function to auto follow discussion
    @Zahra-8d
    Zahra-8d committed Apr 17, 2020
    Copy the full SHA
    b9d3109 View commit details
    Browse the repository at this point in the history

  3. upgrade dcs client

    @Zahra-8d
    Zahra-8d committed Apr 17, 2020
    Copy the full SHA
    f021346 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1072 from Zahra-8d/deploy-phm 

    upgrade dcs client
    @Zahra-8d
    Zahra-8d committed Apr 17, 2020
    Copy the full SHA
    94292dd View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. duplicating change to phm

    @Zahra-8d
    Zahra-8d committed Apr 28, 2020
    Copy the full SHA
    d926ec8 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1080 from Zahra-8d/deploy-phm 

    duplicating change to phm
    @Zahra-8d
    Zahra-8d committed Apr 28, 2020
    Copy the full SHA
    a1482fd View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. bug fix

    @Zahra-8d
    Zahra-8d committed May 7, 2020
    Copy the full SHA
    213a458 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1081 from Zahra-8d/deploy-phm 

    bug fix
    @Zahra-8d
    Zahra-8d committed May 7, 2020
    Copy the full SHA
    c4dbfec View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2020

  1. testing fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    21afb37 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1082 from Zahra-8d/deploy-phm 

    testing fix
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    adab490 View commit details
    Browse the repository at this point in the history

  3. testing fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    660d263 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1083 from Zahra-8d/deploy-phm 

    testing fix
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    712eaa7 View commit details
    Browse the repository at this point in the history

  5. testing fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    19ccd18 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1084 from Zahra-8d/deploy-phm 

    testing fix
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    5c978c6 View commit details
    Browse the repository at this point in the history

  7. testing fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    2506cbe View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1085 from Zahra-8d/deploy-phm 

    testing fix
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    b2ced6d View commit details
    Browse the repository at this point in the history

  9. testing fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    8e0c4d5 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1086 from Zahra-8d/deploy-phm 

    testing fix
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    05112f6 View commit details
    Browse the repository at this point in the history

  11. removed logs

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    3caf422 View commit details
    Browse the repository at this point in the history

  12. added bug fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    e92d5e6 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1087 from Zahra-8d/deploy-phm 

    removed logs
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    0c57e2c View commit details
    Browse the repository at this point in the history

  14. wee fix

    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    6752cf3 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #1089 from Zahra-8d/master 

    duplicating bug fix into master
    @Zahra-8d
    Zahra-8d committed Jun 19, 2020
    Copy the full SHA
    586a5ce View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. Update intro.json

    @AndyatFocallocal
    AndyatFocallocal committed Jul 3, 2020
    Copy the full SHA
    9c0072d View commit details
    Browse the repository at this point in the history

  2. Update intro.json

    @AndyatFocallocal
    AndyatFocallocal committed Jul 3, 2020
    Copy the full SHA
    a334b2a View commit details
    Browse the repository at this point in the history

  3. Update intro.json

    @AndyatFocallocal
    AndyatFocallocal committed Jul 3, 2020
    Copy the full SHA
    e0ff4fd View commit details
    Browse the repository at this point in the history

  4. Update intro.json

    @AndyatFocallocal
    AndyatFocallocal committed Jul 3, 2020
    Copy the full SHA
    b929b8d View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2020

  1. Bump googleapis from 36.0.0 to 59.0.0 

    Bumps [googleapis](https://github.com/googleapis/google-api-nodejs-client) from 36.0.0 to 59.0.0.
- [Release notes](https://github.com/googleapis/google-api-nodejs-client/releases)
- [Changelog](https://github.com/googleapis/google-api-nodejs-client/blob/master/CHANGELOG.md)
- [Commits](googleapis/google-api-nodejs-client@v36.0.0...v59.0.0)

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] committed Sep 2, 2020
    Copy the full SHA
    c551167 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2020

  1. Add Tom's new PGP key to sops

    @zofrex
    zofrex committed Dec 7, 2020
    Copy the full SHA
    3080e9e View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2020

  1. Add Tom's new new PGP key to sops

    @zofrex
    zofrex committed Dec 8, 2020
    Copy the full SHA
    3847997 View commit details
    Browse the repository at this point in the history

  2. Update atlas mongo connect strings

    @TLMcNulty
    TLMcNulty committed Dec 8, 2020
    Copy the full SHA
    77f2053 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1092 from focallocal/tm-update-mongo 

    Update Atlas mongo connect strings
    @TLMcNulty
    TLMcNulty committed Dec 8, 2020
    Copy the full SHA
    6e96d7a View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2020

  1. Update index.js 

    Configured i18n imports to include emergency .json files
    @dhruvmk
    dhruvmk committed Dec 23, 2020
    Copy the full SHA
    2a6f79f View commit details
    Browse the repository at this point in the history

  2. Add files via upload 

    Added new emergency .json files
    @dhruvmk
    dhruvmk committed Dec 23, 2020
    Copy the full SHA
    f8c7e30 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1091 from focallocal/dependabot/npm_and_yarn/goog… 

    …leapis-59.0.0

Bump googleapis from 36.0.0 to 59.0.0
    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    e9d9b60 View commit details
    Browse the repository at this point in the history

  4. Update index.js

    @dhruvmk
    dhruvmk committed Dec 23, 2020
    Copy the full SHA
    5648eba View commit details
    Browse the repository at this point in the history

  5. Add files via upload

    @dhruvmk
    dhruvmk committed Dec 23, 2020
    Copy the full SHA
    4faaeb5 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1093 from dhruvmk/master 

    New i18n files for emergency form, along with index.js adjusted to allow exporting of these files
    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    64b6a91 View commit details
    Browse the repository at this point in the history

  7. Added 'test', as a test

    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    c48c0f8 View commit details
    Browse the repository at this point in the history

  8. Revert

    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    fde43f9 View commit details
    Browse the repository at this point in the history

  9. Test 2

    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    f10a485 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #1094 from focallocal/Temp-please-delete 

    Test 2
    @AndyatFocallocal
    AndyatFocallocal committed Dec 23, 2020
    Copy the full SHA
    93b2a52 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2020

  1. Create emergency-new-event-modal.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    a027949 View commit details
    Browse the repository at this point in the history

  2. Create emergency-categories.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    a885e9f View commit details
    Browse the repository at this point in the history

  3. Create emergency-categories.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    5107cf5 View commit details
    Browse the repository at this point in the history

  4. Create emergency-new-event-modal.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    1236dc6 View commit details
    Browse the repository at this point in the history

  5. Delete emergency-categories.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    48ba7d9 View commit details
    Browse the repository at this point in the history

  6. Delete emergency-new-event-modal.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    db9ec79 View commit details
    Browse the repository at this point in the history

  7. Update index.js

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    1dab684 View commit details
    Browse the repository at this point in the history

  8. Delete emergency-categories.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    1a5b7ba View commit details
    Browse the repository at this point in the history

  9. Delete emergency-new-event-modal.json

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    5819daa View commit details
    Browse the repository at this point in the history

  10. Update index.js

    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    b09c240 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1095 from dhruvmk/master 

    Adding i18n files for emergency forms
    @dhruvmk
    dhruvmk committed Dec 28, 2020
    Copy the full SHA
    eb76d61 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. added line directing devs to PHM.com

    @AndyatFocallocal
    AndyatFocallocal committed Jan 3, 2021
    Copy the full SHA
    b1c1f27 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2021

  1. Add Tom's new key

    @zofrex
    zofrex committed Jan 31, 2021
    Copy the full SHA
    442e137 View commit details
    Browse the repository at this point in the history

  2. Add key for James' new laptop

    @zofrex
    zofrex committed Jan 31, 2021
    Copy the full SHA
    e5e6842 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2021

  1. Merge branch 'deploy-phm' into master

    @TLMcNulty
    TLMcNulty committed Feb 1, 2021
    Copy the full SHA
    ea6c71a View commit details
    Browse the repository at this point in the history

Commits on May 4, 2021

  1. updated FB url

    @AndyatFocallocal
    AndyatFocallocal committed May 4, 2021
    Copy the full SHA
    0f55465 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2021

  1. Change Tom's PGP key to his new one, remove James' old key

    @zofrex
    zofrex committed May 20, 2021
    Copy the full SHA
    ff7e3f8 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2021

  1. Update enc file with legacy mongo url string

    @adsk-mcnultt
    adsk-mcnultt committed Jun 14, 2021
    Copy the full SHA
    667bd82 View commit details
    Browse the repository at this point in the history

  2. Connect string legacy v2

    @adsk-mcnultt
    adsk-mcnultt committed Jun 14, 2021
    Copy the full SHA
    8863b7a View commit details
    Browse the repository at this point in the history

  3. Correct string legacy v2

    @adsk-mcnultt
    adsk-mcnultt committed Jun 14, 2021
    Copy the full SHA
    bfa4056 View commit details
    Browse the repository at this point in the history

  4. Correct string legacy v2

    @adsk-mcnultt
    adsk-mcnultt committed Jun 14, 2021
    Copy the full SHA
    fe68547 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2021

  1. commenting out code to try and fix server issue

    @AndyatFocallocal
    AndyatFocallocal committed Jul 4, 2021
    Copy the full SHA
    bea3683 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. removed commenting out code

    @AndyatFocallocal
    AndyatFocallocal committed Jul 5, 2021
    Copy the full SHA
    01114b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2021

  1. Update CORS.js with Syl's suggested fix

    @AndyatFocallocal
    AndyatFocallocal committed Jul 6, 2021
    Copy the full SHA
    9151bef View commit details
    Browse the repository at this point in the history

  2. Adding Syl's suggested change

    @AndyatFocallocal
    AndyatFocallocal committed Jul 6, 2021
    Copy the full SHA
    da48baa View commit details
    Browse the repository at this point in the history

  3. Dummy PR as Andy's request

    @sylque
    sylque committed Jul 6, 2021
    Copy the full SHA
    38b9fb8 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1097 from sylque/patch-1 

    Dummy PR as Andy's request
    @AndyatFocallocal
    AndyatFocallocal committed Jul 6, 2021
    Copy the full SHA
    ca942f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. resolving conflict between files

    @AndyatFocallocal
    AndyatFocallocal committed Jul 14, 2021
    Copy the full SHA
    bad61bc View commit details
    Browse the repository at this point in the history

  2. Resolving conflicts by removing commenting

    @AndyatFocallocal
    AndyatFocallocal committed Jul 14, 2021
    Copy the full SHA
    2d54a11 View commit details
    Browse the repository at this point in the history

  3. added extra space to resolve conflicts

    @AndyatFocallocal
    AndyatFocallocal committed Jul 14, 2021
    Copy the full SHA
    e396bc4 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1098 from focallocal/deploy-phm 

    Deploy PHM. Updating Tom's changes to secrets file upstream into master
    @AndyatFocallocal
    AndyatFocallocal committed Jul 14, 2021
    Copy the full SHA
    a4f86f3 View commit details
    Browse the repository at this point in the history

  5. Update DB password for PHM

    @zofrex
    zofrex committed Jul 14, 2021
    Copy the full SHA
    98df2fb View commit details
    Browse the repository at this point in the history

Commits on Jul 23, 2021

  1. Merge branch 'deploy-btm' into master

    @AndyatFocallocal
    AndyatFocallocal committed Jul 23, 2021
    Copy the full SHA
    4e4a9e8 View commit details
    Browse the repository at this point in the history