pero1203
|
708e18d031
|
Update vendor dependencyjev in minify-a na najnovejso verzijo
|
2021-12-08 09:29:40 +01:00 |
|
pero1203
|
0ffc82b55f
|
Merge branch 'master' into release/produkcija
# Conflicts:
# admin/survey/classes/class.Vprasanje.php
# admin/survey/export/latexclasses/class.LatexSurvey.php
# composer.lock
# resources/sass/admin/Settings/navigation.scss
# resources/sass/admin/admin.scss
# resources/sass/admin/basic/basic.scss
# resources/sass/admin/branching/questions/question_box.scss
# resources/sass/admin/branching/toolbox.scss
# resources/sass/admin/comments.scss
# resources/sass/admin/header.scss
# resources/sass/admin/icons/invitation.scss
# resources/sass/admin/icons/modules.scss
# resources/sass/admin/icons/question_edit.scss
# resources/sass/admin/icons/standard.scss
# resources/sass/admin/library.scss
# resources/sass/admin/payments.scss
# resources/sass/admin/publish/invitations.scss
# resources/sass/admin/publish/settings.scss
# resources/sass/admin/users.scss
# resources/sass/main/main/basic.scss
# resources/sass/main/main/content.scss
# resources/sass/main/main_mobile/content.scss
# vendor/composer/autoload_files.php
# vendor/composer/autoload_static.php
# vendor/composer/installed.json
# vendor/maxmind-db/reader/CHANGELOG.md
# vendor/maxmind-db/reader/composer.json
# vendor/maxmind-db/reader/ext/php_maxminddb.h
# vendor/maxmind-db/reader/package.xml
# vendor/maxmind-db/reader/src/MaxMind/Db/Reader/Decoder.php
|
2021-06-05 14:05:41 +02:00 |
|
Peter Hrvatin
|
5c18dbae7c
|
NIJZ modul za radarski graf in tabelo
|
2021-05-01 22:08:09 +02:00 |
|
pero1203
|
5c88662d2b
|
Dodan modul za nijz - radarski graf in tabela na koncu ankete
|
2021-04-26 12:08:01 +02:00 |
|
pero1203
|
fa9dbb0880
|
Vendor naj bo vedno prisoten, drugace ga je pri preklopu branchov vedno potrebno na novo generirati
|
2021-03-01 10:07:03 +01:00 |
|