Skip to content
Snippets Groups Projects
Commit 99f3b962 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'npm-dependencies' into 'master'

versions of npm dependencies must be stricter

See merge request NCER-PD/scheduling-system!298
parents 80e2007c 914eb645
No related branches found
No related tags found
1 merge request!298versions of npm dependencies must be stricter
Pipeline #35783 passed
smasch (1.0.0~beta.2-1) unstable; urgency=low
* bug fix: npm dependencies must be more strict
-- Piotr Gawron <piotr.gawron@uni.lu> Thu, 17 Dec 2020 12:00:00 +0200
smasch (1.0.0~beta.1-1) unstable; urgency=low
* bug fix: python dependencies are not in conflict
......
......@@ -7,29 +7,29 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "GPLv3",
"license": "AGPLv3",
"dependencies": {
"admin-lte": "^2.3.7",
"awesomplete": "^1.1.5",
"bootstrap": "^3.3.6",
"bootstrap-datepicker": "^1.7.0",
"cookieconsent": "^3.1.1",
"datatables.net-bs": "^1.10.22",
"datatables.net-buttons": "^1.6.5",
"datatables.net-buttons-bs": "^1.6.5",
"eonasdan-bootstrap-datetimepicker": "^4.17.47",
"font-awesome": "^4.7.0",
"fullcalendar": "^3.4.0",
"fullcalendar-scheduler": "^1.6.2",
"html2canvas": "^0.5.0-beta3",
"icheck": "^1.0.2",
"ionicons": "^2.0.1",
"jquery": "^2.2.4",
"jquery-ui-dist": "^1.12.1",
"jspdf": "^1.3.2",
"jszip": "^3.5.0",
"moment": "^2.11.2",
"moment-range": "^3.1.1",
"pdfmake": "^0.1.68"
"admin-lte": "~2.3.7",
"awesomplete": "~1.1.5",
"bootstrap": "~3.3.6",
"bootstrap-datepicker": "~1.7.0",
"cookieconsent": "~3.1.1",
"datatables.net-bs": "~1.10.22",
"datatables.net-buttons": "~1.6.5",
"datatables.net-buttons-bs": "~1.6.5",
"eonasdan-bootstrap-datetimepicker": "~4.17.47",
"font-awesome": "~4.7.0",
"fullcalendar": "~3.4.0",
"fullcalendar-scheduler": "~1.6.2",
"html2canvas": "~0.5.0-beta3",
"icheck": "~1.0.2",
"ionicons": "~2.0.1",
"jquery": "~2.2.4",
"jquery-ui-dist": "~1.12.1",
"jspdf": "~1.3.2",
"jszip": "~3.5.0",
"moment": "~2.11.2",
"moment-range": "~3.1.1",
"pdfmake": "~0.1.68"
}
}
......@@ -256,7 +256,7 @@ desired effect
{% block footer %}
<!-- To the right -->
<div class="pull-right hidden-xs">
Version: <strong>1.0.0~beta.1</strong>
Version: <strong>1.0.0~beta.2</strong>
</div>
<!-- Default to the left -->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment