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 |
|
Robert
|
86d0cb9807
|
Drupal: ob kliku na odjavo odjavi in osvezi stran.
|
2021-03-05 12:52:11 +01:00 |
|
Robert
|
5e4e089b37
|
Drupal: popravek pri ustvari anketo.
|
2021-03-05 11:46:41 +01:00 |
|
Robert
|
ee0b820dfc
|
Drupal: popravki pri odpiranju AAI pojavnega okna in prikazu optimiziranih slik.
|
2021-03-05 11:21:24 +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 |
|
Robert
|
5a1c2df73f
|
Drupal: optimizacija slik na webp
|
2021-02-05 10:38:23 +01:00 |
|
Robert
|
740157b6ba
|
Drupal: dodan modul Modernizer
|
2021-02-05 10:37:56 +01:00 |
|
Robert
|
5c8d6b4c17
|
Drupal: če je uporabnik prijavljen, prestavi 1ka navbar nižje.
|
2021-02-04 13:48:53 +01:00 |
|
Robert
|
edd044da4e
|
Drupal: pri angleski verziji ni opcije nazaj pri prijavi in registraciji.
|
2021-02-04 13:15:12 +01:00 |
|
Robert
|
c0ceac6f86
|
Drupal: core update version 7.78
|
2021-02-04 12:31:05 +01:00 |
|
Robert
|
a8e2b9b4fd
|
Drupal: modules update Search API, ctools
|
2021-02-04 12:25:21 +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 |
|
Robert
|
8557b6d98e
|
Facebook prijava, pravi api klic.
|
2021-01-28 23:43:13 +01:00 |
|
Robert
|
fe70ac4e9e
|
FAcebook prijava popravek.
|
2021-01-28 23:16:00 +01:00 |
|
Robert
|
43ec8e76cb
|
FAcebook prijava popravek.
|
2021-01-28 22:22:43 +01:00 |
|
Robert
|
96478bb2cc
|
Drupal: popravek pri angleski prijavi in registraciji, da direktno odpre modal brez AAI obvestila
|
2021-01-28 22:00:36 +01:00 |
|
Robert
|
367e78d00a
|
Drupal: poslovni uporabniki, sprememba gumba.
|
2021-01-28 20:18:31 +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
|
483730305b
|
Popravki emailov ce mora admin potrditi registracijo.
|
2021-01-22 12:28:04 +01:00 |
|
pero1203
|
b685f0518c
|
Pri sklicevanju na 30. clen je na racunu napisana tudi drzava
|
2021-01-19 11:13:17 +01:00 |
|
Robert
|
f49f92adf3
|
Drupal: popravki prijave.
|
2021-01-15 12:30:51 +01:00 |
|
Robert
|
6e37f3f671
|
Drupal: dodan intro tudi za registracijo in prevod.
|
2021-01-14 16:28:53 +01:00 |
|
Robert
|
73bdbbeb7f
|
Drupal: dodan intro pred prijavo v sistem.
|
2021-01-14 10:12:53 +01:00 |
|
pero1203
|
57e2eb66ec
|
Odstranjena moznost, da je tabela "users" v drugi bazi kot ostale tabele (ostanek Sispleta - global $user_db)
|
2021-01-12 14:08:03 +01:00 |
|
Robert
|
ad550e0afe
|
Drupal: add missing modules
|
2021-01-08 11:55:00 +01:00 |
|
Robert
|
3dcf246bda
|
Add FB pixel
|
2021-01-08 11:48:31 +01:00 |
|
Robert
|
47f470167e
|
Popravki noge html
|
2021-01-08 10:50:41 +01:00 |
|
Robert
|
cb0b9e0502
|
Popravki deadlink, ker slik v css-ju ne uporabljamo
|
2021-01-08 10:50:20 +01:00 |
|
Robert
|
87f7508a72
|
Drupal: telefonska pomoč popup
|
2020-12-21 11:10:47 +01:00 |
|
Robert
|
426f523195
|
Fix: Odstranimo AAI odjavo specifično za 1ka.si, ker se več ne uporablja. Ostane samo splošna AAI odjava, če je vklopljena.
|
2020-12-16 08:56:59 +01:00 |
|
Robert
|
1d830a55df
|
Drupal: popravek cenika pri posameznikih.
|
2020-12-14 16:04:28 +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
|
5c1f84e8c9
|
Popravek zaklepanja prijave glede na ip
|
2020-12-11 11:54:40 +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 |
|
Robert
|
61a194dcb9
|
Drupal: update core 7.77
|
2020-12-06 20:45:26 +01:00 |
|
Robert
|
952071c7bc
|
Drupal: manjši popravki.
|
2020-12-06 19:59:09 +01:00 |
|
Robert
|
6b72c5a52d
|
Drupal: popravki poslovi
|
2020-12-05 22:47:59 +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
|
8713f0214c
|
Merge branch 'master' of https://bitbucket.org/1ka/1ka
|
2020-12-05 11:30:46 +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 |
|