Merge branch 'master' into embb
Conflicts: gracedb/models.py gracedb/urls.py gracedb/views.py manage.py templates/gracedb/event_detail.html
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- gracedb/api.py 2 additions, 0 deletionsgracedb/api.py
- gracedb/forms.py 1 addition, 16 deletionsgracedb/forms.py
- gracedb/models.py 5 additions, 3 deletionsgracedb/models.py
- gracedb/reports.py 17 additions, 11 deletionsgracedb/reports.py
- gracedb/urls.py 4 additions, 2 deletionsgracedb/urls.py
- gracedb/urls_rest.py 3 additions, 1 deletiongracedb/urls_rest.py
- gracedb/views.py 85 additions, 49 deletionsgracedb/views.py
- ligoauth/management/commands/refresh_users_from_ldap.py 10 additions, 1 deletionligoauth/management/commands/refresh_users_from_ldap.py
- manage.py 5 additions, 10 deletionsmanage.py
- settingsdir/branson.py 149 additions, 10 deletionssettingsdir/branson.py
- settingsdir/default.py 7 additions, 3 deletionssettingsdir/default.py
- templates/admin/base_site.html 7 additions, 7 deletionstemplates/admin/base_site.html
- templates/base.html 14 additions, 14 deletionstemplates/base.html
- templates/gracedb/event_detail.html 20 additions, 76 deletionstemplates/gracedb/event_detail.html
- templates/gracedb/event_detail_GRB.html 1 addition, 1 deletiontemplates/gracedb/event_detail_GRB.html
- templates/gracedb/event_filelist.html 15 additions, 0 deletionstemplates/gracedb/event_filelist.html
- templates/gracedb/event_list.html 14 additions, 14 deletionstemplates/gracedb/event_list.html
- templates/gracedb/gstlalcbc_report.html 1 addition, 1 deletiontemplates/gracedb/gstlalcbc_report.html
- templates/gracedb/histogram.html 2 additions, 2 deletionstemplates/gracedb/histogram.html
Loading
Please register or sign in to comment