Merge branch 'master' into update/merge_12_into_13 (d4d6c584) · Commits · SMASCH / scheduling-system

Commit d4d6c584 authored 6 years ago by Carlos Vega

Browse files

Merge branch 'master' into update/merge_12_into_13

parents 11fdd013 612c2ae5

No related branches found

No related tags found

1 merge request!208Update/merge 12 into 13

Hide whitespace changes

Inline Side-by-side

Showing

smash/import_file.py 1 addition, 0 deletions

smash/import_file.py
smash/web/api_views/subject.py 4 additions, 1 deletion

smash/web/api_views/subject.py
smash/web/migrations/0135_merge_20181212_1333.py 16 additions, 0 deletions

smash/web/migrations/0135_merge_20181212_1333.py
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.bootstrap.css 167 additions, 0 deletions

...s/datatables/extensions/Buttons/css/buttons.bootstrap.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.bootstrap.min.css 1 addition, 0 deletions

...tatables/extensions/Buttons/css/buttons.bootstrap.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.bootstrap4.css 231 additions, 0 deletions

.../datatables/extensions/Buttons/css/buttons.bootstrap4.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.bootstrap4.min.css 1 addition, 0 deletions

...atables/extensions/Buttons/css/buttons.bootstrap4.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.dataTables.css 365 additions, 0 deletions

.../datatables/extensions/Buttons/css/buttons.dataTables.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.dataTables.min.css 1 addition, 0 deletions

...atables/extensions/Buttons/css/buttons.dataTables.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.foundation.css 200 additions, 0 deletions

.../datatables/extensions/Buttons/css/buttons.foundation.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.foundation.min.css 1 addition, 0 deletions

...atables/extensions/Buttons/css/buttons.foundation.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.jqueryui.css 226 additions, 0 deletions

...ns/datatables/extensions/Buttons/css/buttons.jqueryui.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.jqueryui.min.css 1 addition, 0 deletions

...atatables/extensions/Buttons/css/buttons.jqueryui.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.semanticui.css 180 additions, 0 deletions

.../datatables/extensions/Buttons/css/buttons.semanticui.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/buttons.semanticui.min.css 1 addition, 0 deletions

...atables/extensions/Buttons/css/buttons.semanticui.min.css
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/common.scss 33 additions, 0 deletions

...LTE/plugins/datatables/extensions/Buttons/css/common.scss
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/css/mixins.scss 141 additions, 0 deletions

...LTE/plugins/datatables/extensions/Buttons/css/mixins.scss
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/js/buttons.bootstrap.js 70 additions, 0 deletions

...ins/datatables/extensions/Buttons/js/buttons.bootstrap.js
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/js/buttons.bootstrap.min.js 6 additions, 0 deletions

...datatables/extensions/Buttons/js/buttons.bootstrap.min.js
smash/web/static/AdminLTE/plugins/datatables/extensions/Buttons/js/buttons.bootstrap4.js 63 additions, 0 deletions

...ns/datatables/extensions/Buttons/js/buttons.bootstrap4.js

with 1709 additions and 1 deletion

Please register or to comment