333 Commits

Author SHA1 Message Date
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
Robert
57ccd7dc83 Drupal: Poprave v kolikor je drzava prazna. 2021-07-12 00:33:17 +02:00
Robert
5e1874f0af Drupal: Poprave v kolikor je drzava prazna. 2021-07-09 13:44:15 +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
b1941570a9 Ciscenje neuporabljenih datotek, kode 2021-06-17 21:57:58 +02:00
pero1203
f5b33c5369 Cookie notice na simple frontendu je samo na aai 2021-06-16 09:57:47 +02:00
pero1203
525dadd136 Popravek aai simple frontenda - cookie notice, dodana google analytics koda 2021-06-16 09:48:43 +02:00
pero1203
97f129ff65 Cookie notice na simple frontendu (aai) 2021-06-15 14:00:54 +02:00
pero1203
d0070658f9 Merge branch 'master' of https://bitbucket.org/1ka/1ka 2021-06-14 14:37:48 +02:00
pero1203
ff070647ba Popravek sklica (brez "1-") na predracunu v cebelici (Goran) 2021-06-14 14:37:32 +02:00
Robert
90a5b8bd49 Drupal: update drupal core 7.81 2021-06-10 14:28:05 +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
7fef583499 Drupal: popravek poimenovanja 2021-06-04 14:45:11 +02:00
Robert
fee56bb701 Drupal: Popravki besedila. 2021-06-03 14:27:09 +02:00
Robert
0f775595d9 Drupal: popravki menija storitve. 2021-06-03 14:20:05 +02:00
Robert
c9121b53f6 Drupal: slovnicna 2021-05-28 15:10:51 +02:00
Robert
f877f9476e Drupal: Paketi sprememba 2021-05-28 15:06:41 +02:00
pero1203
9285b4eb39 Popravek tabele narocil uporabnika 2021-05-27 11:00:53 +02:00
Robert
51392c687d Drupal: update code 7.80 2021-05-24 15:37:55 +02:00
Robert
e9708f5d4d Drupal: update module - i18n 2021-05-24 15:13:00 +02:00
Robert
3df4aee5ef Drupal: zamenjana povezava - nove funkcionalnosti. 2021-05-24 15:04:06 +02:00
Robert
2b7ad96af1 Drupal: prikaz video vodica tudi na angleski strani. 2021-05-21 15:22:17 +02:00
Robert
acc2f1f01c Fix: popravek pri registraciji vrne v pravem jeziku. 2021-05-21 14:46:26 +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
Robert
4aa8e1752a Drupal: popravek prijave in registracije. 2021-04-30 15:35:33 +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
Robert
7433e5ae50 Drupal: dodan b-lazy na vse slike, ki jih nalagamo in so staticno dodane. 2021-04-01 16:18:58 +02:00
Robert
12552fde28 Drupal: posodobljena celotna knjiznica blazy in modernizer-custom 2021-04-01 16:18:05 +02:00
Robert
155ca2ef58 Drupal: externe JS knjiznice ne agregiramo. 2021-03-22 11:00:43 +01:00
Robert
5e2ff763cd Drupal: update modules (Data, Redirect) 2021-03-22 11:00:10 +01:00
Robert
bf211a43bc Drupal: popravki poslovni uporabniki. 2021-03-22 09:01:42 +01:00
Robert
2ff28682af Drupal: popravki poslovni uporabniki. 2021-03-20 20:40:45 +01:00
Robert
57abe832f0 Drupal: dodan cel master direktorij. 2021-03-19 15:10:09 +01:00