8 Commits

Author SHA1 Message Date
pero1203
41d86001d6 Prenos vseh globalnih spremenljivk v settings_optional.php v bazo 2021-09-29 10:37:17 +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
41e0905854 Popravki id-ja narocila pri tebeli narocil in naslova predracuna za referenco 2021-04-12 12:12:20 +02: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
0da6b81046 Moznost "placaj eracun" pri narocilih - izda racun z rokom 30 dni (neplacan) in ustvari placilo 2021-02-01 12:45:19 +01:00
pero1203
b685f0518c Pri sklicevanju na 30. clen je na racunu napisana tudi drzava 2021-01-19 11:13:17 +01:00
pero1203
c2295ec15b Popravek cen - pred 7.12 se morajo upostevati stare 2020-12-07 11:07:54 +01:00
pero1203
0fa9693bf9 Dodan nov repozitorij 2020-08-14 13:36:36 +02:00