-
Notifications
You must be signed in to change notification settings - Fork 29
Devel organizations #30
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
Open
sophiaashraf
wants to merge
47
commits into
EMSTrack:master
Choose a base branch
from
sophiaashraf:devel-organizations
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* TokenLogin model and serializer * Guest pages * Guest pages and video styling * Creating guest user * Testing guest user tokenlogin * Add alert while calling * Issuing removeTrack to stop feedback on phone browser * Adding remoteClientText back to video window * More video styling with bootstrap * Ringing during calls * Enable video settings * Hangup video on modal close. * Link button functionality on video calls. * Concurrent ambulance/hospital client login * Removing video if not authenticated. * Removing video if not authenticated or not enabled. * Chasing webrtc connection issue. * Adding proxy client property for calls. * Full screen video mode. * Video controls Co-authored-by: Mauricio de Oliveira <[email protected]>
* Equipment default widget * Equipment set creation and updating. * Simplified EquipmentSetItem * Groups and Users with javascript formsets Co-authored-by: Mauricio de Oliveira <[email protected]>
* Specifying pip versions to avoid compatibility * Fixing npm install issue * Changed from InlineFormSet to ModelFormSet and added npm to Dockerfile * Changed from ModelFormSet to InlineFormSetView * Downgrading psycog2 as per https://stackoverflow.com/questions/68024060/assertionerror-database-connection-isnt-set-to-utc * Migrated to nodejs 12 * Migrated to nodejs 16 * Adding ignore to webpack_loader settings * Attempt to fix the webpack_loader issue * update webpack-bundle-tracker * cleaning up Co-authored-by: sungwookson <[email protected]> Co-authored-by: Mauricio de Oliveira <[email protected]>
* Updating Django extra-views Co-authored-by: Mauricio de Oliveira <[email protected]>
* Updating Django extra-views * Fixing bug in equipmentholderform -> required equipmentset Co-authored-by: Mauricio de Oliveira <[email protected]>
* Debugging call initiation * Debugging mqtt client dropping connection * Change ambulance status to unknown in case of client set up with ONLINE status and no ambulance * Add updated_by_username field to callNoteSerializer * Updating tests * Correcting translation mistake Co-authored-by: Mauricio de Oliveira <[email protected]>
Rsync local script
* Changing from ambulance to vehicle Fixing equipment interface * Fixing equipment interface complete Co-authored-by: Mauricio de Oliveira <[email protected]>
* dashboard * dashboard token * localhost * done
Fix translation of client activity.
* modify login page (EMSTrack#25) Co-authored-by: carolynzhangxy <[email protected]> * Changes in the fall of 2024 * Update Dockerfile * Removing allow releases flag from apt get update * Encode salt for compatibility with mosquitto auth plugin * More compatibility with mosquitto auth plugin * Adding initial migration for organization * Recreating organization as a ManyToMany field. * Recovering tests --------- Co-authored-by: carolynzhangxy <[email protected]> Co-authored-by: carolynzhangxy <[email protected]> Co-authored-by: Mauricio de Oliveira <[email protected]>
* Added migration to start organization table with default organization. * Added ambulance, equipment_set and hospital field to Organization, then added migration. * Added organization ForeignKey to GroupProfile class * Organization migration complete * organization list finished, organization detail started * Create organization_create.html
Changed default dockerfile to mac version Changed from CLRF to LF again (somehow)
sadkjnvlderinjegra
…/EMSTrack-Django into devel-organizations
…/EMSTrack-Django into devel-organizations
…/EMSTrack-Django into devel-organizations
…/EMSTrack-Django into devel-organizations
…/EMSTrack-Django into devel-organizations
This reverts commit ba16f9b. also adds a comment I forgot to save
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.