HCCRC Scheduler
  1. HCCRC Scheduler

scheduler

Public
  1. HCCRC Scheduler
  2. scheduler

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
CarlCarl
016a8288a2bFor HCCRCSCHEDULING-5215 -- failover exception handling . also eliminated un-need REST call for MRNs Error strings n...
CarlCarl
d5534898699Merge remote-tracking branch 'origin/develop' into develop Conflicts: core/src/test/java/edu/harvard/catalyst/sched...
CarlCarl
58508de647aUpdate exception cases for subject search. modified: core/src/main/java/edu/harvard/catalyst/scheduler/dto/S...
Xavier HaurieXavier Haurie
5957ad0a255HCCRCSCHEDULING-5242 : modify subject data, merger test to use variables instead of harcoded String and int values in...
Xavier HaurieXavier Haurie
7e213a62413HCCRCSCHEDULING-5242 : modify subject data deleter to take databse IDs as input
Xavier HaurieXavier Haurie
c7d902c7496HCCRCSCHEDULING-5241 : make subject data cleaner output scheduler database id
Xavier HaurieXavier Haurie
996cb92f2d3HCCRCSCHEDULING-5189 : fixed typos in ajax error warning
Xavier HaurieXavier Haurie
b98b70ccc04HCCRCSCHEDULING-5189 : fix warning text as per Tina's comment on ticket
Xavier HaurieXavier Haurie
1e31d1a212eMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
6dffe924f25HCCRCSCHEDULING-5189 : implemented code review feedback: single REST method for switching visit subjects (i.e. initia...
marc-daniemarc-danie
815d8b21785Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
0d833c651b9Added validation that the mrn search field only contains digits
Xavier HaurieXavier Haurie
eda3f41a09bMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
marc-daniemarc-danie
896ecfb3cbdadded tests for getExternalSubjectDataUsingMrn and findInternalSubjectByMrn rest calls
Xavier HaurieXavier Haurie
56163094f0cMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
3c8fc668b1cHCCRCSCHEDULING-5189 : added unit tests for AppointmentDAO.switchVisitSubject()
marc-daniemarc-danie
5ed48098968Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
10d054f4801Fixed testGetSearchedSubjectsWithUndisclosedGenderFilter to set gender filter to "U" instead of empty string
Jill SingerJill Singer
1d5175f6e1dHCCRCSCHEDULING-5051: fix; now the 'mrn already exists' error is showing in red underneath the mrn input field; and m...
marc-daniemarc-danie
35cb2d16b7cHCCRCSCHEDULING-5237 - EPIC: Subject view detail page is displayed with empty values after saving the subject for the...
marc-daniemarc-danie
ebd1e48afccHCCRCSCHEDULING-5228 - MGH-Test environment specific: On Subjects module and Studies module, after reaching on "Edit ...
marc-daniemarc-danie
25e031dcb07HCCRCSCHEDULING-5231 - MGH-Test environment specific: On searching for any subject that exists in Scheduler database,...
marc-daniemarc-danie
2319e4a6709HCCRCSCHEDULING-5231 - MGH-Test environment specific: On searching for any subject that exists in Scheduler database,...
marc-daniemarc-danie
79229feb667Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # web/src/main/webapp/js/subjects.js
marc-daniemarc-danie
27b843560a2HCCRCSCHEDULING-5231 - MGH-Test environment specific: On searching for any subject that exists in Scheduler database,...
Jill SingerJill Singer
966ea2034e6adding unit tests for encrypting and decrypting subject mrns and subjects, and updated a test that was disabled/not r...
CarlCarl
65b611e3742For HCCRCSCHEDULING-5220 . MRN filtering on list-view now ignores user's institution modified: core/src/mai...
CarlCarl
c01c5347f3bMerge remote-tracking branch 'origin/develop' into develop
CarlCarl
e7d56945c18More unit-test coverage for reportDAO
Xavier HaurieXavier Haurie
46e0973d805HCCRCSCHEDULING-5189 : added unit tests
CarlCarl
c4ac39792ceMerge remote-tracking branch 'origin/develop' into develop
CarlCarl
f3403280a52More unit-test coverage for report-builder
Jill SingerJill Singer
2faf2b10918cleaning up subjects code; re ankit's review
Jill SingerJill Singer
f9fcffc7dbdHCCRCSCHEDULING-5123: now only changing the name and mrn in the dialog (when switching the subject) when it goes thro...
Jill SingerJill Singer
2d2dcc87724HCCRCSCHEDULING-5123: initial fix
Ankit PanchamiaAnkit Panchamia
4b47fe97874Merge pull request #74 in HCCRCSCHEDULER/scheduler from HCCRCSCHEDULING-5082 to develop * commit '8e3203192c5ef7b62d...
brianbrian
8e3203192c5HCCRCSCHEDULING-5082: Small changes that make it more readable
brianbrian
cdcce2b159cHCCRCSCHEDULING-5082: Forgot a single case that allows the user to enter mrn after entering in date
CarlCarl
aa6c54e89e2Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
eb569167e1fRemove 'tolerate' boolean from method that didn't care / use it. Remove concept of 'rainy message'. modifie...
brianbrian
128bd332314Merging Changes from Develop
brianbrian
a298e5f67d5HCCRCSCHEDULING-5082: Extracted parts to helper functions to impove readability.
marc-daniemarc-danie
9af38dd5c99removed comment
marc-daniemarc-danie
5b65b5b543aMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
810c9a6ef7eHCCRCSCHEDULING-5153 - now redirects to the subject search page if user clicks forward and back while editing a subje...
CarlCarl
dfa5d86903cMerge remote-tracking branch 'origin/develop' into develop
CarlCarl
077641c4fe3For HCCRCSCHEDULING-5220 . unit-tests for mrnIs() and mrnMatches() SubjectDAO.java SubjectDAOTest.java
marc-daniemarc-danie
945903d1580Fixed logging of updates to subject to handle null values for country and race
marc-daniemarc-danie
c21daed823aMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
4aa51d76019added puid to the defensiveCopy method
brianbrian
d0b7d8c8289HCCRCSCHEDULING-5082: IE 11 - Consolidate the fixes.
brianbrian
5e8188f6d61Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into HCCRCSCHEDULING-5082
CarlCarl
df9a95c98beFor HCCRCSCHEDULING-5220 . null-checks added SubjectDAO.java
CarlCarl
0889848f0b7Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
9022ef632ddnull-check added ReportTemplateDAO.java
marc-daniemarc-danie
cc1a064741cMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
6f2763afa9cremoved institution in the getSubjectData call and modified so that race and ethnicity is returned to the client and ...
CarlCarl
c42cd5f6c96For HCCRCSCHEDULING-5198 . add unit test and tweak the replacement process FieldSortType FieldProcessingEnumTest
CarlCarl
f6ef6c1688cMerge remote-tracking branch 'origin/develop' into develop
CarlCarl
829d162a8e0For HCCRCSCHEDULING-5198 . update query-builder sort-processing for left-joins of state, country, race FieldSortType
brianbrian
9b29e97cbc1Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into HCCRCSCHEDULING-5082
marc-daniemarc-danie
2d539830ea5removed TODO
marc-daniemarc-danie
a8b431079ebMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
0a53835f349added check for null address and phone from empi
CarlCarl
f9e9d9c4fd9Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
eb1b7416f52For HCCRCSCHEDULING-5215 . Tweak instrumentation of backend logic for when to throw. Wired failover messages into fro...
marc-daniemarc-danie
a7d74e87b79Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
233133eeeb1changed the sort type of country and race to LeftJoinShortStringDb from InnerJoinShortStringDB
brianbrian
df487dc9c3eHCCRCSCHEDULING-5082: IE 11 - Last name and DOB fields are not getting enabled and search button is clickable with no...
Xavier HaurieXavier Haurie
069a48b84a6HCCRCSCHEDULING-5189 : fix bug where hold-with-no-subject checkbox was visible to non-CRC staff
Xavier HaurieXavier Haurie
2d5bd5c15b5HCCRCSCHEDULING-5189 : re-implemented warnings as booleans instead of strings which end up not getting used (we were ...
Xavier HaurieXavier Haurie
f678662173aHCCRCSCHEDULING-5189 : re-implemented warning messages to use correct text, and better handle case where both warning...
Jill SingerJill Singer
edfbaa09731HCCRCSCHEDULING-5211 fix
Jill SingerJill Singer
94a8ae0088aHCCRCSCHEDULING-5218 fix
Xavier HaurieXavier Haurie
ea8611bbb54Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
3204b3820faHCCRCSCHEDULING-5189 : implemented double-booking check. Also implemented the case where both the gender block check ...
Xavier HaurieXavier Haurie
9ae77e0678cHCCRCSCHEDULING-5189 : minor refactor to make code more understandable
Jill SingerJill Singer
296c6a2efcfHCCRCSCHEDULING-5216 fix; removing refresh subjects column
Jill SingerJill Singer
6ed35c2156fHCCRCSCHEDULING-5144 fix; updated header of the wizard section
Jill SingerJill Singer
7d23dd6ec67working on tests for HCCRCSCHEDULING-5204
marc-daniemarc-danie
ce462493278added try catch for debugging purposes to createSubjectsResponseDTO method
CarlCarl
8dcdf031345Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
f3b4acf5d69For HCCRCSCHEDULING-5215 . Backend instrumentation for Empi Failover modified: core/src/main/java/edu/harv...
Xavier HaurieXavier Haurie
681a81210c1Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
8d57d170058HCCRCSCHEDULING-5189 : re-wrote most of existing switch-subject functionality on server and client sides. Gender bloc...
CarlCarl
0c9dca4da94rename logChanges method
CarlCarl
1829f6b3961Fix for HCCRCSCHEDULING-5212 . '... where study in (:studyList)', vs '... where study.id in (:studyList)' Appointmen...
Jill SingerJill Singer
cd3eb3e3740HCCRCSCHEDULING-5118 fix: removing column header label
Jill SingerJill Singer
f0445bf80dbHCCRCSCHEDULING-5051: fix: rewording error messages; one each for creation and editing
Jill SingerJill Singer
7f8a02a8105HCCRCSCHEDULING-5204: potential fix; now the phone number array is accessed safely
CarlCarl
86d294d7682Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
67a301c4cbdchange 'changes' column from varchar(8000) to longtext
Xavier HaurieXavier Haurie
92d90e9f8abMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
65a47a75eccHCCRCSCHEDULING-5189 : debugged gender-block checking for switch subjects functionality. Note: warning dialog appears...
Xavier HaurieXavier Haurie
3fc31fae09fHCCRCSCHEDULING-5189 : working on gender-block checking for switch subjects functionality
CarlCarl
5e04492ba71Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
cc28cb32f57Instrumentation to make stack traces more informative while trying to persist Empi changes to Subjects
brianbrian
52b2aeed22fHCCRCSCHEDULING-5018: Time line is not displaying in IE 11. Added in fix removing raw javascript call of getElementsB...
Jill SingerJill Singer
b4e173887c8for HCCRCSCHEDULING-5195 and HCCRCSCHEDULING-5004: zipcode now looks for exactly 5 numbers, iff a valid us state is ...
Jill SingerJill Singer
5f05cf1b04fHCCRCSCHEDULING-5128 fix: plus removing unused css left over from older subject page (as recommended by marc-danie)
Jill SingerJill Singer
f4d5fe1b9aeHCCRCSCHEDULING-5204: safely retrieving phone numbers as well; to prevent potential NPE's
marc-daniemarc-danie
548d97402d9Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
fcb09f7f269modified so that race and primary contact number can be null in the Subjects class
Jill SingerJill Singer
b870e27022epotential fix for HCCRCSCHEDULING-5204
marc-daniemarc-danie
4b1fae77269made country an optional field when logging activity in the updateSubject method
marc-daniemarc-danie
f91a61e2d51removed conditional check for error-reply in EMPI xml response
marc-daniemarc-danie
bdb2f13f21aadded try catch around parsing of the xml response from EMPI and added check for null patients in xml result for debu...
marc-daniemarc-danie
2b357c7c92bfixed typo in queryBuilder string in getSearchedSubjectsAsEmpiSubjectDto
marc-daniemarc-danie
b4f5dbc5471HCCRCSCHEDULING-5201 - Bug: Create/Edit subjects > 500 error is getting displayed in console if user clicks on save b...
marc-daniemarc-danie
77ca55c3eabMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
cbc5ed70bbafixed isvalidDOB check
CarlCarl
d778cc203b2Cleanup some unused methods in SubjectDataEncryptor. Adjust test to accommodate encryption.
marc-daniemarc-danie
32848b08d18Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
a498f1b83aaHCCRCSCHEDULING-5192 - IE and FF - subjects - No error is shown while user enters invalid dob as 13/13/1313
Jill SingerJill Singer
c94bb2be759adjusted error message and validation, now only checks for digits, not for length/format: for HCCRCSCHEDULING-5195 a...
CarlCarl
a5e786ed00bFor reopened HCCRCSCHEDULING-5176. increase field-size to hold encrypted changes-description EpicBatchTest.java Epic...
Ankit PanchamiaAnkit Panchamia
c03d378cb8frefactored to move SubjectMrnDTO into its respective package.
Jill SingerJill Singer
7a50a1cf32eHCCRCSCHEDULING-5197: fix
Jill SingerJill Singer
4c364acb0d5refining fix for HCCRCSCHEDULING-5151; need to make sure HCCRCSCHEDULING-5122 still works; coded with Marc-Danie
CarlCarl
feb22fa0f42Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
507b1b928afbooked-visit report-template gets mrn via bv left-join subject-mrn, instead of using user's site to dig it up ...
Jill SingerJill Singer
a0017abcd33HCCRCSCHEDULING-5191 fix: removing duplicates from the db (a bunch of countries are first in the list, and then they ...
Xavier HaurieXavier Haurie
00047214d1dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
29283907c3fHCCRCSCHEDULING-5109 : more detailed comments on testing the subject data cleaner app
marc-daniemarc-danie
c10b6f0d422removed unused methods addSubjectToStudy and addSubjectToStudy from StudyResource and assignStudySubjects and assignS...
marc-daniemarc-danie
bda188c29b8modified to remove the subjectData from session store after loading the edit subject page
Xavier HaurieXavier Haurie
9cda7d618d0HCCRCSCHEDULING-5109 : fix INNER and LEFT JOINS in code review
marc-daniemarc-danie
f0e7d7fed28Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
9b000b04b04modified getSubjectData rest call in SubjectResource to be a GET request
CarlCarl
979c8a5d1f0cleanup up some unused methods, and nuked uses of user.getInstitution for subjectMrn modified: core/src/ma...
Jill SingerJill Singer
f3d636b9740fixing alignment of 'remove or switch subject' button, making the study name be a colspan =2; that text got moved if ...
marc-daniemarc-danie
131134b7e9cMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
4d3d298d79aModified createGetStudiesSubjectsResponse in GetSubjectsResponse to return the institution for the subjectmrn and not...
Jill SingerJill Singer
6958a65709aHCCRCSCHEDULING-5151: changing display of the combobox value to include the local ID
Ankit PanchamiaAnkit Panchamia
4b759f21b8badded additional console logging and updated couple of typos.
Xavier HaurieXavier Haurie
93f5580578dMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
c92478e88b9HCCRCSCHEDULING-5109 : everything runs from the command line, using the test data in test-data.sql
CarlCarl
7979712b20bInstrument subject search to console.log the empi xml result modified: core/src/main/java/edu/harvard/cata...
Xavier HaurieXavier Haurie
19ff221b809Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
3b849c310b5HCCRCSCHEDULING-5109 : compiles and tests run without errors
marc-daniemarc-danie
fda0a262004Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
2837b40c792increased width of the study drop down so that it aligns with the comment textarea
CarlCarl
a608f97d820Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
6fa22eb03eeFor HCCRCSCHEDULING-5047 Moved ethnicity lookup into dao, and made it happen on those other paths, in addition to bat...
marc-daniemarc-danie
1ac6b36212eset the font size of the comment textarea to that same as the input text fields
marc-daniemarc-danie
93bfb04e92eFixed so that correct fields are marked as required in integration mode
marc-daniemarc-danie
f6029e019e7Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
960e0ab13c5HCCRCSCHEDULING-5188 - After clicking on "More actions" link on Subject result, the gender field is not retained.
Jill SingerJill Singer
d80d834a955Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
CarlCarl
d055a43b283For HCCRCSCHEDULING-5013 . Epic service down --> Service down
CarlCarl
d9ff434b0dcAdjust some method names, and make refreshSubject work by directly passing subjectMrn id from front end.
Jill SingerJill Singer
71000c6c419HCCRCSCHEDULING-5180 fix; plus adjusting coloring of disabled text boxes on the subject form (and adjusting the font ...
marc-daniemarc-danie
ef7b0e91207HCCRCSCHEDULING-5153 - On Subjects module, after visiting "Edit Subject" screen, using the Back and Forward browser b...
marc-daniemarc-danie
a228ee3fa25HCCRCSCHEDULING-5179 - Bug: Create/Edit subject > Application does not saves and displays a 500 error in the console ...
Xavier HaurieXavier Haurie
5caca391d5bMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
6cdcd9059b8HCCRCSCHEDULING-5109 : improve test data, plus very minor fixes
Jill SingerJill Singer
be7639fea50Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
Jill SingerJill Singer
06f48b28d17HCCRCSCHEDULING-5185: fix; need to manually set the edit mode to true; the check that sets it is elsewhere in the app
marc-daniemarc-danie
245bb5dab8fHCCRCSCHEDULING-5183 - Subjects: Subject beta tab is getting displayed on create and edit study page
marc-daniemarc-danie
439fbf2bfe4Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
73a37b4feffFixed rendering of mrn field in integration mode when going from viewing a subject and then clicking on the edit butt...
Xavier HaurieXavier Haurie
88515c5e929Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
Xavier HaurieXavier Haurie
21362e41739HCCRCSCHEDULING-5109 : re-instated SubjectDataCleaner program; refactor to use subject_mrn table, correct some errors...
Jill SingerJill Singer
3e93bb21d48Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
Jill SingerJill Singer
6db1cc8bd2cHCCRCSCHEDULING-5105: further fixing breadcrumbs; removing redundant crumb
marc-daniemarc-danie
5fc274e7d41Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
2744aa1cfb4HCCRCSCHEDULING-5175 - MGH-test Environment Specific: On expanding a subject record by clicking on '+' gives a 500 er...
Xavier HaurieXavier Haurie
8f69cb911eaMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/hccrcscheduler/scheduler into develop
marc-daniemarc-danie
10fe04c3b8bremoved unused method changeSubjectStatus
CarlCarl
34dcba5b3dcFix for HCCRCSCHEDULING-5173 . Replace "," in list of from-tables with " inner join ". modified: core/src...
marc-daniemarc-danie
6ad1dbe79b6Removed references in the server and client to unused 'changeSubjectStatus' rest call
marc-daniemarc-danie
9c6edd43e19Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
ef905b0f8b1HCCRCSCHEDULING-5122 - Subjects: Create/Edit subject: Add to study drop down are not shown in auto suggest and also n...
Xavier HaurieXavier Haurie
66b788745dfHCCRCSCHEDULING-5109 : fixed update.sql so it does not fail on the nightly_batch_changes table not being removed befo...
Jill SingerJill Singer
eea438c1be0Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
CarlCarl
9f6b09bd988Merge remote-tracking branch 'origin/develop' into develop
CarlCarl
242b36befe1fix study-subjects to display the studySubject's subjectMrn's Mrn, rather than matching against user institution. fix...
Jill SingerJill Singer
0196df99e6dHCCRCSCHEDULING-5105: fixing breadcrumbs
marc-daniemarc-danie
676625e1942Merge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
8840eae87f5removed left margin on the first input field of the subject search form
Jill SingerJill Singer
a62ca582c56fixing comment display in read-only mode, also fixing submit button (showing up/not showing up at wrong times)
Jill SingerJill Singer
6617ef473b3Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
Jill SingerJill Singer
bce231b90d3fixing display of the booked resource table, small html change
marc-daniemarc-danie
f18d508031bMerge remote-tracking branch 'origin/develop' into develop
marc-daniemarc-danie
bb32f5d7bf2HCCRCSCHEDULING-5134- Subjects Module: Apply UI styles to the Edit and Create subjects page,HCCRCSCHEDULING-5135 - Su...
Jill SingerJill Singer
1d02fb1c617Merge branch 'develop' of ssh://skoll.catalyst:7999/hccrcscheduler/scheduler into develop
Jill SingerJill Singer
6b42a4cc1fcHCCRCSCHEDULING-5099: fixing showing the time twice for short appointments; shows up for appts of 30 mins or less in ...
marc-daniemarc-danie
639243a10e1Merge remote-tracking branch 'origin/develop' into develop