Code

Big upgrade and merge of PR#570

Code

Draft

mermetbt wants to merge 102 commits intotimeoff-management:mastertimeoff-management/timeoff-management-application:masterfrom AlienGen:masterAlienGen/timeoff-management-application:masterCopy head branch name to clipboard

+58,126-26,968

Commits

Commits on Mar 29, 2018

• Added Slack support. New class and new templates, both based off the original email ones. Modified calls for emails to add the Slack calls.

  

  Joao Soares

  committed
  79334a2

  Copy full SHA for 79334a2

• Removed any specific development data. Added instructions to settings. Added unit test. Moved settings to proper place.

  

  Joao Soares

  committed
  dda281b

  Copy full SHA for dda281b

• Merge branch 'slack'

  Show description for 39e7fbc
  

  Joao Soares

  committed
  39e7fbc

  Copy full SHA for 39e7fbc

• Correct config file. Remove unecessary comments and console.logs. Restore proper footer. Restore deleted template.

  

  Joao Soares

  committed
  e69898a

  Copy full SHA for e69898a

• Restore app config original parameters. Clean up code on email.js file. Clean up CSS files. Restore markup on email template.

  

  Joao Soares

  committed
  a99ea32

  Copy full SHA for a99ea32

• Restore original fake email address on app config. Restoring spacing and remove console.log on login.js lib file.

  

  Joao Soares

  committed
  84b5061

  Copy full SHA for 84b5061

Commits on Apr 2, 2018

• Removed the DB migration and instead added the new slack_username field to the database schema using the correct tool. This avoids any possible issues for integration with current master and anyone…

  Show description for cdbe2af
  

  Joao Soares

  committed
  cdbe2af

  Copy full SHA for cdbe2af

• Correct location of promise_reset_password_slack call.

  

  Joao Soares

  committed
  7279661

  Copy full SHA for 7279661

• Add slack_username to the index vector correctly on the CSV importer.

  

  Joao Soares

  committed
  9330f81

  Copy full SHA for 9330f81

• Set 'send_slacks' config flag to false as default.

  

  Joao Soares

  committed
  1748cc3

  Copy full SHA for 1748cc3

• Changed slack_username column in Users to allow nulls to facilitate imports. Correct sending msg to supervisor twice instead of supervisor and requester on new leave request. Fixed issue on same me…

  Show description for 8c92c83
  

  Joao Soares

  committed
  8c92c83

  Copy full SHA for 8c92c83

Commits on Apr 3, 2018

• Fixed and added missing titles to all the pages.

  

  Joao Soares

  committed
  f96c996

  Copy full SHA for f96c996

Commits on Apr 11, 2018

• add google auth provider

  simllll

  committed
  685d875

  Copy full SHA for 685d875

• cleanup

  simllll

  committed
  617a9d2

  Copy full SHA for 617a9d2

• check for mail

  simllll

  committed
  2080c53

  Copy full SHA for 2080c53

• only need mail

  simllll

  committed
  48e248a

  Copy full SHA for 48e248a

• use prepare for session

  simllll

  committed
  1ef3836

  Copy full SHA for 1ef3836

• add some logging and fix domain check

  simllll

  committed
  33966a5

  Copy full SHA for 33966a5

• library update and some rewrites

  simllll

  committed
  a07c2f2

  Copy full SHA for a07c2f2

Commits on Apr 12, 2018

• let's how the automatic tests perform...

  simllll

  committed
  dd3cff6

  Copy full SHA for dd3cff6

• leave request check for user

  simllll

  committed
  3b95cc6

  Copy full SHA for 3b95cc6

• leave request check for user

  simllll

  committed
  6af80a9

  Copy full SHA for 6af80a9

• smtp

  simllll

  committed
  e2cd897

  Copy full SHA for e2cd897

• smtp

  simllll

  committed
  f4a1a97

  Copy full SHA for f4a1a97

• email?=

  simllll

  committed
  e2ef64f

  Copy full SHA for e2ef64f

• email?=

  simllll

  committed
  c57fe7c

  Copy full SHA for c57fe7c

• email?=

  simllll

  committed
  045fbab

  Copy full SHA for 045fbab

• email?=

  simllll

  committed
  fdad5f0

  Copy full SHA for fdad5f0

• email?=

  simllll

  committed
  7a7c105

  Copy full SHA for 7a7c105

• email?=

  simllll

  committed
  97f4a64

  Copy full SHA for 97f4a64

• asnyc mails

  simllll

  committed
  7ea4407

  Copy full SHA for 7ea4407

Commits on Apr 17, 2018

