2.3.3 import2.4.0 develop as 2.3.3 #1330
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Starting 2.4.0
I find more two location and add gettext no it
* Fix SQL auto-install. Cleanup Setup Page in case of absent signatures.json file * remove dead comments * Locantions by saulo #4 more two gettext added * more one gettext * Location and title separation Location and title separation * Update PersonEditor.php * Update SystemService.php * revert from develop
* prepare for 2.3.0 (#1271) * reusing gettext family * fix #1273 and upgrade to 2.3.1 * better code * prep 2.3.1. * fix #1276 * rev to 2.3.2 (#1278) * fix 1285 * standardize on utf8mb4 (#1294) * un-localize the conditional statement (#1296) * added notes tab to person view (#1299) resolves #1266 * Header HTML #1262 (#1288) Header HTML #1262 * Adding Anniversaries to the Calendar (#1298) * Add files via upload Added Wedding dates to Calendar * Add files via upload Added helper functions to get the Wedding Day, Wedding Month, and ViewURI * Add files via upload Created functionality to show Wedding Dates (Anniversary) on the calendar * added missing gettext for lables * fixed wedding date comment * add null check * Will list people who are members or Regular Attender * Fixes 1192 (#1293) * using momentjs for age calculation * return date object in getBirthDate added format age suffix for just the suffix added show age for using momentjs to display age affects #1192 * changed data-birthdate to data-birth-date using momentjs to calc age on Sunday School pages removed PrintAge resolves #1192 * resolving issues in code review * update messages.po * add French localization * move to 2.3.3
* rebase on develop * gettext Date: -> Date * Family Name: * address fields * state * Home Phone * phones * email * more cleanup * more clean up of get text * more cleanup * gender * more cleanup * fixed mailto: * cleanup of gettext * fixed mailto: * gettext cleanup * gettext cleanup
* not files that are in poeditor * fixed spacing * more colon stuff * more locale cleanup * more cleanup * address cleanup
# Conflicts: # src/locale/pt_BR/LC_MESSAGES/messages.mo # src/locale/pt_BR/LC_MESSAGES/messages.po # src/locale/vi_VN/LC_MESSAGES/messages.mo # src/locale/vi_VN/LC_MESSAGES/messages.po
…ter-2.3.3 2.4.0 update develop from master 2.3.3
DawoudIO
added a commit
that referenced
this pull request
Nov 14, 2016
* move logic for verifying version table schema onto the version ORM object (#1322) * 2.3.3 import2.4.0 develop as 2.3.3 (#1330) * Merge bug fixes from master to develop (#1247) * Fix typo in header (#1152) * Update Branching Strategy. * fix 1180 (#1185) * Update messages.po (POEditor.com) * added docker size * Added docker clone counter * update badges * Starting 2.4.0 * unignore everything - just a placeholder. * More two locations (#1267) I find more two location and add gettext no it * Colon clear #2 (#1250) * Fix typo in header (#1152) * Update Branching Strategy. * fix 1180 (#1185) * Update messages.po (POEditor.com) * added docker size * Added docker clone counter * update badges * Colon Clear #2 More some colons out of gettext * Update Dashboard.php * Update SundaySchoolClassView.php * Locations by saulo#4 (#1255) * Fix SQL auto-install. Cleanup Setup Page in case of absent signatures.json file * remove dead comments * Locantions by saulo #4 more two gettext added * more one gettext * Location and title separation Location and title separation * Update PersonEditor.php * Update SystemService.php * revert from develop * Update from 2.3.1 master (#1279) * prepare for 2.3.0 (#1271) * reusing gettext family * fix #1273 and upgrade to 2.3.1 * better code * prep 2.3.1. * fix #1276 * rev to 2.3.2 (#1278) * 2.4.0 update from2.3.2 (#1308) * prepare for 2.3.0 (#1271) * reusing gettext family * fix #1273 and upgrade to 2.3.1 * better code * prep 2.3.1. * fix #1276 * rev to 2.3.2 (#1278) * fix 1285 * standardize on utf8mb4 (#1294) * un-localize the conditional statement (#1296) * added notes tab to person view (#1299) resolves #1266 * Header HTML #1262 (#1288) Header HTML #1262 * Adding Anniversaries to the Calendar (#1298) * Add files via upload Added Wedding dates to Calendar * Add files via upload Added helper functions to get the Wedding Day, Wedding Month, and ViewURI * Add files via upload Created functionality to show Wedding Dates (Anniversary) on the calendar * added missing gettext for lables * fixed wedding date comment * add null check * Will list people who are members or Regular Attender * Fixes 1192 (#1293) * using momentjs for age calculation * return date object in getBirthDate added format age suffix for just the suffix added show age for using momentjs to display age affects #1192 * changed data-birthdate to data-birth-date using momentjs to calc age on Sunday School pages removed PrintAge resolves #1192 * resolving issues in code review * update messages.po * add French localization * move to 2.3.3 * Localization cleanup for colon and case (#1272) * rebase on develop * gettext Date: -> Date * Family Name: * address fields * state * Home Phone * phones * email * more cleanup * more clean up of get text * more cleanup * gender * more cleanup * fixed mailto: * cleanup of gettext * fixed mailto: * gettext cleanup * gettext cleanup * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Poeditor cleanup (#1317) * not files that are in poeditor * fixed spacing * more colon stuff * more locale cleanup * more cleanup * address cleanup * merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features * 2.3.3-update-locale * start 2.3.4 * #1332 fixed * use the db table as the string source for messages.po (#1340) * fixes #1286 #1342 * Grunt for All Skin & New Localization Files (#1335) * now using grunt for build system * using new generated locale files for full calendar * grunt concat now part of the NPM install * adding bootstrap-datepicker to loacle files * download datatables Internationalisation plug-in files * Internationalisation plug-ins file downloads * using correct life cycle for NPM * fixed missing Footer.js * re-name files to match locale * added grunt-contrib-rename * added locale for JS files * added support for datatable lanagles * moved all skin actions to Grunt * adminlte-copy cleanup excluded files during copy of adminlte that we build outside * added package * fix npm version && add demosite script * move signature file creation to grunt * typo! * make JS and PHP treat forward slashes the same. fix gruntfile * updated changelog pre-2.3.4 * 2.3.4 fixes (#1337) * underp class scope and connection references * cleanup QA environment * move prevsiousversion to vagrant-qa * extract DB strings as part of NPM locale-update * use the db table as the string source for messages.po * move to static class for arrayutils * remove header * whitespace * fix line endings * gitignores * fixes #1348 #1347 #1345 #1344 (#1350)
DawoudIO
added a commit
that referenced
this pull request
Nov 14, 2016
* move logic for verifying version table schema onto the version ORM object (#1322) * 2.3.3 import2.4.0 develop as 2.3.3 (#1330) * Merge bug fixes from master to develop (#1247) * Fix typo in header (#1152) * Update Branching Strategy. * fix 1180 (#1185) * Update messages.po (POEditor.com) * added docker size * Added docker clone counter * update badges * Starting 2.4.0 * unignore everything - just a placeholder. * More two locations (#1267) I find more two location and add gettext no it * Colon clear #2 (#1250) * Fix typo in header (#1152) * Update Branching Strategy. * fix 1180 (#1185) * Update messages.po (POEditor.com) * added docker size * Added docker clone counter * update badges * Colon Clear #2 More some colons out of gettext * Update Dashboard.php * Update SundaySchoolClassView.php * Locations by saulo#4 (#1255) * Fix SQL auto-install. Cleanup Setup Page in case of absent signatures.json file * remove dead comments * Locantions by saulo #4 more two gettext added * more one gettext * Location and title separation Location and title separation * Update PersonEditor.php * Update SystemService.php * revert from develop * Update from 2.3.1 master (#1279) * prepare for 2.3.0 (#1271) * reusing gettext family * fix #1273 and upgrade to 2.3.1 * better code * prep 2.3.1. * fix #1276 * rev to 2.3.2 (#1278) * 2.4.0 update from2.3.2 (#1308) * prepare for 2.3.0 (#1271) * reusing gettext family * fix #1273 and upgrade to 2.3.1 * better code * prep 2.3.1. * fix #1276 * rev to 2.3.2 (#1278) * fix 1285 * standardize on utf8mb4 (#1294) * un-localize the conditional statement (#1296) * added notes tab to person view (#1299) resolves #1266 * Header HTML #1262 (#1288) Header HTML #1262 * Adding Anniversaries to the Calendar (#1298) * Add files via upload Added Wedding dates to Calendar * Add files via upload Added helper functions to get the Wedding Day, Wedding Month, and ViewURI * Add files via upload Created functionality to show Wedding Dates (Anniversary) on the calendar * added missing gettext for lables * fixed wedding date comment * add null check * Will list people who are members or Regular Attender * Fixes 1192 (#1293) * using momentjs for age calculation * return date object in getBirthDate added format age suffix for just the suffix added show age for using momentjs to display age affects #1192 * changed data-birthdate to data-birth-date using momentjs to calc age on Sunday School pages removed PrintAge resolves #1192 * resolving issues in code review * update messages.po * add French localization * move to 2.3.3 * Localization cleanup for colon and case (#1272) * rebase on develop * gettext Date: -> Date * Family Name: * address fields * state * Home Phone * phones * email * more cleanup * more clean up of get text * more cleanup * gender * more cleanup * fixed mailto: * cleanup of gettext * fixed mailto: * gettext cleanup * gettext cleanup * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Update messages.mo (POEditor.com) * Update messages.po (POEditor.com) * Poeditor cleanup (#1317) * not files that are in poeditor * fixed spacing * more colon stuff * more locale cleanup * more cleanup * address cleanup * merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features * 2.3.3-update-locale * start 2.3.4 * #1332 fixed * new static class for Countires * added new Church Address Country * added new Church Address Country * country changes - new church Country filed - new field type = country * starting 2.3.4 * new country type * revert * updated to correct sChurchCountry
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
merge 2.4.0 develop into 2.3.3 master AS 2.3.3 for release of new features