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.

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

merge: update with latest dev before testing #5718

Merged
merged 36 commits into from
Jun 10, 2024
Merged

Conversation

avaek
Copy link
Contributor

@avaek avaek commented Jun 10, 2024

No description provided.

rohan-bes and others added 30 commits May 24, 2024 11:57
… appear in the Admin Panel for a few minutes (#5667)
- Allows us to see the original stack trace which helps debugging
* feat(adminPanel): RN-1318: Collapsible nav panel

* LESMIS

* LESMIS theme

* PR fixes
* CTA buttons and titles

* PR fixes
)

fix(vizBuilder): Fix duplicate ID issue on viz builder
* enable column resizing

* Remove unused props

* Include tooltip when text is not fully visible

* Remove tooltip types

* Fixes

* Update to handle padding of content

* Make the icon only clickable

* Fix page index issue
…column (#5672)

* enable column resizing

* Remove unused props

* Include tooltip when text is not fully visible

* Remove tooltip types

* Fixes

* Update to handle padding of content

* Make the icon only clickable

* Parent action column

* Fix page index issue

* Tooltip

* LESMIS

* PR fixes
fix(lesmis): Fix lesmis nav layout
…ty question (#5656)

* fix(datatrakWeb): RN-1268: Fix error when skipping non-mandatory entity question

* Add type guard

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
…ert to strings (#5701)

fix(datatrakWeb): NOTUP-710 Make visibility criteria comparisons convert to strings
ran `yarn dlx update-browserslist-db@latest`
…5313)

* associate domains

* iOS smart app banner

* use newer AASA format

* update `Podfile.lock` via `pod install`

Not actually 100% sure what this means 😬

* restore previous bundle ID

* fix bundle ID in AASA file

* temporary: dev mode on all associated domains

* temporary: provisioning profile

* don‘t open account settings in MediTrak

* experiment: file in root of `public` folder

* experiment: add AASA to Vite `assetsInclude`

* fix implicit any

* fix mixed-up comments

* stricter `assetsInclude`

* test `public` files with extensions

* test explicit reference to AASA

* teset `assetsInclude` with extensions

* Revert "test explicit reference to AASA"

This reverts commit 3846086.

* try nginx `location` for AASA

* try nginx `location` in correct server

* ⚗️ add `index` to nginx `location` for AASA

* try commenting out Vite `assetsInclude`

* remove redundant Vite `assetsInclude`

* delete experimental static files

* remove me-specific `project.pbxproj` entries

* format AASA as JSON

* update podfile

* remove test domain and developer mode

* amend which links open in app

* fix: prevent account-settings and report

* retry allowing all but a few

* support login autofill
… did not appear in the Admin Panel for a few minutes (#5667)"

This reverts commit eafc959.
* associate domains

* iOS smart app banner

* use newer AASA format

* update `Podfile.lock` via `pod install`

Not actually 100% sure what this means 😬

* restore previous bundle ID

* fix bundle ID in AASA file

* temporary: dev mode on all associated domains

* temporary: provisioning profile

* don‘t open account settings in MediTrak

* experiment: file in root of `public` folder

* experiment: add AASA to Vite `assetsInclude`

* fix implicit any

* fix mixed-up comments

* stricter `assetsInclude`

* test `public` files with extensions

* test explicit reference to AASA

* teset `assetsInclude` with extensions

* Revert "test explicit reference to AASA"

This reverts commit 3846086.

* try nginx `location` for AASA

* try nginx `location` in correct server

* ⚗️ add `index` to nginx `location` for AASA

* try commenting out Vite `assetsInclude`

* remove redundant Vite `assetsInclude`

* delete experimental static files

* remove me-specific `project.pbxproj` entries

* format AASA as JSON

* update podfile

* remove test domain and developer mode

* amend which links open in app

* fix: prevent account-settings and report

* retry allowing all but a few

* support login autofill

* add `tupaiameditrak://` URL scheme
hide executed commands in `setupNewDatabase`
alexd-bes and others added 6 commits June 7, 2024 08:11
* Fix styling for nested columns

* Fix span type
fic(datatrakWeb): Fix prettier overrides
* WIP

* Change password page

* Handle 401 errors the same way as other errors

* Handle redirecting login

* Forgot password views

* Reset password view

* Primary blue colour

* Use constants for auth routes

* WIP LESMIS

* LESMIS

* Tidy ups

* Update broken build type

* Update getSurveyResponsePageConfig.js

* use user endpoint

* remove viz builder useUser

* Fix session handling

* Revert "Fix session handling"

This reverts commit 302c829.

* PR fixes

* tweak(serverBoilerplate): RN-1295: Bypass session handling for request reset password route (#5668)

* tweak(serverBoilerplate): RN-1295: Bypass session handling for request reset password route

* Make all frontends use the same requestResetPassword

* Remove requestResetPassword from web-config-server

* Merge fixes

* Build fixes

* Update top navbar

* Fix styling on LESMIS

* Styling

* Fix redirect

* Colours

* LESMIS

* Display error if caught

* Disable links on auth pages

* Fix crashing pages

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
merge: release-2024-23 master -> dev
* autocomplete in login form

* curly apostrophe
@avaek avaek merged commit 455eb49 into rn-1243-resubmit-surveys Jun 10, 2024
48 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants