diff --git a/CHANGELOG b/CHANGELOG
index 0d1b7957322c24e147f4675df9f056e136d09c01..1f0009dc8db16a7229f3a5a373c5273231e43c0b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-smasch (1.0.0~alpha.1-0) unstable; urgency=low
+smasch (1.0.0~alpha.1-1) unstable; urgency=low
* backward incompatible: all ncer/pdp related fields are moved to custom
fields and removed from default setup (#345)
diff --git a/build_deb.sh b/build_deb.sh
index 48a3aafaa294c536d2a0b7fb32f0315fc502a09f..cac2856cf7e99e8bf3ccbeefa2a72fb6dd293e6a 100644
--- a/build_deb.sh
+++ b/build_deb.sh
@@ -30,7 +30,7 @@ echo "STATICFILES_STORAGE = 'django.contrib.staticfiles.storage.StaticFilesStora
npm install
export PYTHONDONTWRITEBYTECODE=1
./manage.py collectstatic
-rm -rf node_modules
+rm -rf node_modules
mv tmp-static/npm node_modules
rm smash/local_settings.py
diff --git a/debian-template/copyright b/debian-template/copyright
index f6a4a29e5bb4360bdc794b0c9cb7532558efd234..d5c35b265f6451a3e9ff36fbe21ff94e950188ae 100644
--- a/debian-template/copyright
+++ b/debian-template/copyright
@@ -2,13 +2,60 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: smasch
Source: https://git-r3lab.uni.lu/NCER-PD/scheduling-system/
-Files: *
+Files: smash/smash/*
+ smash/web/*
+ smash/db_scripts/*
+ smash/package.json
+ smash/package-lock.json
+ requirements.txt
+ requirements-dev.txt
+ debian-files/smasch.py
+ debian-files/smasch.service
+ debian-files/smasch.socket
+ debian-files/logrotate/smasch
+ debian-template/*
+ debian/*
Copyright: 2020 Piotr Gawron piotr.gawron@uni.lu
2020 Carlos Vega carlos.vega@uni.lu
-License: GPL-2+
+License: GPL-3
+
+Files: smash/manage.py
+License: Django
+
+Files: smash/node_modules/admin-lte/*
+ smash/node_modules/awesomplete/*
+ smash/node_modules/bootstrap/*
+ smash/node_modules/datatables.net-bs/*
+ smash/node_modules/datatables.net-buttons-bs/*
+ smash/node_modules/datatables.net-buttons/*
+ smash/node_modules/datatables.net/*
+ smash/node_modules/eonasdan-bootstrap-datetimepicker/*
+ smash/node_modules/font-awesome/*
+ smash/node_modules/fullcalendar/*
+ smash/node_modules/html2canvas/*
+ smash/node_modules/icheck/*
+ smash/node_modules/ionicons/*
+ smash/node_modules/jquery-ui-dist/*
+ smash/node_modules/jquery/*
+ smash/node_modules/jspdf/*
+ smash/node_modules/jszip/*
+ smash/node_modules/moment/*
+ smash/node_modules/pdfmake/*
+License: MIT
+
+Files: smash/node_modules/bootstrap-datepicker/*
+License: Apache-2.0
+
+Files: smash/node_modules/fullcalendar-scheduler/*
+License: GPL-3
+
+Files: smash/node_modules/moment-range/*
+License: Unlicense
+
+License: GPL-3
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
.
This package is distributed in the hope that it will be useful,
@@ -17,8 +64,101 @@ License: GPL-2+
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
- along with this program. If not, see <https://www.gnu.org/licenses/>
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
.
On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
+
+License: Django
+ Copyright (c) Django Software Foundation and individual contributors.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. Neither the name of Django nor the names of its contributors may be used
+ to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+License: MIT
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the “Softwareâ€), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following
+ conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED “AS ISâ€, WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache License, Version 2
+ can be found in "/usr/share/common-licenses/Apache-2.0".
+
+License: Unlicense
+ This is free and unencumbered software released into the public domain.
+ .
+ Anyone is free to copy, modify, publish, use, compile, sell, or
+ distribute this software, either in source code form or as a compiled
+ binary, for any purpose, commercial or non-commercial, and by any
+ means.
+ .
+ In jurisdictions that recognize copyright laws, the author or authors
+ of this software dedicate any and all copyright interest in the
+ software to the public domain. We make this dedication for the benefit
+ of the public at large and to the detriment of our heirs and
+ successors. We intend this dedication to be an overt act of
+ relinquishment in perpetuity of all present and future rights to this
+ software under copyright law.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+ .
+ For more information, please refer to <http://unlicense.org/>
diff --git a/smash/smash/settings.py b/smash/smash/settings.py
index f705fad5559efdb1c0a713212e54ac41c8eb3db0..f5e1896f8f50484cf33cf5e6d1a9cc9d71684e64 100644
--- a/smash/smash/settings.py
+++ b/smash/smash/settings.py
@@ -122,23 +122,23 @@ STATICFILES_FINDERS = [
]
NPM_FILE_PATTERNS = {
- 'admin-lte': ['dist/*', 'LICENSE'],
+ 'admin-lte': ['dist/*'],
'awesomplete': ['awesomplete.css', 'awesomplete.css.map', 'awesomplete.min.js', 'awesomplete.min.js.map'],
- 'bootstrap': ['dist/*', 'LICENSE'],
- 'bootstrap-datepicker': ['dist/*', 'LICENSE'],
- 'datatables.net': ['js/*', 'License.txt'],
- 'datatables.net-bs': ['css/*', 'js/*', 'License.txt'],
- 'datatables.net-buttons': ['js/*', 'License.txt'],
- 'datatables.net-buttons-bs': ['js/*', 'css/*', 'License.txt'],
- 'eonasdan-bootstrap-datetimepicker': ['build/js/*', 'build/css/bootstrap-datetimepicker.*', 'LICENSE'],
+ 'bootstrap': ['dist/*'],
+ 'bootstrap-datepicker': ['dist/*'],
+ 'datatables.net': ['js/*'],
+ 'datatables.net-bs': ['css/*', 'js/*'],
+ 'datatables.net-buttons': ['js/*'],
+ 'datatables.net-buttons-bs': ['js/*', 'css/*'],
+ 'eonasdan-bootstrap-datetimepicker': ['build/js/*', 'build/css/bootstrap-datetimepicker.*'],
'font-awesome': ['css/*', 'fonts/*', 'less/*', 'scss/*'],
- 'fullcalendar': ['dist/*', 'license.txt'],
- 'fullcalendar-scheduler': ['dist/*', 'LICENSE.md'],
- 'html2canvas': ['dist/*', 'LICENSE'],
+ 'fullcalendar': ['dist/*'],
+ 'fullcalendar-scheduler': ['dist/*'],
+ 'html2canvas': ['dist/*'],
'icheck': ['skins/*', 'icheck*'],
- 'ionicons': ['css/*', 'fonts/*', 'less/*', 'png/*', 'scss/*', 'LICENSE'],
+ 'ionicons': ['css/*', 'fonts/*', 'less/*', 'png/*', 'scss/*'],
'jquery': ['dist/*'],
- 'jquery-ui-dist': ['jquery-ui*', 'images/*', 'LICENSE.txt'],
+ 'jquery-ui-dist': ['jquery-ui*', 'images/*'],
'jspdf': ['dist/*'],
'jszip': ['dist/*'],
'moment': ['min/*'],