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 |
|
Robert
|
93784a51af
|
Dodan help za sass compile
|
2021-06-03 14:46:40 +02:00 |
|
Robert
|
a5a915162f
|
FIX: css popravek, ce gumb ni oznacen.
|
2021-06-03 14:41:19 +02:00 |
|
pero1203
|
6252ee603b
|
Dodana moznost dodajanja kategorije na mobile admin
|
2021-06-03 14:07:45 +02:00 |
|
pero1203
|
231bf1b199
|
Zacetni gumb za dodajanje prvega vprasanja v anketo - mobile admin
|
2021-06-02 10:24:52 +02:00 |
|
pero1203
|
dda66e0fdb
|
Popravek poravnave checkboxa na mobile
|
2021-06-02 09:38:58 +02:00 |
|
pero1203
|
66190cdf5b
|
Popravek knjiznice na mobile admin
|
2021-06-02 09:32:40 +02:00 |
|
pero1203
|
b90c781ce8
|
Popravki izgleda pri mobile admin
|
2021-06-01 08:31:59 +02:00 |
|
pero1203
|
597ec37b9f
|
Popravek kvadratkov s checkboxi pri vabilih in uvozu podatkov
|
2021-05-31 13:05:46 +02:00 |
|
pero1203
|
9a04118aba
|
Popravek knjiznice na mobitelu
|
2021-05-31 12:38:51 +02:00 |
|
pero1203
|
4fb717fa72
|
Dodan gumb za nakup paketa v moje ankete
|
2021-05-27 11:09:42 +02:00 |
|
pero1203
|
f6529c80fb
|
Popravek margina pri mobile urejanju ankete
|
2021-05-27 10:47:07 +02:00 |
|
pero1203
|
215deccf11
|
Prenova dodajanja vprasanja na mobitelu
|
2021-05-26 10:30:19 +02:00 |
|
pero1203
|
d6e5963b4f
|
Manjsi popravki
|
2021-05-25 09:37:42 +02:00 |
|
pero1203
|
1da68d9f17
|
Popravki mobile admina
|
2021-05-24 11:48:27 +02:00 |
|
pero1203
|
a0e14365ed
|
Admin mobile - popravki ustvarjanja ankete
|
2021-05-17 14:33:29 +02:00 |
|
pero1203
|
201d59a9d4
|
V grobem zakljucen mobile admin vmesnik
|
2021-05-17 13:48:31 +02:00 |
|
pero1203
|
46398d0bf1
|
Mobile admin - dokoncan meni, popravki statusa, nastavitev...
|
2021-05-13 11:16:49 +02:00 |
|
pero1203
|
a8b4827f09
|
Mobile admin - meni, popravki - V DELU
|
2021-05-12 13:14:19 +02:00 |
|
pero1203
|
e3957f04d8
|
Mobile admin - V DELU
|
2021-05-07 08:13:44 +02:00 |
|
pero1203
|
51b58a4047
|
Admin mobile - popravki mojih anket, branchinga
|
2021-04-28 13:46:50 +02:00 |
|
pero1203
|
47b3fbded8
|
Manjsi popravki vabil (ikona, default polja), squalo vabila - V DELU
|
2021-04-19 14:29:23 +02:00 |
|
pero1203
|
1d96452e6f
|
Pripravljena osnovna scss struktura za mobilno prilagoditev admin vmesnika
|
2021-04-13 11:11:22 +02:00 |
|
pero1203
|
029758631b
|
Dodan id narocila v admin tabelo narocil
|
2021-04-12 12:18:29 +02:00 |
|
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 |
|