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

Update/dev from master #2083

Merged
merged 21 commits into from
Mar 12, 2017
Merged

Update/dev from master #2083

merged 21 commits into from
Mar 12, 2017

Commits on Feb 25, 2017

  1. Updated Default Values

    @DawoudIO
    DawoudIO committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    8497be8 View commit details
    Browse the repository at this point in the history

  2. added select2

    @DawoudIO
    DawoudIO committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    b645b53 View commit details
    Browse the repository at this point in the history

  3. using memeber default & select 2 for country 

    using memeber default city/state & select 2
    @DawoudIO
    DawoudIO committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    99b0c1d View commit details
    Browse the repository at this point in the history

  4. Apply fixes from StyleCI (#1995)

    @DawoudIO
    DawoudIO authored Feb 25, 2017
    Configuration menu
    Copy the full SHA
    6da807d View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2017

  1. Merge pull request #1996 from ChurchCRM/self-reg-defaults 

    Self Registration default values Defaults #1167
    @crossan007
    crossan007 authored Feb 26, 2017
    Configuration menu
    Copy the full SHA
    1565709 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. Add Behat testing (#2010) 

    * underp master vs develop merge

* underps
    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    97acdb2 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2017

  1. start 2.6.1 (#2034) 

    * start 2.6.1

* underp 2.6.1 upgrade.

* don't include unreleased features in the changelog
    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    df0485e View commit details
    Browse the repository at this point in the history

  2. 2.6.1 rev jquery photo uploader (#2035) 

    * start 2.6.1

* underp 2.6.1 upgrade.

* rev photo uploader to 1.0.10
    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Mar 2, 2017
    Configuration menu
    Copy the full SHA
    99f5b76 View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. release window documentation (#2055) 

    * release window doc

* release window doc
    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    9dd5c0c View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. cherry-pick #2061 for Master 2.6.1

    @simonkp @DawoudIO
    simonkp authored and DawoudIO committed Mar 8, 2017
    Configuration menu
    Copy the full SHA
    3c9e539 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 2.6.1-Global-search-box-fixes

    @DawoudIO
    DawoudIO authored Mar 8, 2017
    Configuration menu
    Copy the full SHA
    f04de52 View commit details
    Browse the repository at this point in the history

  3. Update Config.php.example

    @DawoudIO
    DawoudIO authored Mar 8, 2017
    Configuration menu
    Copy the full SHA
    b1b68a5 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2017

  1. Merge pull request #2065 from ChurchCRM/fixed-config-site 

    Update Config.php.example
    @crossan007
    crossan007 authored Mar 11, 2017
    Configuration menu
    Copy the full SHA
    bcb0e6d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into 2.6.1-Global-search-box-fixes

    @crossan007
    crossan007 authored Mar 11, 2017
    Configuration menu
    Copy the full SHA
    267a848 View commit details
    Browse the repository at this point in the history

  3. fix broken search

    @crossan007
    crossan007 committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    8a2a9b5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2063 from ChurchCRM/2.6.1-Global-search-box-fixes 

    cherry-pick #2061 for Master 2.6.1
    @crossan007
    crossan007 authored Mar 11, 2017
    Configuration menu
    Copy the full SHA
    1cf1788 View commit details
    Browse the repository at this point in the history

  5. rev photo uploader to 1.0.11 (#2071)

    @crossan007 @DawoudIO
    crossan007 authored and DawoudIO committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    6c37592 View commit details
    Browse the repository at this point in the history

  6. Member Count Error in Member Dashboard (#1925) 

    * fix membercount error

fix #1924
* Apply left join onn family wher join with person to get the members
without family accounted.
* Also added Links to Family Roles section on membersdashboard.

* Changes to use SystemConfig

using SystemConfig::getValue('sDirRoleChild')
    @simonkp @DawoudIO
    simonkp authored and DawoudIO committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    cbafb7d View commit details
    Browse the repository at this point in the history

  7. PersonView, FamilyView ui changes #1863 (#2026) 

    * PersonView, FamilyView ui changes #1863

closes #1863
changed overlay, added view photo button. added modal for displaying
larger photo, displaying view photo button, using code from Initials.js
if photo exists.

* addressing review comments
    @Adnan0703 @DawoudIO
    Adnan0703 authored and DawoudIO committed Mar 11, 2017
    Configuration menu
    Copy the full SHA
    44caeb0 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2017

  1. Merge branch 'master' into develop 

    # Conflicts:
#	package.json
#	src/api/routes/search.php
#	src/composer.json
#	src/mysql/upgrade.json
    @crossan007
    crossan007 committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    99fab18 View commit details
    Browse the repository at this point in the history

  2. upgrade

    @crossan007
    crossan007 committed Mar 12, 2017
    Configuration menu
    Copy the full SHA
    343e464 View commit details
    Browse the repository at this point in the history