First merge to include EPHEMERIS scheme #2

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

Open

fraserw wants to merge 592 commits into opencadc:main from fraserw:master

Collaborator

fraserw commented Apr 24, 2020

This includes the basic seemingly operational ephemeris-scheme target

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/facilities/lco.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/utils.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/utils.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_observations/utils.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_targets/templatetags/targets_extras.py Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_targets/templatetags/targets_extras.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_targets/templatetags/targets_extras.py Outdated Show resolved Hide resolved

jburke-cadc reviewed

View reviewed changes

tom_targets/templatetags/targets_extras.py Outdated Show resolved Hide resolved

dmcollom and others added 16 commits

August 27, 2020 16:35


          Added some boilerplate for configuring more specific parts of observa…

309ce17

…tion payloads


          Updated specseq form to be 100% complete

76b2237


          Fixed issue with slit

793e495


          Merge branch 'feature/specseqform' into feature/ui_fixes

cabcf5e


          Removing cache bypass

445358a


          Fixed sorting for all forms

1ef6949


          Adding padding to forms so they look less bad

a5d1a1b


          Fixing two new Codacy issues

70bf3c8


          Merge pull request TOMToolkit#319 from TOMToolkit/feature/ui_fixes

e992935

Feature/ui fixes


          Made PR changes from Lindy's feedback, just a little late

aded2b0


          Fixing merge conflict

8da37c2


          Fixed merge conflicts

8c8e113


          Adding unused import

6e53c32


          Merge branch 'master' into development

fd90d2e


          Merge pull request TOMToolkit#320 from TOMToolkit/development

ba18245

Development


          Bump django from 3.1.0 to 3.1.1

8bc0e12

Bumps [django](https://github.com/django/django) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.1...3.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

dmcollom and others added 30 commits

November 13, 2020 13:45


          Added release notes to top level and put a note in

1c3b74e


          Merge pull request TOMToolkit#382 from TOMToolkit/feature/release_bra…

b54cf50

…nches

Added release notes to top level and put a note in


          Merge branch 'development' into feature/remove_tom_publications

331609a


          Merge pull request TOMToolkit#383 from TOMToolkit/feature/remove_tom_…

a81840b

…publications

Removed tom_publications


          Merge branch 'master' into development

b6dab2f


          Fixing merge conflict

a7ca4b3


          Merge branch 'development' into fix/lasair_form_validation

dd60fde


          Merge pull request TOMToolkit#384 from TOMToolkit/development

ff23e99

Development


          Merge pull request TOMToolkit#380 from TOMToolkit/fix/lasair_form_val…

4a11285

…idation

Added form validation to Lasair and added basic tests


          Merge branch 'master' into development

e40a4da


          Merge pull request TOMToolkit#385 from TOMToolkit/development

Development


          Merge branch 'master' into master

100c0f9


          Merge pull request TOMToolkit#364 from blancmatter/master

41dbba5

bugfix/fix-key-issue-tns-alerts


          Added 2.0 release notes

8d008df


          Merge branch 'master' of github.com:TOMToolkit/tom_base

463f3f2


          Updated travis for renaming of dev branch

651c5d9


          Renamed main branch in travis

574303b


          Making codacy happy and removing references to master in the docs

5144ffe


          Update README.md

12d3c3e


          Merge branch 'main' into dev

5ef5c42


          More modifications to release notes style

a788323


          Fixing merge conflicts in travisfile

275f159


          --changes to reflect updated Aladin view for MOPS and tiler testing.

88fc6db


          --adding missing files

b9e3b4a


          conflict ahndling for merge with v2.0 true_origin master


          --the conflict handling didn't take for some rason.

f14154d


          --fixed a dataproducts load bug

2effc1a


          -- testing that I can still commit and push

a469127


          -- a lot of stuff so D. can see what's going wrong

457ed9b


          --the tiler view and aladin display now work in observation:create view

b32d557

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet