68 Commits

Author SHA1 Message Date
pero1203
9c0b924f7c Popraveki modula volitve 2021-03-19 13:29:58 +01:00
pero1203
8cd7782648 Manjsi popravki izgelda urejanja vprasanj 2021-03-11 16:10:52 +01:00
pero1203
617b8b2f44 Osnova modula za volitve 2021-03-10 11:24:00 +01:00
pero1203
393bf48aaf Merge branch 'master' into release/produkcija
# Conflicts:
#	.gitignore
#	composer.lock
#	resources/sass/admin/branching/branching_collapsed.scss
#	resources/sass/admin/branching/branching_expanded.scss
#	resources/sass/admin/branching/form.scss
#	resources/sass/admin/branching/voting.scss
#	resources/sass/admin/footer.scss
#	resources/sass/admin/icons/standard.scss
#	resources/sass/admin/main_page/survey_list.scss
#	resources/sass/admin/media.scss
#	resources/sass/admin/popup/basic.scss
#	resources/sass/admin/popup/popup.scss
#	resources/sass/admin/users.scss
#	resources/sass/main/main/admin.scss
#	resources/sass/main/main_mobile/content.scss
#	vendor/autoload.php
#	vendor/composer/autoload_files.php
#	vendor/composer/autoload_real.php
#	vendor/composer/autoload_static.php
#	vendor/composer/installed.json
2021-03-06 17:20:12 +01:00
pero1203
6ee43bd9d1 Urejen pregled in dodajanje dodeljenih uporabnikov za admine (po novem lahko dodajajo in brisejo dodeljene uporabnike drugim uporabnikom) 2021-03-02 09:59:52 +01:00
pero1203
4365f528a9 Dodan consulting popup v footer 2021-02-22 12:56:30 +01:00
pero1203
763b8defd8 Preklop na Arnes smtp na AAI instalaciji 2021-02-10 13:15:04 +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
6d590ef3d2 Urejen vmesnik za pregled uporabnikov za managerje (pregled nad uporabniki, omejitev števila računov v pregledu...) 2020-12-10 13:09:02 +01:00
pero1203
6ff02df5e5 Merge branch 'master' into release/produkcija
# Conflicts:
#	composer.lock
#	main/survey/app/Controllers/BodyController.php
#	resources/sass/admin/payments.scss
2020-12-05 12:36:28 +01:00
Peter Hrvatin
b19a964651 Dodano filtriranje narocil po statusu, popravek racunanja DDV (3. drzave ga nimajo), dodan clen za brez DDV na predracun in racun 2020-11-25 10:26:10 +01:00
pero1203
90f7ce9402 Pri produkciji je vkljucen vendor folder in odstranjeni nekateri drugi fili 2020-11-01 07:20:14 +01:00
pero1203
dd75be0d77 Poporavki izgleda admin tabele narocil na mobitelu 2020-09-25 12:12:26 +02:00
pero1203
591d27001f Popravki popupov 2020-08-19 11:02:38 +02:00
pero1203
3cc685c03d Popravki popupov 2020-08-18 14:09:41 +02:00
pero1203
71c132c3a2 Popravki popupov 2020-08-17 10:17:37 +02: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