1KA_F2F

Go to file

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

admin

Popravek izpisa predracuna - preko ajax-a namesto preko api-ja

2020-12-05 11:51:24 +01:00

editors

Dodani fili ki so bili po pomoti izkljuceni z gitignore

2020-08-18 11:50:23 +02:00

frontend

Api testiranje

2020-12-05 12:25:17 +01:00

function

Dodani fili ki so bili po pomoti izkljuceni z gitignore

2020-08-18 11:50:23 +02:00

lang

Popravek izpisa predracuna - preko ajax-a namesto preko api-ja

2020-12-05 11:51:24 +01:00

logs

Zamenjava .keep v .gitignore ter izbris datotek (uploadi/dokumenti, admin/survey/minify)

2020-08-20 11:31:33 +02:00

main

Pobrisana zakomentirana koda

2020-12-05 12:00:49 +01:00

mobileApp

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

public

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

resources/sass/admin

Merge branch 'master' into release/produkcija

2020-12-05 12:36:28 +01:00

sql

Popravek sumnikov pri mariadb pri prevodih

2020-12-05 11:30:22 +01:00

uploadi

Pobrisan browscap.ini

2020-11-12 10:34:34 +01:00

utils

Dodan se dockerfile

2020-09-24 13:18:35 +02:00

vendor

Merge branch 'master' into release/produkcija

2020-12-05 12:36:28 +01:00

.gitignore

Pri produkciji je vkljucen vendor folder in odstranjeni nekateri drugi fili

2020-11-01 07:20:14 +01:00

.htaccess.example

Evoli htaccess redirect za nove module

2020-08-18 12:12:06 +02:00

composer.lock

Počiščeni nekateri fili v git-u

2020-11-19 10:36:22 +01:00

favicon.ico

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

function.php

Popravek preusmeritve po paypal nakupu za angleski jezik

2020-10-29 07:40:48 +01:00

index_sa_anketa.php

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

index.php

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

settings_optional.php.example

Dodana moznost blokiranja prijave v admin za dolocene ip-je

2020-11-09 11:37:47 +01:00

settings.php.example

Dodan nov repozitorij

2020-08-14 13:36:36 +02:00

Languages

PHP 66.6%

JavaScript 14.2%

CSS 7.5%

R 4.8%

SCSS 4.4%

Other 2.5%