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

[SR-1397] Incorporate unused 0.8.2 improvements #11

Draft
wants to merge 43 commits into
base: 0-8-stable
Choose a base branch
from

Commits on Oct 19, 2015

  1. Configuration menu
    Copy the full SHA
    81788e0 View commit details
    Browse the repository at this point in the history
  2. Resolution attempt for issues bokmann#36, bokmann#45 and bokmann#83. …

    …Ensure we wind to beginning of business day when using business_hours before/after methods
    dugjason committed Oct 19, 2015
    Configuration menu
    Copy the full SHA
    812482e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    99cdb1e View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2015

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

Commits on Nov 15, 2015

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

Commits on Dec 10, 2015

  1. Add examples for #workday?

    ramontayag committed Dec 10, 2015
    Configuration menu
    Copy the full SHA
    35aaacb View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2016

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

Commits on Jan 27, 2016

  1. Update bundler before travis

    Kenta Suzuki committed Jan 27, 2016
    Configuration menu
    Copy the full SHA
    95e1010 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2016

  1. Merge pull request bokmann#120 from dugjason/feature/issue-83

    Fixes for issues bokmann#36, bokmann#45 and bokmann#83 (bug in business_days.before/after)
    bokmann committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    731dac8 View commit details
    Browse the repository at this point in the history
  2. Merge pull request bokmann#122 from aelogica/readme_workday

    Add examples for `#workday?`
    bokmann committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    a07a0ac View commit details
    Browse the repository at this point in the history
  3. Merge pull request bokmann#123 from crowdworks/fix_bundler

    Update bundler before travis builds
    bokmann committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    791fc05 View commit details
    Browse the repository at this point in the history
  4. Merge pull request bokmann#121 from dugjason/feature/inclusive-busine…

    …ss_days_until
    
    Adds support for inclusive results from business_days_until() method
    bokmann committed Feb 3, 2016
    Configuration menu
    Copy the full SHA
    11095ec View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. Configuration menu
    Copy the full SHA
    43f637f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7488cc3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    26afba9 View commit details
    Browse the repository at this point in the history
  4. Adds the gitmessage to the repo.

    I love this feature!  Why didn't I know this existed before?
    bokmann committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    dfb7cd7 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2016

  1. Revises the copyright dates in the license

    I didn't really need to do this, but it served as a useful example.
    bokmann committed Mar 22, 2016
    Configuration menu
    Copy the full SHA
    4c468bd View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2016

  1. Configuration menu
    Copy the full SHA
    0351d3d View commit details
    Browse the repository at this point in the history
  2. Updates copyright.

    Really, I'm just testing to see if the git status hooks actually do
    something useful.
    bokmann committed Apr 5, 2016
    Configuration menu
    Copy the full SHA
    fb4cab3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a866119 View commit details
    Browse the repository at this point in the history
  4. Merge pull request bokmann#127 from bokmann/feature/copyright_update

    Updates Activesupport version and internal version prepping for release.
    bokmann committed Apr 5, 2016
    Configuration menu
    Copy the full SHA
    6a8a483 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2016

  1. Fix timezone inconsistencies

    When you use Time.parse, you get a Time object back; when
    you use Time.zone.parse, you get a TimeWithZone. The code
    should preserve the timezone _on this time object_, not
    re-apply Time.zone, which can change independently of time
    objects.
    
    Added to the misnamed business_time_until_eastern test to demonstrate
    that timezone is preserved in both Time and TimeWithZone objects;
    fixed a failing test in test_calculating_business_duration
    that wrongly assumed that Time.parse objects should follow
    Time.zone.
    Brian Ewins committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    5e799df View commit details
    Browse the repository at this point in the history
  2. Merge pull request bokmann#134 from bazzargh/tzfix

    Fix timezone inconsistencies
    bokmann committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    700fa15 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6a38817 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c16e018 View commit details
    Browse the repository at this point in the history
  5. mend

    bokmann committed Jun 9, 2016
    Configuration menu
    Copy the full SHA
    a7f1b04 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2016

  1. Merge commit 'a7f1b04adb2542593a4c29421c397f00e5c5bf60' into feature/…

    …PT-3440-merge-official-develop
    
    Conflicts:
    	Gemfile.lock
    	business_time.gemspec
    	lib/business_time/business_days.rb
    	lib/business_time/core_ext/date.rb
    	lib/business_time/version.rb
    	test/test_business_time_until_eastern.rb
    dlozano committed Aug 2, 2016
    Configuration menu
    Copy the full SHA
    040ca0b View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2016

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

Commits on Aug 8, 2016

  1. Merge pull request #4 from kantox/feature/PT-3440-merge-official-develop

    Feature/pt 3440 merge official develop
    dlozano authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    0789e87 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    560b2e3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6fde2be View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    484ef39 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e8f241c View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8dddf1d View commit details
    Browse the repository at this point in the history
  7. Removed after action in test

    Already done at test_helper
    dlozano committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    3d668ad View commit details
    Browse the repository at this point in the history
  8. Merge pull request #3 from kantox/feature/PT-3440-parse-holidays-on-l…

    …oading
    
    Parse holidays on config loading
    dlozano authored Aug 8, 2016
    Configuration menu
    Copy the full SHA
    e8f0113 View commit details
    Browse the repository at this point in the history
  9. Bumped 0.8.2

    dlozano committed Aug 8, 2016
    Configuration menu
    Copy the full SHA
    644c684 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2024

  1. WIP

    dlozano committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    793d82a View commit details
    Browse the repository at this point in the history
  2. WIP

    dlozano committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    76286f3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2ff8faa View commit details
    Browse the repository at this point in the history
  4. Added CODEOWNERS

    dlozano committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    3c7ba24 View commit details
    Browse the repository at this point in the history
  5. Push beta

    dlozano committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    9e8b85c View commit details
    Browse the repository at this point in the history
  6. Merge branch 'feature/SR-1396-add-ci-and-loosen-activesupport-require…

    …ment' into feature/SR-0000-incorporate-0.8-2-improvements
    dlozano committed Jun 25, 2024
    Configuration menu
    Copy the full SHA
    b3f4d11 View commit details
    Browse the repository at this point in the history