• fix merge

  simllll

  committed
  6ad7796

  Copy full SHA for 6ad7796

• merged title and slack PR (by Morthor)

  simllll

  committed
  f8bff38

  Copy full SHA for f8bff38

• rm logs

  simllll

  committed
  9954b59

  Copy full SHA for 9954b59

• revert calendar

  simllll

  committed
  dde1ea7

  Copy full SHA for dde1ea7

Commits on Jan 23, 2019

• simple anniversary calendar: added json output as comment in ical format.

  Show description for 99d9557
  simllll

  committed
  99d9557

  Copy full SHA for 99d9557

• mysql2 as optional dep

  simllll

  committed
  9c4c0e3

  Copy full SHA for 9c4c0e3

• sqlite3 to optional dep

  simllll

  committed
  9521eae

  Copy full SHA for 9521eae

• add Anniversaries calendar link

  simllll

  committed
  3615d59

  Copy full SHA for 3615d59

Commits on May 2, 2019

• format all js files with prettier

  simllll

  committed
  632be22

  Copy full SHA for 632be22

• [WIP] upgrade express to 4.x, sequelize to 5.x,.. and more

  simllll

  committed
  c9352b3

  Copy full SHA for c9352b3

• [WIP] refactoring companyId -> company_id etc to fix errors and mixups

  simllll

  committed
  fa30ac2

  Copy full SHA for fa30ac2

• fix: user find of underscore has no findOne

  simllll

  committed
  ed3af6a

  Copy full SHA for ed3af6a

• fix/revert: active user filter / use null again

  simllll

  committed
  fc57f7e

  Copy full SHA for fc57f7e

• fix: department validation

  simllll

  committed
  c35548a

  Copy full SHA for c35548a

• feat: add migration for copmanyId and DepartmentId

  simllll

  committed
  eb6126d

  Copy full SHA for eb6126d

Commits on Jul 5, 2019

• Configurable LDAP search filter. Issue timeoff-management#352

  rafacouto

  committed
  3c0f06f

  Copy full SHA for 3c0f06f

Commits on Jul 10, 2019

• Validation: ldap_config.searchfilter

  

  rafacouto

  authored and

  Rafa Couto

  committed
  5f3be73

  Copy full SHA for 5f3be73

Commits on Jul 15, 2019

• LDAP search filter default value.

  rafacouto

  committed
  3209d6e

  Copy full SHA for 3209d6e

Commits on Nov 18, 2019

• timeoff-management#249 fixes the error "overlapping booking" when using mysql db

  Larykath

  committed
  31fc242

  Copy full SHA for 31fc242

Commits on Feb 2, 2020

• fix: remove slack required username

  simllll

  committed
  3403145

  Copy full SHA for 3403145

Commits on Jul 9, 2021

• feat: add leave type id

  simllll

  committed
  7fd6461

  Copy full SHA for 7fd6461

• feat: encode base 64 again

  simllll

  committed
  21c2697

  Copy full SHA for 21c2697

• feat: encode base 64 again

  simllll

  committed
  cd8a1fb

  Copy full SHA for cd8a1fb

Commits on Sep 22, 2023

• minimum changes for docker build to succeed

  dougbreaux

  committed
  de23899

  Copy full SHA for de23899

Commits on Oct 16, 2023

• Merge pull request #1 from dougbreaux/master

  Show description for e507584
  mermetbt

  authored
  e507584

  Copy full SHA for e507584

• Merge pull request #2 from dkraemerwork/feature/#249_mysql_overlapping_booking_fix

  Show description for e90959f
  mermetbt

  authored
  e90959f

  Copy full SHA for e90959f

• Merge branch 'ldap-filter'

  mermetbt

  committed
  89a8452

  Copy full SHA for 89a8452

• Merge prettier.

  mermetbt

  committed
  f58af04

  Copy full SHA for f58af04

• Add package-lock and editorconfig.

  mermetbt

  committed
  b325efa

  Copy full SHA for b325efa

• Add redis dependency.

  mermetbt

  committed
  25956a0

  Copy full SHA for 25956a0

• Update package-lock.

  mermetbt

  committed
  f9daa7f

  Copy full SHA for f9daa7f

• Add docker compose. Fix merge issue.

  mermetbt

  committed
  89285c4

  Copy full SHA for 89285c4

• Fix invalid version.

  mermetbt

  committed
  4cd81b6

  Copy full SHA for 4cd81b6

• Fix.

  mermetbt

  committed
  29c8a81

  Copy full SHA for 29c8a81

