Commits · fbe0ba62d1c6e44a91dce6319d0816f6538830ab · SMASCH / scheduling-system

Nov 12, 2018
- Merge branch 'fix/import_file' into 'master' · fbe0ba62
  Piotr Gawron authored 6 years ago
  
  Fix/import file Closes #268 See merge request NCER-PD/scheduling-system!184
  fbe0ba62
- merged hotfix/import_file which was intended for little changes but its name is confusing · 3c512e1c
  Carlos Vega authored 6 years ago
  
  3c512e1c
- Merge branch 'hotfix/import_file' into fix/import_file · 3f9e309d
  Carlos Vega authored 6 years ago
  
  3f9e309d
- Merge branch 'hotfix/voucher_templates' into 'master' · 8207c5c6
  Piotr Gawron authored 6 years ago
  
  Hotfix/voucher templates Closes #266 and #267 See merge request NCER-PD/scheduling-system!185
  8207c5c6
- Merge branch 'hotfix/office_availability' into 'master' · 6a3aeac5
  Piotr Gawron authored 6 years ago
  
  Hotfix/office availability See merge request NCER-PD/scheduling-system!183
  6a3aeac5
- fix problem with call to 'web.api.workers.daily_planning.availabilities$' if flags have no image · c5ce8a3a
  Carlos Vega authored 6 years ago
  
  c5ce8a3a
- added voucher for PDP · e86ee025
  Carlos Vega authored 6 years ago
  
  e86ee025
Nov 09, 2018
- Issue #268 added a worker to appointments and typelink · bc8f4c6c
  Carlos Vega authored 6 years ago
  
  bc8f4c6c
- move creation of the admin user before reading the file so we can use it · eb5cb30d
  Carlos Vega authored 6 years ago
  
  eb5cb30d
- added flag images · ac64180f
  Carlos Vega authored 6 years ago
  
  ac64180f
- Issue #267 Include both name and code in the dropdown menus for voucher type · 122a6152
  Carlos Vega authored 6 years ago
  
  122a6152
- Issue #267 make expiration customisable · 9e31259c
  Carlos Vega authored 6 years ago
  
  9e31259c
- changed voucher expiration date and voucher partner codes in import_file for PDP excel file · aa0f8cc6
  Carlos Vega authored 6 years ago
  
  aa0f8cc6
- Issue #266 Fixes problem when no voucher is checked to be printed. Rises a... · 57a22a53
  Carlos Vega authored 6 years ago
  
  Issue #266 Fixes problem when no voucher is checked to be printed. Rises a tooltip. But, even if the call was produced and no template was found in generate_for_vouchers, it would be redirected to the previous page (subject edit) or, if no previous page is found, to the subject list
  57a22a53
- Issue #266 : roll back to Piotr version and add multilingual option in view (not in model) · c2527d0e
  Carlos Vega authored 6 years ago
  
  c2527d0e
Nov 07, 2018
- Merge branch 'master' into hotfix/voucher_templates · a840f0eb
  Carlos Vega authored 6 years ago
  
  a840f0eb
- vouchers weren't working because the language list was empty. Might need additional changes · 13d5c4c5
  Carlos Vega authored 6 years ago
  
  13d5c4c5
- removed SS number and added superuser at the end of the script · 12f59051
  Carlos Vega authored 6 years ago
  
  12f59051
- Merge branch 'master' into hotfix/office_availability · 899d6184
  Valentin Groues authored 6 years ago
  
  899d6184
- add utf8 encoding to office availabilty test file · e7e29d6f
  Carlos Vega authored 6 years ago
  
  e7e29d6f
- fix unicode problems with the names when creating an office availability object · 7a75e00c
  Carlos Vega authored 6 years ago
  
  7a75e00c
- call to resizeCalendarColumns after rendering the daily planning · 986ae693
  Carlos Vega authored 6 years ago
  
  986ae693
- Fix office availability to avoid non-overlapping events and ensure overlaps stay within bounds · fb30c875
  Carlos Vega authored 6 years ago
  
  fb30c875
- Merge branch 'hotfix/unicode_error_office_availability' into 'master' · 5cc0b4a0
  Piotr Gawron authored 6 years ago
  
  fixed problem with unicode characters in names when checking office availability for daily planning See merge request NCER-PD/scheduling-system!182
  5cc0b4a0
- fixed office availability test. first name and last name must be unicode · 564b71fe
  Carlos Vega authored 6 years ago
  
  564b71fe
- fixed problem with unicode characters in names when checking office availability for daily planning · e0437f70
  Carlos Vega authored 6 years ago
  
  e0437f70
- Merge branch 'hotfix/import_file' into 'master' · 9a37f4c0
  Piotr Gawron authored 6 years ago
  
  Hotfix/import file Closes #263, #262, and #264 See merge request NCER-PD/scheduling-system!181
  9a37f4c0
- ask the user for a password · 32dd9347
  Carlos Vega authored 6 years ago
  
  32dd9347
Nov 06, 2018
- include language locales · ee90228d
  Carlos Vega authored 6 years ago
  
  ee90228d
- Fixes #264 Make number of visits to show in subject list customizable in study · 61a574de
  Carlos Vega authored 6 years ago
  
  61a574de
- Fixes most of #263 : nd number should have PDP prefix; screening numbers... · 94f75941
  Carlos Vega authored 6 years ago
  
  Fixes most of #263 : nd number should have PDP prefix; screening numbers should be filled in (using P-) ; location prefix should be defined: P (CHL), F (Flying team)
  94f75941
- Fixes #262 : sorting with empty screening number fails · 19cbf788
  Carlos Vega authored 6 years ago
  
  19cbf788
- Merge branch 'patch-1' into 'master' · 7536a235
  Piotr Gawron authored 6 years ago
  
  Version update See merge request NCER-PD/scheduling-system!180
  v0.12.0
  
  7536a235
- Version update · 1c87fcad
  Piotr Gawron authored 6 years ago
  
  1c87fcad
- Merge branch 'fix/import_file' into 'master' · 25ebfc42
  Piotr Gawron authored 6 years ago
  
  added file input control See merge request NCER-PD/scheduling-system!179
  25ebfc42
- added file input control · 9b9bf749
  Carlos Vega authored 6 years ago
  
  9b9bf749
Nov 05, 2018
- Merge branch 'feature/import_data_pdp' into 'master' · c566f950
  Piotr Gawron authored 6 years ago
  
  Feature/import data pdp Closes #261, #203, and #254 See merge request NCER-PD/scheduling-system!178
  c566f950
- removed debug code · 7532d799
  Carlos Vega authored 6 years ago
  
  7532d799
- WIP. Added --allow-unauthenticated apt-get to avoid unauthenticated errors · e1660436
  Carlos Vega authored 6 years ago
  
  e1660436
- WIP. Trying some clean ops before install with apt-get to avoid unauthenticated errors · 1cbd6cb5
  Carlos Vega authored 6 years ago
  
  1cbd6cb5