Skip to content

Commit

Permalink
Merge branch 'main' into task/FP-1375-admin-controlled-messages
Browse files Browse the repository at this point in the history
  • Loading branch information
rstijerina committed Jun 2, 2022
2 parents 5c5ae6e + b3aa730 commit 1b3da0b
Show file tree
Hide file tree
Showing 73 changed files with 22,830 additions and 13,242 deletions.
27 changes: 26 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.16.0] - 2022-05-17: Hook library; Dynamic App Form Updates; Styling

### Added

- FP-1384: Hook library for Data Files (#553)

### Changed

- Clean up FP-1082 & Prep for FP-1613 (#627)
- Bump django from 2.2.27 to 2.2.28 in /server (#629)
- FP-990 & FP-1255: Update <IntroMessage> to Use Dismissible <SectionMessage> (#616)
- FP-1194: CMS Samples: Update Secrets, Add Settings (#522)
- FP-1628: Update app values when user changes a new queue (#638)
- FP-1491: Style _common Button React Component (#598)

### Fixed

- FP-1543: No Small Primary Buttons (even in Header) (#628)
- FP-1567: Toolbar state not refreshing when moving to shared workspaces ProjectsList (#619)
- Add prettier check/fix commands (#633)
- FP-1566: fix early search results display (#634)
- FP-1618, FP-1626, FP-1630, FP-1299: Various bugfixes (#630)
- FP-1638: Add fixed widths for icon and date in Jobs table (#635)

## [2.15.0] - 2022-04-19: Common Sidebar; Bugfixes

### Added
Expand Down Expand Up @@ -636,7 +660,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [1.0.0] - 2020-02-28
v1.0.0 Production release as of Feb 28, 2020.

[unreleased]: https://github.com/TACC/Core-Portal/compare/v2.15.0...HEAD
[unreleased]: https://github.com/TACC/Core-Portal/compare/v2.16.0...HEAD
[2.16.0]: https://github.com/TACC/Core-Portal/releases/tag/v2.16.0
[2.15.0]: https://github.com/TACC/Core-Portal/releases/tag/v2.15.0
[2.14.0]: https://github.com/TACC/Core-Portal/releases/tag/v2.14.0
[2.13.0]: https://github.com/TACC/Core-Portal/releases/tag/v2.13.0
Expand Down
17 changes: 17 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The base Portal code for TACC WMA Workspace Portals
### Related Repositories:
- [Camino], a Docker container-based deployment scheme
- [Core CMS], the base CMS code for TACC WMA CMS Websites
- [Core Styles], the shared UI pattern code for TACC WMA CMS Websites
- [Core Portal Deployments], private repository that facilitates deployments of [Core Portal] images via [Camino] and Jenkins

# Local Development Setup
Expand Down Expand Up @@ -245,6 +246,21 @@ We use a modifed version of [GitFlow](https://datasift.github.io/gitflow/Introdu
- `bug/` for bugfixes
- `fix/` for hotfixes

#### Testing Core Styles Changes Locally

1. Clone [Core Styles] (if you haven't already).
2. Tell project to temporarily use your [Core Styles] clone:
```bash
npm link path-to/Core-Styles # e.g. npm link ../../Core-Styles
```

3. Make changes in your [Core Styles] clone as necessary.
4. Test changes.
- Changes to imported files during `npm run dev` will trigger livereload.
5. Commit successful changes to a [Core Styles] branch.

- _Note: [If you run `npm install` or `npm ci`, the link is destroyed.](https://github.com/npm/cli/issues/2380#issuecomment-1029967927) Repeat the above steps to restore it._

#### Best Practices
Sign your commits ([see this link](https://help.github.com/en/github/authenticating-to-github/managing-commit-signature-verification) for help)

Expand All @@ -260,5 +276,6 @@ Sign your commits ([see this link](https://help.github.com/en/github/authenticat
[Camino]: https://github.com/TACC/Camino
[Core CMS]: https://github.com/TACC/Core-CMS
[Core Portal]: https://github.com/TACC/Core-Portal
[Core Styles]: https://github.com/TACC/Core-Styles
[1]: https://docs.docker.com/get-docker/
[2]: https://docs.docker.com/compose/install/
9 changes: 9 additions & 0 deletions client/.postcssrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
plugins:

postcss-preset-env:
stage: false # to only allow features explicitely
features:
custom-media-queries: true
media-query-ranges: true

postcss-extend-rule: {}
5 changes: 5 additions & 0 deletions client/.prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# vendor
node_modules
# vendor: copied
icon.fonts.css

# auto-generated
coverage
build
dist
Loading

0 comments on commit 1b3da0b

Please sign in to comment.