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.

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

Big upgrade and merge of PR #570

Draft
wants to merge 102 commits into
base: master
Choose a base branch
from

Commits on Mar 29, 2018

  1. 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 Mar 29, 2018
    Configuration menu
    Copy the full SHA
    79334a2 View commit details
    Browse the repository at this point in the history
  2. Removed any specific development data. Added instructions to settings…

    …. Added unit test. Moved settings to proper place.
    Joao Soares committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    dda281b View commit details
    Browse the repository at this point in the history
  3. Merge branch 'slack'

    Merging Slack integration.
    Joao Soares committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    39e7fbc View commit details
    Browse the repository at this point in the history
  4. Correct config file. Remove unecessary comments and console.logs. Res…

    …tore proper footer. Restore deleted template.
    Joao Soares committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    e69898a View commit details
    Browse the repository at this point in the history
  5. Restore app config original parameters. Clean up code on email.js fil…

    …e. Clean up CSS files. Restore markup on email template.
    Joao Soares committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    a99ea32 View commit details
    Browse the repository at this point in the history
  6. Restore original fake email address on app config. Restoring spacing …

    …and remove console.log on login.js lib file.
    Joao Soares committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    84b5061 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2018

  1. Removed the DB migration and instead added the new slack_username fie…

    …ld to the database schema using the correct tool. This avoids any possible issues for integration with current master and anyone installing the app from scracth.
    Joao Soares committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    cdbe2af View commit details
    Browse the repository at this point in the history
  2. Correct location of promise_reset_password_slack call.

    Joao Soares committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    7279661 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9330f81 View commit details
    Browse the repository at this point in the history
  4. Set 'send_slacks' config flag to false as default.

    Joao Soares committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    1748cc3 View commit details
    Browse the repository at this point in the history
  5. Changed slack_username column in Users to allow nulls to facilitate i…

    …mports. Correct sending msg to supervisor twice instead of supervisor and requester on new leave request. Fixed issue on same method on finishing promise.
    Joao Soares committed Apr 2, 2018
    Configuration menu
    Copy the full SHA
    8c92c83 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2018

  1. Fixed and added missing titles to all the pages.

    Joao Soares committed Apr 3, 2018
    Configuration menu
    Copy the full SHA
    f96c996 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2018

  1. add google auth provider

    simllll committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    685d875 View commit details
    Browse the repository at this point in the history
  2. cleanup

    simllll committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    617a9d2 View commit details
    Browse the repository at this point in the history
  3. check for mail

    simllll committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    2080c53 View commit details
    Browse the repository at this point in the history
  4. only need mail

    simllll committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    48e248a View commit details
    Browse the repository at this point in the history
  5. use prepare for session

    simllll committed Apr 11, 2018
    Configuration menu
    Copy the full SHA
    1ef3836 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    33966a5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    a07c2f2 View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2018

  1. Configuration menu
    Copy the full SHA
    dd3cff6 View commit details
    Browse the repository at this point in the history
  2. leave request check for user

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    3b95cc6 View commit details
    Browse the repository at this point in the history
  3. leave request check for user

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    6af80a9 View commit details
    Browse the repository at this point in the history
  4. smtp

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    e2cd897 View commit details
    Browse the repository at this point in the history
  5. smtp

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    f4a1a97 View commit details
    Browse the repository at this point in the history
  6. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    e2ef64f View commit details
    Browse the repository at this point in the history
  7. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    c57fe7c View commit details
    Browse the repository at this point in the history
  8. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    045fbab View commit details
    Browse the repository at this point in the history
  9. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    fdad5f0 View commit details
    Browse the repository at this point in the history
  10. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    7a7c105 View commit details
    Browse the repository at this point in the history
  11. email?=

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    97f4a64 View commit details
    Browse the repository at this point in the history
  12. asnyc mails

    simllll committed Apr 12, 2018
    Configuration menu
    Copy the full SHA
    7ea4407 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2018

  1. fix merge

    simllll committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    6ad7796 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f8bff38 View commit details
    Browse the repository at this point in the history
  3. rm logs

    simllll committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    9954b59 View commit details
    Browse the repository at this point in the history
  4. revert calendar

    simllll committed Apr 17, 2018
    Configuration menu
    Copy the full SHA
    dde1ea7 View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2019

  1. simple anniversary calendar: added json output as comment in ical for…

    …mat.
    
    fixed upload/restore function by using "multer" instead.
    simllll committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    99d9557 View commit details
    Browse the repository at this point in the history
  2. mysql2 as optional dep

    simllll committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    9c4c0e3 View commit details
    Browse the repository at this point in the history
  3. sqlite3 to optional dep

    simllll committed Jan 23, 2019
    Configuration menu
    Copy the full SHA
    9521eae View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    3615d59 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. Configuration menu
    Copy the full SHA
    632be22 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c9352b3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    fa30ac2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ed3af6a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fc57f7e View commit details
    Browse the repository at this point in the history
  6. fix: department validation

    simllll committed May 2, 2019
    Configuration menu
    Copy the full SHA
    c35548a View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    eb6126d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. Configuration menu
    Copy the full SHA
    3c0f06f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. Validation: ldap_config.searchfilter

    rafacouto authored and Rafa Couto committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    5f3be73 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2019

  1. Configuration menu
    Copy the full SHA
    3209d6e View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2019

  1. Configuration menu
    Copy the full SHA
    31fc242 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. Configuration menu
    Copy the full SHA
    3403145 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. feat: add leave type id

    simllll committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    7fd6461 View commit details
    Browse the repository at this point in the history
  2. feat: encode base 64 again

    simllll committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    21c2697 View commit details
    Browse the repository at this point in the history
  3. feat: encode base 64 again

    simllll committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    cd8a1fb View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2023

  1. Configuration menu
    Copy the full SHA
    de23899 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Merge pull request #1 from dougbreaux/master

    minimum changes for docker build to succeed
    mermetbt authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    e507584 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2 from dkraemerwork/feature/#249_mysql_overlappin…

    …g_booking_fix
    
    timeoff-management#249 fixes the error "overlapping booking" when using mysql db
    mermetbt authored Oct 16, 2023
    Configuration menu
    Copy the full SHA
    e90959f View commit details
    Browse the repository at this point in the history
  3. Merge branch 'ldap-filter'

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    89a8452 View commit details
    Browse the repository at this point in the history
  4. Merge prettier.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f58af04 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b325efa View commit details
    Browse the repository at this point in the history
  6. Add redis dependency.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    25956a0 View commit details
    Browse the repository at this point in the history
  7. Update package-lock.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f9daa7f View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    89285c4 View commit details
    Browse the repository at this point in the history
  9. Fix invalid version.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    4cd81b6 View commit details
    Browse the repository at this point in the history
  10. Fix.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    29c8a81 View commit details
    Browse the repository at this point in the history
  11. Fix Dockerfile.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    267f3bd View commit details
    Browse the repository at this point in the history
  12. Change Dockerfile.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    9190ba5 View commit details
    Browse the repository at this point in the history
  13. Add support for env.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    7796d51 View commit details
    Browse the repository at this point in the history
  14. Fix issues.

    mermetbt committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    5bc4f63 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. Prettier.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    5beb524 View commit details
    Browse the repository at this point in the history
  2. Prettier.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    54c76fc View commit details
    Browse the repository at this point in the history
  3. Add prettierrc.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    981e552 View commit details
    Browse the repository at this point in the history
  4. Set quote to double quote.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    e75c76f View commit details
    Browse the repository at this point in the history
  5. Add semi columns.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    5e6730c View commit details
    Browse the repository at this point in the history
  6. Merge.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    59d23bd View commit details
    Browse the repository at this point in the history
  7. Prettier.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    52684a2 View commit details
    Browse the repository at this point in the history
  8. Fix.

    mermetbt committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    1338b3c View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. Fix issues.

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    bab0c76 View commit details
    Browse the repository at this point in the history
  2. Add eslint.

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    cfb248f View commit details
    Browse the repository at this point in the history
  3. Prettier.

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    d80e283 View commit details
    Browse the repository at this point in the history
  4. Eslint

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    2a568f4 View commit details
    Browse the repository at this point in the history
  5. Eslint and prettier.

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    29c0fde View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7fe3402 View commit details
    Browse the repository at this point in the history
  7. Fix.

    mermetbt committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    bb33c96 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2023

  1. Add environment variables.

    mermetbt committed Oct 19, 2023
    Configuration menu
    Copy the full SHA
    42651da View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2023

  1. Configuration menu
    Copy the full SHA
    fbde1b1 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Configuration menu
    Copy the full SHA
    4c1c613 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fda8405 View commit details
    Browse the repository at this point in the history
  3. fix: Fix leave types issue.

    mermetbt committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    66800a5 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2024

  1. Configuration menu
    Copy the full SHA
    050c96e View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. Create docker-image.yml

    mermetbt authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    c6ace7c View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2024

  1. Configuration menu
    Copy the full SHA
    1b078fc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f975b1d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f235e96 View commit details
    Browse the repository at this point in the history
  4. fix: LDAP configuration issue when checkboxes are not ticked. LDAP se…

    …ttings not saved when using MySQL (datatype issue).
    mermetbt committed Feb 7, 2024
    Configuration menu
    Copy the full SHA
    91849a3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    622761c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    a000cfa View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    14eff2a View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2024

  1. fix: Google auth domains.

    mermetbt committed Feb 8, 2024
    Configuration menu
    Copy the full SHA
    362523a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    46140ad View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    02a2f93 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e9c6459 View commit details
    Browse the repository at this point in the history