10 Commits

Author SHA1 Message Date
pero1203
90a00287e8 Restavrirane pobrisane datoteke iz master brancha (resources, root readme...) 2021-08-12 12:16:05 +02:00
pero1203
fd144d1938 Pobrisani resources iz brancha produkcija 2021-06-05 14:06:53 +02: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
pero1203
6252ee603b Dodana moznost dodajanja kategorije na mobile admin 2021-06-03 14:07:45 +02:00
pero1203
215deccf11 Prenova dodajanja vprasanja na mobitelu 2021-05-26 10:30:19 +02:00
pero1203
8cd7782648 Manjsi popravki izgelda urejanja vprasanj 2021-03-11 16:10:52 +01:00
pero1203
f86fa60cf7 Popravki postavitve, razmakov branching elementov na razlicnih sirinah ekrana (zlasti za formo in glasovanje) 2021-01-20 11:36:34 +01:00
pero1203
90f7ce9402 Pri produkciji je vkljucen vendor folder in odstranjeni nekateri drugi fili 2020-11-01 07:20:14 +01:00
pero1203
ef6ea1c397 Update na najnovejso verzijo 2020-08-14 15:08:59 +02:00
pero1203
0fa9693bf9 Dodan nov repozitorij 2020-08-14 13:36:36 +02:00