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

Main merge for 1.2.6 release #252

Merged
merged 41 commits into from
May 13, 2024
Merged

Main merge for 1.2.6 release #252

merged 41 commits into from
May 13, 2024

Conversation

SBriere
Copy link
Member

@SBriere SBriere commented May 10, 2024

Description

Main branch main in preparation for 1.2.6 release

Testing

  • This change adds test coverage for new/changed/fixed functionality

Checklist

  • I have added documentation for new/changed functionality in this PR
  • I have formatted the files
  • All active GitHub checks for tests are passing
  • The correct base branch is being used, if not main

SBriere and others added 30 commits March 5, 2024 14:33
@SBriere
Version bump and disabled automatic action for JOSS paper draft
206ee3c
@SBriere
Merge branch 'dev' of https://github.com/introlab/opentera into dev
23894d5
@SBriere
Merged conf.py version bump
e69cd12
@SBriere
Merge branch 'main' of https://github.com/introlab/opentera into dev
39be813
@SBriere
Refs #244. VideoRehab - Added "play", "pause" and "stop" features to …
4b38dde 
…chronometers / countdowns.
@SBriere
Refs #233. VideoRehab - Added first implementation of manual counter …
f9ad6ee 
…tool.
@doumdi
Refs #248. Upgrade script to add asset_expiration_datetime to t_assets.
ebf5ad2
@doumdi
Updated test for asset_expiration_datetime
c9eceba
@doumdi
Refs #248 First attempt, unfinished.
6940293
@doumdi
Merge branch 'main' of github.com:introlab/opentera into dev
f1c8536
@doumdi
Refs #248, Starting worker, not usable yet.
5b8816b
@doumdi
Merge branch 'dev' of https://github.com/introlab/opentera into dev
45d22cb
@doumdi
Refs #248 Avoid having database access in worker.
c19f983
@doumdi
Refs #248 First version of archives in DB. Not working yet.
78139fe
@doumdi
Refs #248 Creating archive info, need to upload next.
bf73b97
@doumdi
Refs #248, working file archive upload from worker.
75a7bac
@doumdi
Refs #248 Return code.
b55cde4
@doumdi
Refs #248, Fix typo in project name
440d11d
@SBriere
Refs #232. Removed camera preinit as it was causing issues on iOS dev…
44ba95d 
…ices.
@doumdi
Refs #248 managing archive events.
2642ec2
@doumdi
Refs #248 Archive events sent to users, participants and devices. Wil…
68b8343 
…l be filtered with uuids.
@SBriere
Added device_type and device_subtype name in DeviceLogin reply
9ff0307
@SBriere
Added device_type and device_subtype name in DeviceLogin reply
8d4b2b6
@SBriere
Merge branch 'dev' of https://github.com/introlab/opentera into dev
2b45150
@SBriere
Refs #249. Replaced "random" library for token generation with "secre…
083af5f 
…ts" library
@SBriere
Refs #250. Limited port ranges in url mapping in nginx
4b7ab99
@SBriere
Refs #250. Cleaned up nginx config by removing external services config.
8579d4c
@doumdi
Refs #248, using host from DB
a10ffd6
@doumdi
Refs #248, using host from DB
e9b1f84
@doumdi
Refs #248, using host from DB
a2b8ef9
@SBriere SBriere requested a review from doumdi May 10, 2024 14:26
@SBriere SBriere merged commit b6ab857 into main May 13, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@doumdi doumdi doumdi approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@SBriere @doumdi