Merge branch 'staging'
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- doc/source/lvem.rst 6 additions, 4 deletionsdoc/source/lvem.rst
- doc/source/web.rst 1 addition, 1 deletiondoc/source/web.rst
- gracedb/buildVOEvent.py 2 additions, 2 deletionsgracedb/buildVOEvent.py
- gracedb/management/commands/create_test_perms_fixtures.py 3 additions, 2 deletionsgracedb/management/commands/create_test_perms_fixtures.py
- gracedb/management/commands/make_histograms.py 4 additions, 4 deletionsgracedb/management/commands/make_histograms.py
- gracedb/models.py 4 additions, 2 deletionsgracedb/models.py
- gracedb/nltime.py 16 additions, 10 deletionsgracedb/nltime.py
- gracedb/query.py 4 additions, 1 deletiongracedb/query.py
- gracedb/reports.py 8 additions, 6 deletionsgracedb/reports.py
- gracedb/templatetags/flash.py 3 additions, 2 deletionsgracedb/templatetags/flash.py
- gracedb/templatetags/timeutil.py 11 additions, 6 deletionsgracedb/templatetags/timeutil.py
- gracedb/view_logic.py 12 additions, 2 deletionsgracedb/view_logic.py
- gracedb/view_utils.py 5 additions, 4 deletionsgracedb/view_utils.py
- gracedb/views.py 25 additions, 12 deletionsgracedb/views.py
- ligoauth/middleware/auth.py 2 additions, 2 deletionsligoauth/middleware/auth.py
- settings/branson.py 0 additions, 247 deletionssettings/branson.py
- settings/default.py 5 additions, 2 deletionssettings/default.py
- settings/test.py 3 additions, 1 deletionsettings/test.py
- templates/gracedb/emo_form_frag.html 2 additions, 1 deletiontemplates/gracedb/emo_form_frag.html
Loading
Please register or sign in to comment