270 Commits

Author SHA1 Message Date
DESKTOP-B5Q2TUL\Win10
cb83387a1c ai popravki blalblab 2022-05-27 10:03:52 +02:00
pero1203
03395fb8cf Popravki in dodana najnovejsa prazna baza za postavitev nove instalacije 2022-05-04 10:19:49 +02:00
Robert
a7b7988b9f Popravek pri narocanju - lastna instalacija 2022-03-04 15:34:51 +01:00
pero1203
9f0388ea20 Arnes - popravek barve linka v footerju 2022-02-16 10:09:47 +01:00
pero1203
c79b1d7afb Merge branch 'master' of https://git.1ka.si/git/1ka 2022-02-07 15:52:57 +01:00
pero1203
a4805a1cb0 Redesign - status dashboard - V DELU 2022-02-07 15:52:28 +01:00
Robert
bff91a9cbe Update drupal 7 modules 2022-02-07 12:10:35 +01:00
Robert
367fbcc84e Update Drupal 2022-02-07 12:10:16 +01:00
tejagerjovic
21ca1eba50 [1KA Arnes] - Sprememba povezav v nogi 2022-02-03 00:10:35 +01: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
pero1203
f8d5ea30e6 Redesign - dodani novi logotipi, dodan logo za lastno namestitev 2022-01-11 14:40:28 +01:00
tejagerjovic
94c6c0a325 Funkcija za polno ime paketa - v delu 2022-01-05 22:44:56 +01:00
pero1203
f150467da6 Redesign - popravek language ikone, zamenjan logo v simple frontend, popravek hover ikone za izvoz 2021-12-28 09:07:12 +01:00
Robert
35d191dad7 Merge branch 'master' of https://git.1ka.si:/git/1ka 2021-12-06 16:04:26 +01:00
Robert
e19456368c Merge branch 'release/produkcija'
# Conflicts:
#	frontend/payments/classes/class.UserAccess.php
2021-12-06 16:04:05 +01:00
Robert
baaa2521cd Nakupovanje: popravek, da oznaci napako, ce je error select 2021-12-06 15:12:09 +01:00
Robert
081558729b Nakupovanje: popravek, da select postavi na ''. 2021-12-06 14:56:06 +01:00
Robert
249b6f88a3 Nakupovanje: Prikazi selec in input readonly glede na drzavo. 2021-12-06 14:42:58 +01:00
pero1203
dacdb2f8e4 Varnostni check emaila in imena pri potrditvi registracije (hack preko katerega je insertalo prazen email) 2021-12-06 12:55:58 +01:00
Robert
ade45676f8 Popravek, da dovoli samo ajax request. 2021-12-04 14:41:36 +01:00
Robert
42bb95cf34 Input polje država 2021-12-04 12:07:52 +01:00
Robert
99adf02df9 Porpavek JS pri posiljanju 2021-12-01 13:59:57 +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
tejagerjovic
acc94c129f Popup alerti - popravki 2021-11-05 11:54:50 +01:00
tejagerjovic
fef494e966 Popup alerti 2021-11-05 08:06:00 +01:00
pero1203
41d86001d6 Prenos vseh globalnih spremenljivk v settings_optional.php v bazo 2021-09-29 10:37:17 +02:00
pero1203
8e09677ab3 Ciscenje stare kode 2021-09-21 12:11:55 +02:00
pero1203
e84018e325 Ciscenje stare kode 2021-09-21 10:45:22 +02:00
pero1203
f6c96dbc7f Ciscenje stare kode 2021-09-20 16:30:13 +02:00
pero1203
4be6dea5d4 Popravljen AAI login, da deluje tudi po spremembi Arnes emaila - POTREBNO TESTIRATI NA AAI 2021-09-01 08:42:42 +02:00
Robert
9eeb2a8dc2 Drupal: popravek css-ja pri poslovnih uporabnikih. 2021-08-19 15:09:31 +02:00
Robert
a32d7a3496 Drupal: popravek css-ja pri nakupu. 2021-08-19 15:07:08 +02:00
Robert
4822b10802 Drupal: popravek css-ja pri nakupu. 2021-08-19 15:01:23 +02:00
Robert
b15763fd6c Drupal: popravek nakupa. 2021-08-18 15:25:10 +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
Robert
52b6940f0b Drupal: popravek mobilnik. 2021-07-28 10:29:08 +02:00
Robert
9fab522faf Drupal: popravek mobilnik. 2021-07-28 09:04:11 +02:00
Robert
2d5f42a365 Drupal: popravek cenika. 2021-07-27 15:55:36 +02:00
tejagerjovic
df0b66e625 Sprememba besedila elementa za nadgradnjo paketa 2021-07-21 11:54:48 +02:00
Robert
7e562be442 Drupal: pri formi polje disabled ne poslje, posredujemo readonly. 2021-07-15 23:36:13 +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
fdd0b91f99 Drupal popravek. 2021-07-12 01:53:35 +02:00