Skip to content

Commit

Permalink
Build/2.8.5 to develop (#2838)
Browse files Browse the repository at this point in the history
* kiosk cleanup

* cleanups

* fixes

* tweaks

* don't show new button yet since it's not connected.

* tweak

* Apply fixes from StyleCI

* styleci

* cleanup crmjsom for kiosks namespace

* cleanup kiosk manager assignments

* stopping for hte night

* kiosk manager works now.

* switching kiosk roles works now.

* Merge pull request #2541 from Adnan0703/highlight-selected-datatable-row

Highlight selected dataTable rows

* 2.8.0 text

* download 2.8.0 from poeditor pre 2.8.0 RC0

* fix SQL errors, and get sql version on bug report

* underp system service

* Apply fixes from StyleCI

* Bug/kiosk loop (#2597)

* tweaks

* kiosk tweaks

* Apply fixes from StyleCI

* merging all 2.8.0 sql

fixes  #2590

* added php 7.1 and 5.6

part of #2348

* only deploy for php 7

* no 5.6 for now

* Explicitly test on Linux

* underp space

* underp space

* temp fix create family

* Don't show error if the jqXHR was aborted. (#2610)

* initial refactor

* Better Filter Methods

* line endings

* Apply fixes from StyleCI

* StyleCI manual patch apply

* add tests

* Standardize on display of FamilyString to disambiguate famililes (#2564)

* sort of works, but it's ugly.  don't merge yet.

* should work, but doesnt.

* fix depositslipeditor

* fixing family search in pledges

* fix search

* cleanup

* fixed bHideFriendDate not taken effect (#2614)

* use SystemConfig::getValue

* using getBooleanValue

* 2.8.0 rc2 locale (#2619)

* chmod +x on scripts

* gen file before RC2

* pre-2.8.0 RC2 download

* closes #2472 (#2620)

* added missing use SystemConfig;

* Apply fixes from StyleCI (#2633)

* closes #2634

* fix group datatables

* fix multi select issue

* email debug

* Apply fixes from StyleCI (#2646)

* move docs to wiki (#2641)

* password types were getting the value of the last setting (#2644)

* fix openlp notifications and event loop performance

* remove debug

* Build/2.8.1 starting (#2658)

* move docs to wiki

* add missing 2.8.1

* fixed type setting (#2649)

fixed type setting, will always set even if it is unknown... and fixed verifyFamily type name

* checking for null (#2653)

* Update composer.json (#2631)

upgrading to the latest version which supports php 5.6 please do note that 4.x of the willdurand/geocoder lib does not support 5.6

* starting 2.8.2

* fixed db upgrades

* Fixed RootPath . /

* added admin user check

* Apply fixes from StyleCI

* uncomment family lat/long update

* after 2.8.1

* updated locale file

* updated from po-editor 2.8.0

* start 2.8.3 (#2676)

* locale-cleanup

parts of #2684

* Apply fixes from StyleCI (#2685)

* month view only show current month events

from #2625

* Apply fixes from StyleCI (#2689)

* Fix Datatable settings

created a common JS datatable settings for all standard datatables to use..

fixed dataTable to DataTable

* Revert "Fix Datatable settings"

This reverts commit 291bf93.

* fixed the download

* updated text

* added en_US

* Apply fixes from StyleCI (#2691)

* hide other month

* sOLPPassword, sNexmoAPISecret does not use Password config type (#2687)

fixes #2674

* remvoed FamilyWorkPhoneTask

* remvoed FamilyWorkPhoneTask (#2699)

* added box-tools

collapse & remove

* Fix DataTable settings (#2693)

* Fix Datatable settings

created a common JS datatable settings for all standard datatables to use..

fixed dataTable to DataTable

* Apply fixes from StyleCI (#2692)

* fixed root issue

* Update Header-function.php

updated locale

* Changes this ![image](https://user-images.githubusercontent.com/11679900/27839664-09ace14e-60c1-11e7-976b-51e46b9f648d.png)

to this:
![image](https://user-images.githubusercontent.com/11679900/27839671-12c08812-60c1-11e7-8ca1-9ecaface2a4f.png)

* moving datatable urls to windows.CRM values

this way it is a single change

* Apply fixes from StyleCI (#2698)

* using locale not lang code

* fixed JS error

* Update CartView.php

* Self Verify Changes v2 (#2702)

* hide fields if empty

* fixed group display

* visit our site now going to new sChurchWebSite value

* added Self Verification to timeline

* now shows M next any age less than 1 year (#2704)

* Update Footer.js

* Starting 2.8.4 (#2713)

* starting 2.8.4

* new message after 2.8.3

* 2.8.4 started...

download from poeditor after .3 was released

* Move docs links to wiki (#2688)

* moving docs/help to wiki

single spot for the URL to be stored and using Statis SystemURls

* updated chat and docs urls

* Update Functions.php (#2730)

* Update InputUtils.php (#2737)

Bug correction for many part : 
- person property
- group property

* Update Functions.php

Update custom phone number for person

* Update GeoPage.php

Problem with strtolower with UTF8 charset

* Update GeoPage.php

Removed getext

* Apply fixes from StyleCI (#2744)

* remove old code

* translate group editor

* update translations

* fix footer.js

* mixxing PHP

* Update Footer.php (#2731)

* extract i18next.t strings from JS files

* revert derp locale

* revert derp locale

* revert derp locale

* fix duplicate keys with msgcat

* add i18n to JS string literals

* Fix Select2 Translation, Grunt Locale Concat task (#2746)

* Update Footer.php

* Apply fixes from StyleCI (#2745)

* cleanup short locale

* move shortLocale to CRM namespace var

* include select2 in concatenated locale.  Closes #2763

* moved fullcalendar to min ver

* removed fullcalendar include

it is now in the footer

and ensure we are waiting for all JS to be ready

* added missing datatable language

* added missing sv select2

* Add i18next function calls to JS string literals (#2766)

* translate group editor

* update translations

* fix footer.js

* mixxing PHP

* extract i18next.t strings from JS files

* revert derp locale

* revert derp locale

* revert derp locale

* fix duplicate keys with msgcat

* add i18n to JS string literals

* added missing datatable language

* using window.CRM.plugin.dataTable (#2762)

* added missing split from 2.7.0

* update versions (#2779)

* updated Query to Look for People WIth Families

and ignore Admin

* ignore admin gender

* ignore admin

* split the name column into a image column

this will move the Group Export: Name has extra "&nbsp " ito its own column

* fixed no address member display (#2788)

* fixed no address memeber display

* Apply fixes from StyleCI (#2787)

* added missing Criteria use

* Update MemberView.js (#2802)

* Update MemberView.js

The js code could not work, the code is in PersonView.php is : 
<a class="btn btn-app bg-maroon" id="delete-person" data-person_name="<?= $person->getFullName()?>" data-person_id="<?= $iPersonID ?>"><i class="fa fa-trash-o"></i> <?= gettext("Delete this Record") ?></a>

It's an id so the code should be : #delete-person and not : .delete-person

* using Id for Delete Person  buttons

* fix sass version

* Update GeoPage.php (#2827)

Little update to be compatible with the translation of the unit Kilometers.

* move JSONKeys. concatenat JSON strings to locale js.  Re-order i18next / footer.js

* update strings.

* cleanup JS translations

* update 2.8.5 tag from POEditor
  • Loading branch information
crossan007 authored and DawoudIO committed Jul 15, 2017
1 parent 8a61a45 commit 3a0cfdc
Show file tree
Hide file tree
Showing 102 changed files with 12,578 additions and 1,939 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:
before_install:
- sudo apt-get update
- sudo apt-get install ruby-full
- sudo gem install sass
- sudo gem install sass -v 3.4.25
- chmod +x ./travis-ci/*.sh
- chmod +x ./scripts/*.sh
- cp BuildConfig.json.example BuildConfig.json
Expand Down
142 changes: 119 additions & 23 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ module.exports = function (grunt) {
'sv': 'sv_SE',
'vi': 'vi_VN',
'zh-CN': 'zh_CN',
'zh-TW': 'zh_TW'
'zh-TW': 'zh_TW',
'en-US': 'en_US'
},
projectFiles: [
'**',
Expand Down Expand Up @@ -163,86 +164,180 @@ module.exports = function (grunt) {
concat: {
options: {
separator: ';\n\n',
banner: '/*! <%= package.version %> <%= grunt.template.today("dd-mm-yyyy") %> */\n'
banner: '/*! <%= package.version %> <%= grunt.template.today("dd-mm-yyyy") %> */\n',
process: function(src, filepath) {
if (filepath.match(/JSONKeys/)){
src = "window.CRM.i18keys = " + src + ";";
}
return '// Source: ' + filepath + '\n' +
"try {"+src+"} catch(e) {}";
},
},
de_DE: {
src: ['node_modules/fullcalendar/dist/locale/de.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.de.js'],
src: [
'locale/JSONKeys/de_DE.json',
'node_modules/fullcalendar/dist/locale/de.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.de.js',
'node_modules/admin-lte/plugins/select2/i18n/de.js'
],
dest: 'src/skin/locale/de_DE.js'
},
en_AU: {
src: ['node_modules/fullcalendar/dist/locale/en-au.js'],
src: [
'locale/JSONKeys/en_AU.json',
'node_modules/fullcalendar/dist/locale/en-au.js'
],
dest: 'src/skin/locale/en_AU.js'
},
en_CA: {
src: ['node_modules/fullcalendar/dist/locale/en-ca.js'],
src: [
'locale/JSONKeys/en_CA.json',
'node_modules/fullcalendar/dist/locale/en-ca.js'
],
dest: 'src/skin/locale/en_CA.js'
},
en_GB: {
src: ['node_modules/fullcalendar/dist/locale/en-gb.js'],
src: [
'locale/JSONKeys/en_GB.json',
'node_modules/fullcalendar/dist/locale/en-gb.js'
],
dest: 'src/skin/locale/en_GB.js'
},
en_US: {
src: [],
dest: 'src/skin/locale/en_US.js'
},
es_ES: {
src: ['node_modules/fullcalendar/dist/locale/es.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.es.js'],
src: [
'locale/JSONKeys/es_ES.json',
'node_modules/fullcalendar/dist/locale/es.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.es.js',
'node_modules/admin-lte/plugins/select2/i18n/es.js'
],
dest: 'src/skin/locale/es_ES.js'
},
fr_FR: {
src: ['node_modules/fullcalendar/dist/locale/fr.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.fr.js'],
src: [
'locale/JSONKeys/fr_FR.json',
'node_modules/fullcalendar/dist/locale/fr.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.fr.js',
'node_modules/admin-lte/plugins/select2/i18n/fr.js'
],
dest: 'src/skin/locale/fr_FR.js'
},
hu_HU: {
src: ['node_modules/fullcalendar/dist/locale/hu.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.hu.js'],
src: [
'locale/JSONKeys/hu_HU.json',
'node_modules/fullcalendar/dist/locale/hu.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.hu.js',
'node_modules/admin-lte/plugins/select2/i18n/hu.js'
],
dest: 'src/skin/locale/hu_HU.js'
},
it_IT: {
src: ['node_modules/fullcalendar/dist/locale/it.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.it.js'],
src: [
'locale/JSONKeys/it_IT.json',
'node_modules/fullcalendar/dist/locale/it.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.it.js',
'node_modules/admin-lte/plugins/select2/i18n/it.js'
],
dest: 'src/skin/locale/it_IT.js'
},
nb_NO: {
src: ['node_modules/fullcalendar/dist/locale/nb.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nb.js'],
src: [
'locale/JSONKeys/nb_NO.json',
'node_modules/fullcalendar/dist/locale/nb.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nb.js',
'node_modules/admin-lte/plugins/select2/i18n/nb.js'
],
dest: 'src/skin/locale/nb_NO.js'
},
nl_NL: {
src: ['node_modules/fullcalendar/dist/locale/nl.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nl.js'],
src: [
'locale/JSONKeys/nl_NL.json',
'node_modules/fullcalendar/dist/locale/nl.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.nl.js',
'node_modules/admin-lte/plugins/select2/i18n/nl.js'
],
dest: 'src/skin/locale/nl_NL.js'
},
pl_PL: {
src: ['node_modules/fullcalendar/dist/locale/pl.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pl.js'],
src: [
'locale/JSONKeys/pl_PL.json',
'node_modules/fullcalendar/dist/locale/pl.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pl.js',
'node_modules/admin-lte/plugins/select2/i18n/pl.js'
],
dest: 'src/skin/locale/pl_PL.js'
},
pt_BR: {
src: ['node_modules/fullcalendar/dist/locale/pt-br.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pt-BR.js'],
src: [
'locale/JSONKeys/pt_BR.json',
'node_modules/fullcalendar/dist/locale/pt-br.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.pt-BR.js',
'node_modules/admin-lte/plugins/select2/i18n/pt-BR.js'
],
dest: 'src/skin/locale/pt_BR.js'
},
ro_RO: {
src: ['node_modules/fullcalendar/dist/locale/ro.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ro.js'],
src: [
'locale/JSONKeys/ro_RO.json',
'node_modules/fullcalendar/dist/locale/ro.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ro.js',
'node_modules/admin-lte/plugins/select2/i18n/ro.js'
],
dest: 'src/skin/locale/ro_RO.js'
},
ru_RU: {
src: ['node_modules/fullcalendar/dist/locale/ru.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ru.js'],
src: [
'locale/JSONKeys/ru_RU.json',
'node_modules/fullcalendar/dist/locale/ru.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.ru.js',
'node_modules/admin-lte/plugins/select2/i18n/ru.js'
],
dest: 'src/skin/locale/ru_RU.js'
},
sq_AL: {
src: ['node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sq.js'],
src: [
'locale/JSONKeys/sq_AL.json',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sq.js'
],
dest: 'src/skin/locale/sq_AL.js'
},
sv_SE: {
src: ['node_modules/fullcalendar/dist/locale/sv.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sv.js'],
src: [
'locale/JSONKeys/sv_SE.json',
'node_modules/fullcalendar/dist/locale/sv.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.sv.js',
'node_modules/admin-lte/plugins/select2/i18n/sv.js'
],
dest: 'src/skin/locale/sv_SE.js'
},
vi_VN: {
src: ['node_modules/fullcalendar/dist/locale/vi.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.vi.js'],
src: [
'locale/JSONKeys/vi_VN',
'node_modules/fullcalendar/dist/locale/vi.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.vi.js',
'node_modules/admin-lte/plugins/select2/i18n/vi.js'
],
dest: 'src/skin/locale/vi_VN.js'
},
zh_CN: {
src: ['node_modules/fullcalendar/dist/locale/zh-cn.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-CN.js'],
src: [
'locale/JSONKeys/zh_CN.json',
'node_modules/fullcalendar/dist/locale/zh-cn.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-CN.js',
'node_modules/admin-lte/plugins/select2/i18n/zh-CN.js'
],
dest: 'src/skin/locale/zh_CN.js'
},
zh_TW: {
src: ['node_modules/fullcalendar/dist/locale/zh-tw.js', 'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-TW.js'],
src: [
'locale/JSONKeys/zh_TW.json',
'node_modules/fullcalendar/dist/locale/zh-tw.js',
'node_modules/admin-lte/plugins/datepicker/locales/bootstrap-datepicker.zh-TW.js',
'node_modules/admin-lte/plugins/select2/i18n/zh-TW.js'
],
dest: 'src/skin/locale/zh_TW.js'
}
},
Expand Down Expand Up @@ -406,7 +501,7 @@ module.exports = function (grunt) {
filters: ["translated"],
tags: '<%= package.version %>',
type: 'key_value_json', // export type (check out the doc)
dest: 'src/locale/?/LC_MESSAGES/messages.js'
dest: 'locale/JSONKeys/?.json'
// grunt style dest files
}
},
Expand Down Expand Up @@ -451,7 +546,7 @@ module.exports = function (grunt) {
});

grunt.registerTask('updateFromPOeditor', 'Description of the task', function (target) {
grunt.config('clean', {pofiles: ["src/locale/*/**/*.po", "src/locale/*/**/*.mo", "src/locale/*/**/*.js"]});
grunt.config('clean', {pofiles: ["src/locale/*/**/*.po", "src/locale/*/**/*.mo", "locale/JSONKeys/*.json"]});
grunt.task.run(['clean:pofiles']);
grunt.loadNpmTasks('grunt-poeditor-ab');
grunt.task.run(['poeditor']);
Expand Down Expand Up @@ -493,4 +588,5 @@ module.exports = function (grunt) {
grunt.loadNpmTasks('grunt-contrib-compress');
grunt.loadNpmTasks('grunt-contrib-rename');
grunt.loadNpmTasks('grunt-curl');
grunt.loadNpmTasks('grunt-poeditor-ab');
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Empty file added locale/JSONKeys/en_US.json
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -1848,7 +1848,6 @@
"Church Address is not Set.": "Dirección de Iglesia no ha sido Definida.",
"Church Name is set to default value": "Nombre de Iglesia está definido con valor por defecto",
"SMTP Server info are blank": "El campo de Servidor de SMTP, se encuentra en blanco.",
"In Church CRM 2.6.0 we will no longer support a work phone for a family": "En Church CRM 2.6.0 no seguiremos soportando un teléfono de trabajo para una familia",
"Your system could be more secure by installing an TLS/SSL Cert.": "Su sistema podría ser más seguro instalando un Certificado TLS/SSL.",
"Missing Classification Data": "Datos de Clasificación Faltantes",
"Missing Classification Data for Some People": "Datos de Clasificación Faltantes para Algunas Personas",
Expand Down Expand Up @@ -1996,6 +1995,8 @@
"Action Confirmation": "Confirmación de Acción",
"Please confirm reset failed login count": "Por favor confirme restablecer la cuenta de ingresos fallidos",
"Password reset for": "Restablecer contraseña para",
"View Active Families": "Ver Familias Activas",
"View Inactive Families": "Ver Familias Inactivas",
"SMTP Server timeout in sec": "Tiempo de espera del Servidor SMTP en segundos",
"Exclude Inactive Families": "Excluir Familias Inactivas",
"The role is already assigned.": "El rol ya fue asignado.",
Expand Down Expand Up @@ -2027,6 +2028,13 @@
"CRITICAL": "CRÍTICO",
"ALERT": "ALERTA",
"EMERGENCY": "EMERGENCIA",
"Title FirstName MiddleName LastName": "Título PrimerNombre SegundoNombre Apellido",
"Title FirstName MiddleInitial. LastName": "Título Nombre InicialSegundoNombre Apellido",
"LastName, Title FirstName MiddleName": "Apellido, Título PrimerNombre SegundoNombre",
"LastName, Title FirstName MiddleInitial": "Apellido, Título PrimerNombre InicialSegundoNombre",
"FirstName MiddleName LastName": "PrimerNombre SegundoNombre Apellido",
"Title FirstName LastName": "Título PrimerNombre Apellido",
"LastName, Title FirstName": "Apellido, Titulo PrimerNombre",
"Event Log severity to write, used by ORM and App Logs": "Log de eventos de gravedad a escribir, usado por ORM y Logs de App",
"Time zone": "Zona horaria",
"Nexmo SMS API Key": "Llave de API Nexmo SMS",
Expand Down Expand Up @@ -2064,5 +2072,16 @@
"Enable New Kiosk Registration": "Activar Nuevo Registro de Quiosco",
"Active Kiosks": "Activar Quioscos",
"I forgot my password": "Olvidé mi contraseña",
"Attendees Checked In": "Asistentes Registrados En"
"Attendees Checked In": "Asistentes Registrados En",
" family": " familia",
"Bank Draft ": "Giro Bancario ",
"Credit Card ": "Tarjeta de Crédito ",
"Disable ": "Desabilitar ",
"Store Private Data at Vanco": "Almacenar Datos Privados en Vanco",
"Cart Functions": "Funciones del Separador",
"Text Cart": "Separador de Texto",
"Your Church's Website": "Sitio Web de su Iglesia",
"Self Verification": "Autoverificación",
"Deactivate": "Desactivar",
"Activate": "Activar"
}
Loading

0 comments on commit 3a0cfdc

Please sign in to comment.