• Fix Dockerfile.

  mermetbt

  committed
  267f3bd

  Copy full SHA for 267f3bd

• Change Dockerfile.

  mermetbt

  committed
  9190ba5

  Copy full SHA for 9190ba5

• Add support for env.

  mermetbt

  committed
  7796d51

  Copy full SHA for 7796d51

• Fix issues.

  mermetbt

  committed
  5bc4f63

  Copy full SHA for 5bc4f63

Commits on Oct 17, 2023

• Prettier.

  mermetbt

  committed
  5beb524

  Copy full SHA for 5beb524

• Prettier.

  mermetbt

  committed
  54c76fc

  Copy full SHA for 54c76fc

• Add prettierrc.

  mermetbt

  committed
  981e552

  Copy full SHA for 981e552

• Set quote to double quote.

  mermetbt

  committed
  e75c76f

  Copy full SHA for e75c76f

• Add semi columns.

  mermetbt

  committed
  5e6730c

  Copy full SHA for 5e6730c

• Merge.

  mermetbt

  committed
  59d23bd

  Copy full SHA for 59d23bd

• Prettier.

  mermetbt

  committed
  52684a2

  Copy full SHA for 52684a2

• Fix.

  mermetbt

  committed
  1338b3c

  Copy full SHA for 1338b3c

Commits on Oct 18, 2023

• Fix issues.

  mermetbt

  committed
  bab0c76

  Copy full SHA for bab0c76

• Add eslint.

  mermetbt

  committed
  cfb248f

  Copy full SHA for cfb248f

• Prettier.

  mermetbt

  committed
  d80e283

  Copy full SHA for d80e283

• Eslint

  mermetbt

  committed
  2a568f4

  Copy full SHA for 2a568f4

• Eslint and prettier.

  mermetbt

  committed
  29c0fde

  Copy full SHA for 29c0fde

• Set the test database to sqlite.

  mermetbt

  committed
  7fe3402

  Copy full SHA for 7fe3402

• Fix.

  mermetbt

  committed
  bb33c96

  Copy full SHA for bb33c96

Commits on Oct 19, 2023

• Add environment variables.

  mermetbt

  committed
  42651da

  Copy full SHA for 42651da

Commits on Oct 28, 2023

• fix: Solve part of the issues for the tests to pass.

  mermetbt

  committed
  fbde1b1

  Copy full SHA for fbde1b1

Commits on Oct 29, 2023

• fix: Bug fixes and force consistency in the database.

  mermetbt

  committed
  4c1c613

  Copy full SHA for 4c1c613

• fix: Issues with leave types and request approval.

  mermetbt

  committed
  fda8405

  Copy full SHA for fda8405

• fix: Fix leave types issue.

  mermetbt

  committed
  66800a5

  Copy full SHA for 66800a5

Commits on Jan 26, 2024

• fix: Improve consistency of the database.

  mermetbt

  committed
  050c96e

  Copy full SHA for 050c96e

Commits on Feb 6, 2024

• Create docker-image.yml

  mermetbt

  authored
  c6ace7c

  Copy full SHA for c6ace7c

Commits on Feb 7, 2024

• fix: Email from not set in emails.

  mermetbt

  committed
  1b078fc

  Copy full SHA for 1b078fc

• Merge branch 'master' of github.com:AlienGen/timeoff-management-application

  mermetbt

  committed
  f975b1d

  Copy full SHA for f975b1d

• ci: keep bin dir into the docker image.

  mermetbt

  committed
  f235e96

  Copy full SHA for f235e96

• fix: LDAP configuration issue when checkboxes are not ticked. LDAP settings not saved when using MySQL (datatype issue).

  mermetbt

  committed
  91849a3

  Copy full SHA for 91849a3

• fix: Some environment variables were not working.

  mermetbt

  committed
  622761c

  Copy full SHA for 622761c

• fix: Change datatypes for comments and timezone.

  mermetbt

  committed
  a000cfa

  Copy full SHA for a000cfa

• feat: Change configurations and update the documentation.

  mermetbt

  committed
  14eff2a

  Copy full SHA for 14eff2a

Commits on Feb 8, 2024

• fix: Google auth domains.

  mermetbt

  committed
  362523a

  Copy full SHA for 362523a

• fix: Settings company wide schedule.

  mermetbt

  committed
  46140ad

  Copy full SHA for 46140ad

• fix: Change table names for comment and schedule.

  mermetbt

  committed
  02a2f93

  Copy full SHA for 02a2f93

• fix: Checkboxes in department settings not working.

  mermetbt

  committed
  e9c6459

  Copy full SHA for e9c6459