Skip to content

Commit

Permalink
Merge branch 'main' into feat/user2person
Browse files Browse the repository at this point in the history
  • Loading branch information
rjsparks committed Aug 8, 2023
2 parents 8940d33 + 71ccba6 commit 1615b5e
Show file tree
Hide file tree
Showing 392 changed files with 5,880 additions and 4,473 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ jobs:
echo "Running tests..."
if [[ "x${{ github.event.inputs.ignoreLowerCoverage }}" == "xtrue" ]]; then
echo "Lower coverage failures will be ignored."
./ietf/manage.py test --settings=settings_postgrestest --ignore-lower-coverage
./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest --ignore-lower-coverage
else
./ietf/manage.py test --settings=settings_postgrestest
./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest
fi
coverage xml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
exit 1
fi
echo "Running tests..."
./ietf/manage.py test --settings=settings_postgrestest
./ietf/manage.py test --validate-html-harder --settings=settings_postgrestest
coverage xml
- name: Upload Coverage Results to Codecov
Expand Down
1,136 changes: 572 additions & 564 deletions .pnp.cjs

Large diffs are not rendered by default.

115 changes: 58 additions & 57 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,60 @@
{
"taskExplorer.exclude": [
"**/.vscode-test/**",
"**/bin/**",
"**/build/**",
"**/CompiledOutput/**",
"**/dist/**",
"**/doc/**",
"**/ext/**",
"**/out/**",
"**/output/**",
"**/packages/**",
"**/release/**",
"**/releases/**",
"**/samples/**",
"**/sdks/**",
"**/static/**",
"**/target/**",
"**/test/**",
"**/third_party/**",
"**/vendor/**",
"**/work/**",
"/workspace/bootstrap/nuget/MyGet.ps1"
],
"taskExplorer.enableAnt": false,
"taskExplorer.enableAppPublisher": false,
"taskExplorer.enablePipenv": false,
"taskExplorer.enableBash": false,
"taskExplorer.enableBatch": false,
"taskExplorer.enableGradle": false,
"taskExplorer.enableGrunt": false,
"taskExplorer.enableGulp": false,
"taskExplorer.enablePerl": false,
"taskExplorer.enableMake": false,
"taskExplorer.enableMaven": false,
"taskExplorer.enableNsis": false,
"taskExplorer.enableNpm": false,
"taskExplorer.enablePowershell": false,
"taskExplorer.enablePython": false,
"taskExplorer.enableRuby": false,
"taskExplorer.enableTsc": false,
"taskExplorer.enableWorkspace": true,
"taskExplorer.enableExplorerView": false,
"taskExplorer.enableSideBar": true,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"eslint.nodePath": ".yarn/sdks",
"eslint.validate": [
"javascript",
"javascriptreact",
"vue"
],
"python.linting.pylintArgs": ["--load-plugins", "pylint_django"],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": false,
"python.linting.enabled": true
"taskExplorer.exclude": [
"**/.vscode-test/**",
"**/bin/**",
"**/build/**",
"**/CompiledOutput/**",
"**/dist/**",
"**/doc/**",
"**/ext/**",
"**/out/**",
"**/output/**",
"**/packages/**",
"**/release/**",
"**/releases/**",
"**/samples/**",
"**/sdks/**",
"**/static/**",
"**/target/**",
"**/test/**",
"**/third_party/**",
"**/vendor/**",
"**/work/**",
"/workspace/bootstrap/nuget/MyGet.ps1"
],
"taskExplorer.enabledTasks": {
"ant": false,
"bash": false,
"batch": false,
"composer": false,
"gradle": false,
"grunt": false,
"gulp": false,
"make": false,
"maven": false,
"npm": false,
"perl": false,
"pipenv": false,
"powershell": false,
"python": false,
"ruby": false,
"tsc": false
},
"taskExplorer.enableExplorerView": false,
"taskExplorer.enableSideBar": true,
"taskExplorer.showLastTasks": false,
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"eslint.nodePath": ".yarn/sdks",
"eslint.validate": [
"javascript",
"javascriptreact",
"vue"
],
"python.linting.pylintArgs": ["--load-plugins", "pylint_django"],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": false,
"python.linting.enabled": true
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2008-2022, The IETF Trust
Copyright (c) 2008-2023, The IETF Trust
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -26,4 +26,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ Click the <kbd>Fork</kbd> button in the top-right corner of the repository to cr

As outlined in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide, you will first want to create a fork of the datatracker project in your personal GitHub account before cloning it.

Windows developers: [Start with WSL2 from the beginning](https://github.com/ietf-tools/.github/blob/main/docs/windows-dev.md).

Because of the extensive history of this project, cloning the datatracker project locally can take a long time / disk space. You can speed up the cloning process by limiting the history depth, for example *(replace `USERNAME` with your GitHub username)*:

- To fetch only up to the 10 latest commits:
Expand Down Expand Up @@ -140,10 +142,10 @@ This will create packages under `ietf/static/dist-neue`, which are then served b

#### Parcel *(Legacy/jQuery)*

The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css`, respectively.
The Datatracker includes these packages from the various Javascript and CSS files in `ietf/static/js` and `ietf/static/css` respectively, bundled using Parcel.
Static images are likewise in `ietf/static/images`.

Whenever changes are made to the files under `ietf/static`, you must re-run `parcel` to package them:
Whenever changes are made to the files under `ietf/static`, you must re-run the build command to package them:

``` shell
yarn legacy:build
Expand Down
4 changes: 2 additions & 2 deletions client/agenda/Agenda.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
span.meeting-warning(v-if='agendaStore.meeting.warningNote') {{agendaStore.meeting.warningNote}}
h4
span {{agendaStore.meeting.city}}, {{ meetingDate }}
h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-muted Updated:] {{ meetingUpdated }}
h6.float-end.d-none.d-lg-inline(v-if='meetingUpdated') #[span.text-body-secondary Updated:] {{ meetingUpdated }}

.agenda-topnav.my-3
meeting-navigation
Expand Down Expand Up @@ -49,7 +49,7 @@
n-popover(v-if='!agendaStore.infoNoteShown')
template(#trigger)
n-button.ms-2(text, @click='toggleInfoNote')
i.bi.bi-info-circle.text-muted
i.bi.bi-info-circle.text-body-secondary
span Show Info Note
.col-12.col-sm-auto.d-flex.align-items-center
i.bi.bi-globe.me-2
Expand Down
4 changes: 2 additions & 2 deletions client/agenda/AgendaQuickAccess.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
)
i.bi.bi-x-square.me-2
span Discard
n-divider: small.text-muted Calendar
n-divider: small.text-body-secondary Calendar
n-button.mt-2(
id='agenda-quickaccess-calview-btn'
block
Expand Down Expand Up @@ -86,7 +86,7 @@
i.bi.bi-calendar-check.me-2
span {{ shortMode ? '.ics' : 'Add to your calendar...' }}
template(v-if='agendaStore.meetingDays.length > 0')
n-divider: small.text-muted Jump to...
n-divider: small.text-body-secondary Jump to...
ul.nav.nav-pills.flex-column.small.agenda-quickaccess-jumpto
li.nav-item(v-if='agendaStore.isMeetingLive')
a.nav-link(
Expand Down
2 changes: 1 addition & 1 deletion client/agenda/AgendaShareModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ n-modal(v-model:show='modalShown')
i.bi.bi-share
span Share this view
.agenda-share-content
.text-muted.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
.text-body-secondary.pb-2 Use the following URL for sharing the current view #[em (including any active filters)] with other users:
n-input-group
n-input(
ref='filteredUrlIpt'
Expand Down
2 changes: 1 addition & 1 deletion client/components/ChatLog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
)
template(#default)
div(v-html='item.text')
span.text-muted(v-else)
span.text-body-secondary(v-else)
em No chat log available.
</template>

Expand Down
2 changes: 1 addition & 1 deletion client/components/Polls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
:columns='columns'
striped
)
span.text-muted(v-else)
span.text-body-secondary(v-else)
em No polls available.
</template>

Expand Down
Loading

0 comments on commit 1615b5e

Please sign in to comment.