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.

Sign up for GitHub

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

Jump to bottom

#17 - Support ongoing items, improve range typography. #18

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

#17 - Support ongoing items, improve range typography. #18

wants to merge 6 commits into from

Commits on Sep 21, 2014

  1. sbstjn#17 - Support ongoing items, improve range typography. 

    If the end date is 'present', the bubble will extend to the end of the last year and the label will display an open range (with the correct em-dash). Also changed the closed range (e.g. 2001-2004) to use the correct dash (en).
    @jpgcc
    jpgcc committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    7834cf3 View commit details
    Browse the repository at this point in the history

  2. sbstjn#17 - Improve implementation, so as not to break previous behav… 

    …ior for timelines with ommitted end date
    @jpgcc
    jpgcc committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    c3da863 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2015

  1. Merge branch 'master' of github.com:jpgcc/timesheet.js into open-rang… 

    …e-timelines

Conflicts:
	source/javascripts/timesheet.bubble.js
    João Craveiro committed Mar 13, 2015
    Configuration menu
    Copy the full SHA
    cff3b9d View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2015

  1. Fix merge (remove timesheet.bubble.js)

    João Craveiro committed Mar 16, 2015
    Configuration menu
    Copy the full SHA
    ba7602a View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2015

  1. Fix tests

    @jpgcc
    jpgcc committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    4995959 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix_tests' into open-range-timelines, rebuild.

    @jpgcc
    jpgcc committed Mar 17, 2015
    Configuration menu
    Copy the full SHA
    33f4e0f View commit details
    Browse the repository at this point in the history