may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
794 Commits 1 Branch 0 Tags
Go to file
Clone
Open with VS Code Open with VSCodium Open with Intellij IDEA
Download ZIP Download TAR.GZ Download BUNDLE
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
admin
Popravljena mobilna navigacija pri podatkih (3. nivo za izvoze, uvoze, izracune)
2021-08-03 10:39:04 +02:00
editors
editor upload https popravek
2021-07-05 14:44:21 +02:00
frontend
Merge branch 'master' into release/produkcija
2021-08-04 10:41:33 +02:00
function
Ciscenje neuporabljenih datotek, kode
2021-06-17 21:57:58 +02:00
lang
Popravljena mobilna navigacija pri podatkih (3. nivo za izvoze, uvoze, izracune)
2021-08-03 10:39:04 +02:00
logs
Zamenjava .keep v .gitignore ter izbris datotek (uploadi/dokumenti, admin/survey/minify)
2020-08-20 11:31:33 +02:00
main
Phishing anketa - nastavljeno da vraca kodo 404
2021-08-03 09:44:25 +02:00
mobileApp
Dodan nov repozitorij
2020-08-14 13:36:36 +02:00
public
Ureejen mobile popup za vprasajcke
2021-08-04 10:02:56 +02:00
sql
Popravek sumnikov pri prevodu diferenciala, opombe na mariadb, popravek prevajanja texta pri besedilu
2021-07-29 10:30:36 +02:00
uploadi
Nov install paket z najnovejsimi popravki (zaradi buga pri uvozu .1ka datoteke)
2021-07-02 11:36:48 +02:00
utils
Skripta za arhiviranje - pognana na testu in nastavljena na arhiviranje v tabele 2
2021-08-03 09:44:00 +02:00
vendor
Merge branch 'master' into release/produkcija
2021-06-05 14:05:41 +02:00
.gitignore
Vendor naj bo vedno prisoten, drugace ga je pri preklopu branchov vedno potrebno na novo generirati
2021-03-01 10:07:03 +01:00
.htaccess.example
Evoli htaccess redirect za nove module
2020-08-18 12:12:06 +02:00
composer.json
Narejen paypal paypalCreateOrder in paypalCaptureOrder
2020-09-09 11:22:20 +02:00
composer.lock
Premaknjena koda za squalo iz modulov v classes
2021-05-05 10:54:27 +02:00
favicon.ico
Dodan nov repozitorij
2020-08-14 13:36:36 +02:00
function.php
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
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 struktura za squalo api - pripravljeno za testiranje
2021-01-29 10:42:13 +01:00
settings.php.example
Dodan nov repozitorij
2020-08-14 13:36:36 +02:00
Description
1KA with Face-to-face additions and tweaks for agencies
590 MiB
Languages
PHP 66.6%
JavaScript 14.2%
CSS 7.5%
R 4.8%
SCSS 4.4%
Other 2.5%