Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.4.0 update from2.3.2 #1308

Merged
merged 27 commits into from
Nov 10, 2016
Merged

2.4.0 update from2.3.2 #1308

merged 27 commits into from
Nov 10, 2016

Commits on Nov 5, 2016

  1. prepare for 2.3.0 (#1271)

    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    46989c3 View commit details
    Browse the repository at this point in the history

  2. reusing gettext family

    @DawoudIO
    DawoudIO committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    565ba50 View commit details
    Browse the repository at this point in the history

  3. fix #1273 and upgrade to 2.3.1

    @crossan007
    crossan007 committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    2f969ea View commit details
    Browse the repository at this point in the history

  4. better code

    @crossan007
    crossan007 committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    5a1a808 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1274 from ChurchCRM/2.3.1-fix-1273 

    fix #1273 and upgrade to 2.3.1
    @crossan007
    crossan007 authored Nov 5, 2016
    Configuration menu
    Copy the full SHA
    b0c372d View commit details
    Browse the repository at this point in the history

  6. prep 2.3.1.

    @crossan007
    crossan007 committed Nov 5, 2016
    Configuration menu
    Copy the full SHA
    0e6dabd View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1275 from ChurchCRM/2.3.1-prep 

    prep 2.3.1.
    @crossan007
    crossan007 authored Nov 5, 2016
    Configuration menu
    Copy the full SHA
    277a735 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2016

  1. fix #1276

    @crossan007
    crossan007 committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    4828b78 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1277 from ChurchCRM/2.3.1-fix-1276 

    fix #1276
    @crossan007
    crossan007 authored Nov 6, 2016
    Configuration menu
    Copy the full SHA
    efc1d62 View commit details
    Browse the repository at this point in the history

  3. rev to 2.3.2 (#1278)

    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Nov 6, 2016
    Configuration menu
    Copy the full SHA
    ffa03dd View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2016

  1. fix 1285

    @crossan007
    crossan007 committed Nov 7, 2016
    Configuration menu
    Copy the full SHA
    0180750 View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2016

  1. Merge pull request #1287 from ChurchCRM/2.3.2-fix-1285 

    fix 1285
    @crossan007
    crossan007 authored Nov 8, 2016
    Configuration menu
    Copy the full SHA
    503842e View commit details
    Browse the repository at this point in the history

  2. standardize on utf8mb4 (#1294)

    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    a2925be View commit details
    Browse the repository at this point in the history

  3. un-localize the conditional statement (#1296)

    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Nov 8, 2016
    Configuration menu
    Copy the full SHA
    c8e5918 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2016

  1. added notes tab to person view (#1299) 

    resolves #1266
    @bradgearon @DawoudIO
    bradgearon authored and DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    46d8468 View commit details
    Browse the repository at this point in the history

  2. Header HTML #1262 (#1288) 

    Header HTML #1262
    @bradgearon @DawoudIO
    bradgearon authored and DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    e444a30 View commit details
    Browse the repository at this point in the history

  3. 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
    @mdande @DawoudIO
    mdande authored and DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    6e51543 View commit details
    Browse the repository at this point in the history

  4. add null check

    @DawoudIO
    DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    6fb9107 View commit details
    Browse the repository at this point in the history

  5. Will list people who are members or Regular Attender

    @DawoudIO
    DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    f25cbc5 View commit details
    Browse the repository at this point in the history

  6. 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
    @bradgearon @DawoudIO
    bradgearon authored and DawoudIO committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    efbac6a View commit details
    Browse the repository at this point in the history

  7. update messages.po

    @crossan007
    crossan007 committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    52afe6c View commit details
    Browse the repository at this point in the history

  8. add French localization

    @crossan007
    crossan007 committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    bbc5ca6 View commit details
    Browse the repository at this point in the history

  9. move to 2.3.3

    @crossan007
    crossan007 committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    5c3e03f View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Merge pull request #1301 from ChurchCRM/fixed-kidsWithoutClasses 

    Will list people who are members or Regular Attender
    @crossan007
    crossan007 authored Nov 10, 2016
    Configuration menu
    Copy the full SHA
    6ed5f6a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1300 from ChurchCRM/fix-#1285-v2 

    add null check #1285
    @crossan007
    crossan007 authored Nov 10, 2016
    Configuration menu
    Copy the full SHA
    b9c75af View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1304 from ChurchCRM/2.3.3-starting 

    move to 2.3.3
    @crossan007
    crossan007 authored Nov 10, 2016
    Configuration menu
    Copy the full SHA
    51596f4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into 2.4.0-update-from2.3.2 

    # Conflicts:
#	CHANGELOG.md
#	build.properties
#	src/composer.json
#	src/locale/messages.po
#	src/mysql/upgrade.json
    @crossan007
    crossan007 committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    bf125a4 View commit details
    Browse the repository at this point in the history