Merge remote-tracking branch 'gitlab/deploy'
Conflicts: db/Makefile
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- Makefile 28 additions, 9 deletionsMakefile
- db/Makefile 53 additions, 6 deletionsdb/Makefile
- deploy/config/db.makefile 5 additions, 0 deletionsdeploy/config/db.makefile
- deploy/config/path.makefile 1 addition, 0 deletionsdeploy/config/path.makefile
- deploy/phpConfig/database.php 0 additions, 0 deletionsdeploy/phpConfig/database.php
- deploy/phpConfig/general.json 0 additions, 0 deletionsdeploy/phpConfig/general.json
- deploy/phpConfig/menu.json 0 additions, 0 deletionsdeploy/phpConfig/menu.json
- deploy/phpConfig/security.php 0 additions, 0 deletionsdeploy/phpConfig/security.php
- deploy/phpConfig/session.php 0 additions, 0 deletionsdeploy/phpConfig/session.php
- deploy/phpConfig/twig.php 0 additions, 0 deletionsdeploy/phpConfig/twig.php
- deploy/scripts/copy.sh 1 addition, 2 deletionsdeploy/scripts/copy.sh
- deploy/scripts/deploy.sh 0 additions, 30 deletionsdeploy/scripts/deploy.sh
- deploy/scripts/deploy_release.sh 10 additions, 11 deletionsdeploy/scripts/deploy_release.sh
- deploy/scripts/install.sh 0 additions, 30 deletionsdeploy/scripts/install.sh
- deploy/scripts/load_and_copy.sh 4 additions, 16 deletionsdeploy/scripts/load_and_copy.sh
- deploy/scripts/update.sh 4 additions, 9 deletionsdeploy/scripts/update.sh
- gulpfile.js 27 additions, 15 deletionsgulpfile.js
- package.json 5 additions, 12 deletionspackage.json
- ~dev_rating/static/other/teachers.txt 0 additions, 19 deletions~dev_rating/static/other/teachers.txt
Please register or sign in to comment