Skip to content

Commit

Permalink
Merge pull request #3186 from 810/master
Browse files Browse the repository at this point in the history
Update Develop into Master
  • Loading branch information
810 committed Jun 8, 2015
2 parents b51ffbb + 64ce1c4 commit b13798d
Show file tree
Hide file tree
Showing 3,477 changed files with 159,860 additions and 71,882 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
17 changes: 9 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
.buildpath
.project
.settings
.externalToolBuilders/build.kunena.2.0.launch
.idea/
build/tmp
components/com_kunena/site/template/**/params.ini
components/com_kunena/site/template/crypsis/css/kunena.css
.buildpath
.project
.settings
.externalToolBuilders/build.kunena.2.0.launch
.idea/
build/tmp
components/com_kunena/site/template/**/params.ini
components/com_kunena/site/template/crypsis/css/kunena.css
Thumbs.db
316 changes: 161 additions & 155 deletions .tx/config
Original file line number Diff line number Diff line change
@@ -1,155 +1,161 @@
[main]
host = https://www.transifex.com
lang_map = af_ZA:af-ZA, ar:ar-AA, az_AZ:az-AZ, bg_BG:bg-BG, bs_BA:bs-BA, ca_ES:ca-ES, cs:cs-CZ, cy_GB:cy-GB, da_DK:da-DK, de_DE:de-DE, el_GR:el-GR, en_GB:en-GB, eo:eo-XX, eu_ES:eu-ES, es_ES:es-ES, et_EE:et-EE, fa_IR:fa-IR, fi_FI:fi-FI, fr:fr-FR, he_IL:he-IL, hi_IN:hi-IN, hr_HR:hr-HR, hu_HU:hu-HU, id_ID:id-ID, it_IT:it-IT, ja_JP:ja-JP, ka_GE:ka-GE, kk:kz-KZ, km_KH:km-KH, kn_IN:kn-IN, ko_KR:ko-KR, ku_IQ:ckb-IQ, lt_LT:lt-LT, lv_LV:lv-LV, mk_MK:mk-MK, ms_MY:ms-MY, nb_NO:nb-NO, nl_NL:nl-NL, pl:pl-PL, pt_BR:pt-BR, pt_PT:pt-PT, ro:ro-RO, ru_RU:ru-RU, sk_SK:sk-SK, sl_SI:sl-SI, sl_SL:sl-SL, sq_AL:sq-AL, sr_RS:sr-RS, sr@latin:sr-YU, sv_SE:sv-SE, ta_IN:ta-IN, th_TH:th-TH, tr_TR:tr-TR, ug:ug-CN, uk_UA:uk-UA, ur_PK:ur-PK, uz:uz-UZ, vi_VN:vi-VN, zh_CN:zh-CN, zh_TW:zh-TW
type = INI

[Kunena.admin-com_kunena-controllers]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.controllers.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.controllers.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-install]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.install.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.install.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-libraries]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.libraries.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.libraries.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-models]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.models.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.models.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-views]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.views.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.views.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_finder_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_finder_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_finder_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_alphauserpoints-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_alphauserpoints.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_alphauserpoints.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_community-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_community.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_community.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_comprofiler-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_comprofiler.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_comprofiler.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_gravatar-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_gravatar.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_gravatar.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_joomla-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_joomla.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_joomla.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_uddeim-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_uddeim.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_uddeim.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-controllers]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.controllers.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.controllers.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-models]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.models.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.models.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-templates]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.templates.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.templates.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-tpl_blue_eagle]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.tpl_blue_eagle.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.tpl_blue_eagle.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-views]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.views.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.views.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-mod_kunenamenu]
file_filter = components/com_kunena/site/language/<lang>/<lang>.mod_kunenamenu.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.mod_kunenamenu.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-mod_kunenamenu-sys]
file_filter = components/com_kunena/site/language/<lang>/<lang>.mod_kunenamenu.sys.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.mod_kunenamenu.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_quickicon_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_quickicon_kunena.sys.ini
source_file = plugins/quickicon/kunena/language/en-GB/en-GB.plg_quickicon_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_system_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_system_kunena.sys.ini
source_file = plugins/system/kunena/language/en-GB/en-GB.plg_system_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[main]
host = https://www.transifex.com
lang_map = af_ZA:af-ZA, ar:ar-AA, ar_SA:ar-SA, az_AZ:az-AZ, bg_BG:bg-BG, bs_BA:bs-BA, ca_ES:ca-ES, cs:cs-CZ, cy_GB:cy-GB, da_DK:da-DK, de_DE:de-DE, el_GR:el-GR, en_GB:en-GB, eo:eo-XX, eu_ES:eu-ES, es_ES:es-ES, es_CO:es-CO, et_EE:et-EE, fa_IR:fa-IR, fi_FI:fi-FI, fr:fr-FR, he_IL:he-IL, hi_IN:hi-IN, hr_HR:hr-HR, hu_HU:hu-HU, hy_AM:hy-AM, id_ID:id-ID, it_IT:it-IT, ja_JP:ja-JP, ka_GE:ka-GE, kk:kz-KZ, km_KH:km-KH, kn_IN:kn-IN, ko_KR:ko-KR, ku_IQ:ckb-IQ, lt_LT:lt-LT, lv_LV:lv-LV, mk_MK:mk-MK, ms_MY:ms-MY, nb_NO:nb-NO, nl_NL:nl-NL, pl:pl-PL, pt_BR:pt-BR, pt_PT:pt-PT, ro:ro-RO, ru_RU:ru-RU, sk_SK:sk-SK, sl_SI:sl-SI, sl_SL:sl-SL, sq_AL:sq-AL, sr_RS:sr-RS, sr@latin:sr-YU, sv_SE:sv-SE, ta_IN:ta-IN, th_TH:th-TH, tr_TR:tr-TR, ug:ug-CN, uk_UA:uk-UA, ur_PK:ur-PK, uz:uz-UZ, vi_VN:vi-VN, zh_CN:zh-CN, zh_TW:zh-TW
type = INI

