pero1203
|
9f2926d363
|
Redesign - responsive popravki
|
2022-06-13 11:23:16 +02:00 |
|
pero1203
|
c923749d53
|
Redesign - placljivi elementi
|
2022-06-08 12:16:17 +02:00 |
|
tejagerjovic
|
7926a2fb5f
|
[Redizajn 1KA] - Naročila - v2
|
2022-01-26 23:43:21 +01:00 |
|
tejagerjovic
|
ae93768b65
|
[Redizajn 1KA] - Naročila - v1
1. fieldset s podatki aktivnega paketa
|
2022-01-26 12:04:16 +01:00 |
|
tejagerjovic
|
1dca4bf344
|
[Redizajn 1ka] - začasno za napredne module, če user nima dostopa
|
2022-01-20 12:50:11 +01:00 |
|
tejagerjovic
|
94c6c0a325
|
Funkcija za polno ime paketa - v delu
|
2022-01-05 22:44:56 +01:00 |
|
Robert
|
e19456368c
|
Merge branch 'release/produkcija'
# Conflicts:
# frontend/payments/classes/class.UserAccess.php
|
2021-12-06 16:04:05 +01:00 |
|
Robert
|
16d01a0854
|
Popravekpri varnostnem polju
|
2021-12-01 13:47:57 +01:00 |
|
Robert
|
ae5516931b
|
Popravek za robote, da preverja reCaptcha in varnostno polje
|
2021-12-01 13:22:24 +01:00 |
|
pero1203
|
da85c68417
|
Dokoncan popravek pri paketih - "manjka id uporabnika"
|
2021-11-26 12:10:26 +01:00 |
|
pero1203
|
2b685f78ba
|
Popravek logiranja api klicev na frontendu
|
2021-11-23 08:59:02 +01:00 |
|
pero1203
|
16afe7c66b
|
Popravek napake "Manjka id respondenta" pri placljivih paketih in hashu ankete
|
2021-11-21 20:26:55 +01:00 |
|
pero1203
|
5417da02ce
|
Popravek napake "Manjka id respondenta" pri placljivih paketih in hashu ankete
|
2021-11-21 20:25:52 +01:00 |
|
pero1203
|
41d86001d6
|
Prenos vseh globalnih spremenljivk v settings_optional.php v bazo
|
2021-09-29 10:37:17 +02:00 |
|
pero1203
|
7a164a0848
|
Merge branch 'master' into release/produkcija
# Conflicts:
# long_term_TODO.txt
# readme.md
# resources/sass/admin/branching/library.scss
# resources/sass/admin/dashboard/dashboard.scss
# resources/sass/admin/data/other.scss
# resources/sass/admin/main_page/main_page_base.scss
# resources/sass/admin/mobile/basic.scss
# resources/sass/admin/mobile/header.scss
# resources/sass/admin/mobile/mobile.scss
# resources/sass/admin/mobile/pages/data.scss
# resources/sass/admin/mobile/pages/new_survey.scss
# resources/sass/admin/mobile/responsive_fixes.scss
# resources/sass/admin/navigation.scss
# resources/sass/admin/new_survey_page/no_survey_page.scss
# resources/sass/admin/new_survey_page/right_content.scss
# resources/sass/admin/publish/invitations.scss
# resources/sass/admin/survey_settings/archive.scss
# resources/sass/frontend_simple/basic/basic.scss
# resources/sass/frontend_simple/basic/mobile.scss
# resources/sass/frontend_simple/modules/footer.scss
# resources/sass/frontend_simple/style.scss
|
2021-08-04 10:41:33 +02:00 |
|
tejagerjovic
|
df0b66e625
|
Sprememba besedila elementa za nadgradnjo paketa
|
2021-07-21 11:54:48 +02:00 |
|
pero1203
|
2d50317b9f
|
Dodan api klic za pridobitev podatkov zadnjega narocila uporabnika
|
2021-07-13 10:54:02 +02:00 |
|
pero1203
|
c2d2797783
|
Ugasnjena default drzava Slovenija pri kreiranju narocila (da detektiramo, ce se se kje poslje prazno iz drupala)
|
2021-07-12 10:03:50 +02:00 |
|
Robert
|
98d5223df4
|
Drupal: Poprave v kolikor je drzava prazna.
|
2021-07-09 13:34:04 +02:00 |
|
pero1203
|
cf0f55e19d
|
Pri placilih je default drzava vedno slovenija (ce slucajno ni nastavljena pri api klicu)
|
2021-07-06 10:06:22 +02:00 |
|
pero1203
|
ff070647ba
|
Popravek sklica (brez "1-") na predracunu v cebelici (Goran)
|
2021-06-14 14:37:32 +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
|
9285b4eb39
|
Popravek tabele narocil uporabnika
|
2021-05-27 11:00:53 +02:00 |
|
Robert
|
ee661ac53b
|
Rollback
|
2021-05-21 14:23:33 +02:00 |
|
Robert
|
ebed86c30f
|
Drupal: preveri drzavo glede na IP
|
2021-05-21 14:19:54 +02:00 |
|
Robert
|
0143cef84e
|
Drupal: preveri drzavo glede na IP
|
2021-05-21 13:04:35 +02:00 |
|
pero1203
|
4009ced06c
|
Popravek naslova predracuna pri placilu (cebelica)
|
2021-04-12 14:18:19 +02:00 |
|
pero1203
|
029758631b
|
Dodan id narocila v admin tabelo narocil
|
2021-04-12 12:18:29 +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
|
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
|
f046a24d46
|
Popravek datuma na eracunu
|
2021-02-24 17:46:29 +01:00 |
|
pero1203
|
6c2eb4a4d8
|
Urlencode imena podjetja pri klicu cebelica apija
|
2021-02-19 06:53:52 +01:00 |
|
pero1203
|
59ba8b3932
|
Popravljeno storniranje placila - usvari se novo placilo z negativnim zneskom
|
2021-02-03 10:48:20 +01:00 |
|
pero1203
|
18fd9a5f3f
|
Skrit gumb za rocno dodajanje novega placila - tega ni vec
|
2021-02-01 12:54:42 +01:00 |
|
pero1203
|
dcf54c9ae1
|
Popravek texta v mailu za prejem racuna
|
2021-02-01 12:51:10 +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
|
6a59aed5ec
|
Osnovna struktura za cron za uporabnika po registraciji (emaili zjutraj vsakih nekaj dni)
|
2021-01-28 13:08:18 +01:00 |
|
pero1203
|
b685f0518c
|
Pri sklicevanju na 30. clen je na racunu napisana tudi drzava
|
2021-01-19 11:13:17 +01:00 |
|
pero1203
|
1549b79922
|
Izvoz in uvoz vprasalnika po novem ni zaklenjen na 2ka paket (zacasno do novega leta)
|
2020-12-11 13:39:43 +01:00 |
|
pero1203
|
b59759e733
|
Popravek casa od katerega se uporablja nova cena paketov
|
2020-12-07 11:27:02 +01:00 |
|
pero1203
|
c2295ec15b
|
Popravek cen - pred 7.12 se morajo upostevati stare
|
2020-12-07 11:07:54 +01:00 |
|
pero1203
|
069b95a658
|
Popravek izvoza racuna
|
2020-12-07 09:44:49 +01:00 |
|
pero1203
|
67dd8132c5
|
Popravki noticeov in warningov povezanih z php 7.4
|
2020-12-07 09:43:59 +01:00 |
|
pero1203
|
1fea0b9f5b
|
Popravek generiranja racuna.
|
2020-12-07 09:41:48 +01:00 |
|
pero1203
|
4b7aac2408
|
Api testiranje
|
2020-12-05 12:25:17 +01:00 |
|
pero1203
|
4595f7abdf
|
Popravek izpisa predracuna - preko ajax-a namesto preko api-ja
|
2020-12-05 11:51:24 +01:00 |
|
pero1203
|
0b52faf12d
|
Dodani stolpci v tabeli placil
|
2020-12-05 11:30:03 +01:00 |
|
pero1203
|
4ee425175f
|
Popravek racunanja osneve brez ddv, ce ga odbijamo (api klic check_ddv)
|
2020-12-05 11:28:34 +01:00 |
|
pero1203
|
285dbe4861
|
Popravek api klica za preverjanje ddv - vracamo ddv - true/false in pri preverjanju pocistimo crke iz davcne stevilke
|
2020-12-02 10:49:04 +01:00 |
|