snapshot
Branch: feature/585-track-contract-hour-extensions
Merge branch 'develop' into feature/585-track-contract-hour-extensions

(NOT a working version yet, just committing to complete the merge.)

Conflicts:
	timepiece/admin.py
	timepiece/models.py
	timepiece/templates/timepiece/contract/list.html
	timepiece/templates/timepiece/contract/view.html
	timepiece/tests/base.py

Branch: feature/585-track-contract-hour-extensions
Clean up some more merge detritus
Branch: feature/585-track-contract-hour-extensions
Test fixes, and add migrations to git.

Ticket: #585
Branch: feature/585-track-contract-hour-extensions

Branch: feature/585-track-contract-hour-extensions
80-char lines

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Branch: feature/585-track-contract-hour-extensions
Use a list of accounting emails

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Branch: feature/585-track-contract-hour-extensions
Some settings cleanup

- Rename to TIMEPIECE_ACCOUNTING_EMAILS
- Add TIMEPIECE_EMAILS_USE_HTTPS (default: True)
- Use defaults.py and utils.get_setting()

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Cosmetic improvements

- Add doc for new settings
- Give ContractHour model a decent verbose_name
- Use ContractHour verbose name in email subjects

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Add Mock to test requirements in setup.py

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Merge branch 'develop' into feature/585-track-contract-hour-extensions

Branch: feature/585-track-contract-hour-extensions
Admin-related changes

- Remove separate admin pages for contract assignments and contract hours,
  which are accessible when editing a contract.
- In pending contract hour emails, link to the contract page.
- On the contract page, add an "Edit" link to the contract's admin page
  if the user has contract editing permission.

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Removed unneeded page-title class from contract view header

Ticket: #585
Branch: feature/585-track-contract-hour-extensions
Merge branch 'develop' into feature/585-track-contract-hour-extensions
Convert float to String before creating Decimal
Merge branch 'develop' into feature/585-track-contract-hour-extensions
Removed unused 'slug' field from Business & RelationshipType
Added migration to remove slug fields from Business & RelationshipType
Merge pull request #638 from caktus/cleanup/remove-slug-field

refs #637 - Removed unused 'slug' field from Business & RelationshipType
Merge branch 'develop' into feature/585-track-contract-hour-extensions

Branch: feature/585-track-contract-hour-extensions
Changes suggested by Colin

- Capitalize Pending and Approved
- Remove space between + and pending hours
- Fix None displayed when no approved date

Ticket: #585
Branch: feature/585-track-contract-hour-extensions