[Kunena.admin-com_kunena-controllers]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.controllers.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.controllers.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-install]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.install.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.install.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-libraries]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.libraries.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.libraries.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-models]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.models.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.models.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-com_kunena-views]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.com_kunena.views.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.com_kunena.views.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_finder_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_finder_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_finder_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_alphauserpoints-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_alphauserpoints.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_alphauserpoints.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_community-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_community.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_community.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_comprofiler-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_comprofiler.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_comprofiler.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_gravatar-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_gravatar.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_gravatar.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_joomla-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_joomla.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_joomla.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_kunena.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_kunena_uddeim-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_kunena_uddeim.sys.ini
source_file = components/com_kunena/admin/language/en-GB/en-GB.plg_kunena_uddeim.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-controllers]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.controllers.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.controllers.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-models]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.models.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.models.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-templates]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.templates.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.templates.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-tpl_blue_eagle]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.tpl_blue_eagle.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.tpl_blue_eagle.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena_tmpl_crypsis]
file_filter = components/com_kunena/site/language/<lang>/<lang>.kunena_tmpl_crypsis.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.kunena_tmpl_crypsis.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-com_kunena-views]
file_filter = components/com_kunena/site/language/<lang>/<lang>.com_kunena.views.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.com_kunena.views.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-mod_kunenamenu]
file_filter = components/com_kunena/site/language/<lang>/<lang>.mod_kunenamenu.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.mod_kunenamenu.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.site-mod_kunenamenu-sys]
file_filter = components/com_kunena/site/language/<lang>/<lang>.mod_kunenamenu.sys.ini
source_file = components/com_kunena/site/language/en-GB/en-GB.mod_kunenamenu.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_quickicon_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_quickicon_kunena.sys.ini
source_file = plugins/quickicon/kunena/language/en-GB/en-GB.plg_quickicon_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

[Kunena.admin-plg_system_kunena-sys]
file_filter = components/com_kunena/admin/language/<lang>/<lang>.plg_system_kunena.sys.ini
source_file = plugins/system/kunena/language/en-GB/en-GB.plg_system_kunena.sys.ini
source_lang = en-GB
minimum_perc = 80

2 changes: 1 addition & 1 deletion COPYRIGHT.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

Joomla
------
Copyright: 2005 - 2013 Open Source Matters, Inc. All rights reserved.
Copyright: 2005 - 2014 Open Source Matters, Inc. All rights reserved.
License: GPLv2 or later; http://www.gnu.org/licenses/old-licenses/gpl-2.0.html

Bootstrap
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,10 @@

## REQUIREMENTS

*Kunena* 3.0 requires
*Kunena* 4.0 requires

Joomla! 2.5: version 2.5.9 or greater (>= 2.5.28 recommended)
Joomla! 3.0: version 3.0.4 or greater (>= 3.4.1 recommended)
Joomla! 3.1: version 3.1.5 or greater (>= 3.4.1 recommended)
Joomla! 3.2: version 3.2.7 or greater (>= 3.4.1 recommended)
Joomla! 3.3: version 3.3.6 or greater (>= 3.4.1 recommended)
Joomla! 3.4: version 3.4.1 or greater (>= 3.4.1 recommended)
Joomla! 2.5: version 2.5.28 or greater (>= 2.5.28 recommended)
PHP: version 5.3.1 or greater (>= 5.4.31 recommended)
MySQL: version 5.1 or greater (>= 5.5 recommended)

Expand All @@ -31,7 +27,8 @@ In addition we recommend the following PHP settings:

*Kunena* requires the following Joomla settings:

* Mootools 1.4+ compatible template
* Mootools 1.4+ compatible template (Blue Eagle Template)
* Bootstrap 2 compatible template (Crypsis Template)
* Upgraded to latest versions all extensions that claim to integrate with Kunena 2.0 or 3.0
* No plugins or modules that were developed for previous versions of Kunena or Fireboard

Expand All @@ -43,7 +40,7 @@ If you are looking for examples on how *Kunena* works or can be installed, we re

## INSTALLATION

*Kunena* is installed via the Joomla component/extension installer. You may download our releases from joomlacode.org via: http://joomlacode.org/gf/project/kunena/frs/ or from our downloads manager at: http://www.kunena.org/download
*Kunena* is installed via the Joomla component/extension installer. You may download our releases from our downloads page at: http://www.kunena.org/download

The Joomla installers allows you to directly install *Kunena* via package URL or from a local download of yours.

Expand Down
Loading

0 comments on commit b13798d

Please sign in to comment.