Don't import STATIC_URL in admin module

timeline.settings doesn't exist, so this caused an error when trying to
use the app. STATIC_URL should probably be imported from
django.conf.settings instead, but since it isn't even used, avoiding
the import entirely should suffice.
Merge pull request #3 from nybooks/bugfixes

Don't import STATIC_URL in admin module
Resolve merge conflicts in .gitignore file

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
Ignore .egg-info files

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
Make TimelineEvent.end_date a nullable field

The field is allowed to be blank, and thus Django does not require
that it be filled in; however, in the database, is it _not_ a nullable
field, so the database _does_ require that a value be set. This
difference in handling between Django and the database engine creates
an IntegrityError when events are saved without end dates. This commit
removes that problem.

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
No need to catch an exception if it's only going to be raised again

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
Handle timeline PKs that are longs

If a `src` is not specified when calling the `timeline` tag, `timeline`
takes the pk of the variable `timeline` in the current context. This
is generally a long (not an int), but the tag was only handling ints.
This caused an exception in the fallback case, in which it was assumed
that `src` had an `isdigit()` method (probably assuming that `src`
would be a `str` if it was not an `int`).

This commit handles cases in which `src` is a long (perhaps the most
common case), and falls back on converting a string to a long when
necessary.

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
Handle empty end dates for timeline events

End dates can be blank, so use the starting date as the ending date if
one is not specified.

Signed-off-by: Michael Dippery <mdippery@nybooks.com>
Merge pull request #5 from nybooks/isdigit

Handle timeline PKs that are longs
Merge pull request #4 from nybooks/null-end-date

Make TimelineEvent.end_date a nullable field