may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
455 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 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
admin
Merge branch 'master' into release/produkcija
2021-03-06 17:20:12 +01:00
editors
Popravki angleskih prevodov v editorju (upload slike, url)
2021-02-11 09:52:23 +01:00
frontend
Merge branch 'master' into release/produkcija
2021-03-06 17:20:12 +01:00
function
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
lang
Stolpec managerji pri uporabnikih
2021-03-05 13:08:44 +01:00
logs
Zamenjava .keep v .gitignore ter izbris datotek (uploadi/dokumenti, admin/survey/minify)
2020-08-20 11:31:33 +02:00
main
Popravki GDPR - ustrezen prevod popupa, zamik textarea
2021-02-15 10:15:24 +01:00
mobileApp
Dodan nov repozitorij
2020-08-14 13:36:36 +02:00
public
Urejen pregled in dodajanje dodeljenih uporabnikov za admine (po novem lahko dodajajo in brisejo dodeljene uporabnike drugim uporabnikom)
2021-03-02 09:59:52 +01:00
sql
Popravki GDPR prevodov
2021-02-17 13:33:53 +01:00
uploadi
Pobrisan browscap.ini
2020-11-12 10:34:34 +01:00
utils
Lokalno gremo lahko ze kar na php 7.4
2021-01-18 10:03:13 +01:00
vendor
Vendor naj bo vedno prisoten, drugace ga je pri preklopu branchov vedno potrebno na novo generirati
2021-03-01 10:07:03 +01: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
Vendor naj bo vedno prisoten, drugace ga je pri preklopu branchov vedno potrebno na novo generirati
2021-03-01 10:07:03 +01: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%