civicrm-core.git
7 years ago(NFC) Fix post upgrade message for 4.7.11
Seamus Lee [Thu, 15 Sep 2016 06:14:12 +0000 (16:14 +1000)]
(NFC) Fix post upgrade message for 4.7.11

7 years agoMerge pull request #9000 from ravi-sharma/dev/CRM-19323
Monish Deb [Thu, 15 Sep 2016 06:00:54 +0000 (11:30 +0530)]
Merge pull request #9000 from ravi-sharma/dev/CRM-19323

(NFC) CRM-19323: Advanced search relationship date clause description…

7 years agoMerge pull request #9035 from totten/master-group-cleanup
Tim Otten [Wed, 14 Sep 2016 23:39:22 +0000 (16:39 -0700)]
Merge pull request #9035 from totten/master-group-cleanup

CRM-17789 - CRM_Custom_Form_Group - Simplify reltype list

7 years agoMerge pull request #9040 from seamuslee001/test_fix
Tim Otten [Wed, 14 Sep 2016 22:06:05 +0000 (15:06 -0700)]
Merge pull request #9040 from seamuslee001/test_fix

(NFC) CRM-19270 Fix contact page ajax test as no array_column in php5.3

7 years agoFix all array_column and switch to collect() function
Seamus Lee [Wed, 14 Sep 2016 21:51:56 +0000 (21:51 +0000)]
Fix all array_column and switch to collect() function

7 years agoFix contact page ajax test as no array_column in php5.3
Seamus Lee [Wed, 14 Sep 2016 21:39:26 +0000 (21:39 +0000)]
Fix contact page ajax test as no array_column in php5.3

7 years agoMerge pull request #9029 from kcristiano/CRM-19279
Tim Otten [Wed, 14 Sep 2016 19:51:24 +0000 (12:51 -0700)]
Merge pull request #9029 from kcristiano/CRM-19279

CRM-19729

7 years agoMerge pull request #8954 from jitendrapurohit/CRM-19270
Monish Deb [Wed, 14 Sep 2016 12:14:08 +0000 (17:44 +0530)]
Merge pull request #8954 from jitendrapurohit/CRM-19270

CRM-19270 - Fix contact reference field filter

7 years agoMerge pull request #8993 from frederickgzmn/patch-1
Yashodha Chaku [Wed, 14 Sep 2016 11:25:50 +0000 (16:55 +0530)]
Merge pull request #8993 from frederickgzmn/patch-1

CRM-19315 - Block ID and PCP ID are bugging result on getPcpDashboardInfo function

7 years agoMerge pull request #8994 from jitendrapurohit/CRM-17681
Yashodha Chaku [Wed, 14 Sep 2016 09:41:59 +0000 (15:11 +0530)]
Merge pull request #8994 from jitendrapurohit/CRM-17681

CRM-17681 - "Master address belongs to" field gives the master addres…

7 years agoMerge pull request #9030 from caleboki/fixed-typeError
Yashodha Chaku [Wed, 14 Sep 2016 08:37:24 +0000 (14:07 +0530)]
Merge pull request #9030 from caleboki/fixed-typeError

CRM-19231 Fixed MultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined

7 years agoMerge pull request #9021 from yashodha/CRM-19222
Yashodha Chaku [Wed, 14 Sep 2016 04:51:33 +0000 (10:21 +0530)]
Merge pull request #9021 from yashodha/CRM-19222

CRM-19222 Export: temp table field length at least 255 for strings

7 years agoMerge pull request #8960 from seamuslee001/validate-switch-composer
Tim Otten [Wed, 14 Sep 2016 04:46:50 +0000 (21:46 -0700)]
Merge pull request #8960 from seamuslee001/validate-switch-composer

CRM-19284 Load Credit Card validation package using composer

7 years agoMerge pull request #8959 from andrew-cormick-dockery/CRM-19283
Tim Otten [Wed, 14 Sep 2016 04:39:20 +0000 (21:39 -0700)]
Merge pull request #8959 from andrew-cormick-dockery/CRM-19283

CRM-19283 - Allow contribution forms to recognise new MasterCard 2-se…

7 years agoCRM_Custom_Form_Group - -1 spaghetti
Tim Otten [Wed, 14 Sep 2016 03:22:48 +0000 (20:22 -0700)]
CRM_Custom_Form_Group - -1 spaghetti

So...  there's a helper function `getContactRelationshipType`
which provided a restricted listing of relationship-types (as they apply
to specific contact types or subtypes).

But what if you wanted the list of relationship-types, without filtering by
contact-type?  You *could* go through and query
eve.ry.sin.gle.contac.ttype.and.cont.act.subty.pe.  And then merge all of
these lists.  And then parse and remerge the strange intermediate format.

Or...  you just load the list you wanted...  directly...  in the format you
wanted...

7 years agoCRM_Core_DAO::fetchMap() - Add helper to return key-value pairs from SQL
Tim Otten [Wed, 14 Sep 2016 03:21:47 +0000 (20:21 -0700)]
CRM_Core_DAO::fetchMap() - Add helper to return key-value pairs from SQL

7 years agoMerge pull request #8503 from seamuslee001/CRM-18651
Tim Otten [Tue, 13 Sep 2016 22:22:36 +0000 (15:22 -0700)]
Merge pull request #8503 from seamuslee001/CRM-18651

CRM 18651 - Add in Option Group and soft validation

7 years agoMerge pull request #9015 from jitendrapurohit/CRM-17789
Tim Otten [Tue, 13 Sep 2016 20:41:50 +0000 (13:41 -0700)]
Merge pull request #9015 from jitendrapurohit/CRM-17789

CRM-17789 - Fix Notice Error on PHP 7

7 years agoCRM-19279: fix formatting issues
Kevin Cristiano [Tue, 13 Sep 2016 15:34:44 +0000 (11:34 -0400)]
CRM-19279: fix formatting issues

7 years agoCRM-19729
Kevin Cristiano [Tue, 13 Sep 2016 15:27:12 +0000 (11:27 -0400)]
CRM-19729

Fix CiviCRM databaseConfig for WordPress.  Default to existing WP database, but allow override.  Thsi will ensure re-check requirements does not overwrite the settings

7 years agoMultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined
Caleb Oki [Tue, 13 Sep 2016 15:23:42 +0000 (16:23 +0100)]
MultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined

7 years agoCRM-19702 - Fix contact reference field filter
jitendrapurohit [Tue, 13 Sep 2016 11:26:11 +0000 (16:56 +0530)]
CRM-19702 - Fix contact reference field filter

7 years agoCRM-19222 Export: temp table field length at least 255 for strings
yashodha [Tue, 13 Sep 2016 10:41:43 +0000 (16:11 +0530)]
CRM-19222 Export: temp table field length at least 255 for strings

----------------------------------------
* CRM-19222: Data too long on export including custom field
  https://issues.civicrm.org/jira/browse/CRM-19222

7 years agoMerge pull request #9020 from yashodha/CRM-19235
Yashodha Chaku [Tue, 13 Sep 2016 09:43:02 +0000 (15:13 +0530)]
Merge pull request #9020 from yashodha/CRM-19235

CRM-19235 : Report locale notice

7 years agoCRM-19235 : Report locale notice
yashodha [Tue, 13 Sep 2016 07:58:35 +0000 (13:28 +0530)]
CRM-19235 : Report locale notice

----------------------------------------
* CRM-19235: Notice related to report permission on localized CiviCRM
  https://issues.civicrm.org/jira/browse/CRM-19235

7 years agoFix up pear-execption-fix as per comment from tim
Seamus Lee [Tue, 13 Sep 2016 05:12:45 +0000 (15:12 +1000)]
Fix up pear-execption-fix as per comment from tim

7 years agoAdd in post composer file to add in civicrm custom comment and test if class_exists...
Seamus Lee [Tue, 13 Sep 2016 01:22:18 +0000 (11:22 +1000)]
Add in post composer file to add in civicrm custom comment and test if class_exists or not

7 years agoupdate to use dev branch to ensure we get the 2bin mastercard changes
Seamus Lee [Fri, 9 Sep 2016 03:49:29 +0000 (13:49 +1000)]
update to use dev branch to ensure we get the 2bin mastercard changes

7 years agoCRM-19284 Load Credit Card validation package using composer
Seamus Lee [Wed, 31 Aug 2016 07:28:04 +0000 (17:28 +1000)]
CRM-19284 Load Credit Card validation package using composer

7 years agoMerge pull request #8978 from flaviovs/CRM-19123-merging-contacts-blank-date-fields...
Yashodha Chaku [Tue, 13 Sep 2016 05:29:01 +0000 (10:59 +0530)]
Merge pull request #8978 from flaviovs/CRM-19123-merging-contacts-blank-date-fields-wrong

CRM-19123 - Merging contacts: blank date fields write as 1970

7 years agoMerge pull request #9006 from seamuslee001/remove_debug
Tim Otten [Mon, 12 Sep 2016 20:47:28 +0000 (13:47 -0700)]
Merge pull request #9006 from seamuslee001/remove_debug

NFC remove debugging code mistakenly left in

7 years agoCRM-17789 - Fix Notice Error on PHP 7
jitendrapurohit [Mon, 12 Sep 2016 13:22:46 +0000 (18:52 +0530)]
CRM-17789 - Fix Notice Error on PHP 7

7 years agoImprove code as per comment from Jitendra and exclude activity_type from the check...
Seamus Lee [Fri, 9 Sep 2016 07:27:14 +0000 (17:27 +1000)]
Improve code as per comment from Jitendra and exclude activity_type from the check when saving the option value form and re run regen.sh

7 years agoFix upgrade for multilingual and have strings as string rather than array
Seamus Lee [Wed, 7 Sep 2016 11:24:04 +0000 (21:24 +1000)]
Fix upgrade for multilingual and have strings as string rather than array

7 years agoFix variable issue found by Jitendra
Seamus Lee [Fri, 2 Sep 2016 23:52:41 +0000 (09:52 +1000)]
Fix variable issue found by Jitendra

7 years agomove to static call as per comment from Jitendra and re run regen.sh
Seamus Lee [Fri, 2 Sep 2016 11:41:37 +0000 (21:41 +1000)]
move to static call as per comment from Jitendra and re run regen.sh

7 years agoShift upgrade code to 4.7.12 and re run regen.sh
Seamus Lee [Wed, 31 Aug 2016 00:08:17 +0000 (10:08 +1000)]
Shift upgrade code to 4.7.12 and re run regen.sh

7 years agoShift Upgrade code to php for more stability
Seamus Lee [Thu, 21 Jul 2016 00:20:44 +0000 (10:20 +1000)]
Shift Upgrade code to php for more stability

7 years agoFix up OptionGroup Form
Seamus Lee [Thu, 21 Jul 2016 00:07:20 +0000 (10:07 +1000)]
Fix up OptionGroup Form

7 years agoMove getting dataType into own function and add test of loading data type also minor...
Seamus Lee [Wed, 20 Jul 2016 23:54:33 +0000 (09:54 +1000)]
Move getting dataType into own function and add test of loading data type also minor code changes as suggested on PR

7 years agoShift upgrade script to 4.7.10
Seamus Lee [Wed, 20 Jul 2016 23:25:01 +0000 (09:25 +1000)]
Shift upgrade script to 4.7.10

Re run regen.sh

7 years agoFix up Option Group Check
Seamus Lee [Fri, 2 Sep 2016 11:43:09 +0000 (21:43 +1000)]
Fix up Option Group Check

7 years agoFix up upgrade script and add a system check
Seamus Lee [Wed, 13 Jul 2016 04:58:47 +0000 (04:58 +0000)]
Fix up upgrade script and add a system check

7 years agoAdd in updates to install to set data types for some option groups
Seamus Lee [Wed, 13 Jul 2016 04:58:00 +0000 (04:58 +0000)]
Add in updates to install to set data types for some option groups

7 years agoAdd in updates to install to set data types for some option groups
Seamus Lee [Sat, 18 Jun 2016 02:09:34 +0000 (12:09 +1000)]
Add in updates to install to set data types for some option groups

Fix up upgrade script and add a system check

rerun regen after rebasing

WIP on adding data type for option group

Further work on soft fail when option value value field doesn't match given data type

7 years agoAdd in setting Data Type when option groups are created from custom fields
Seamus Lee [Sun, 5 Jun 2016 13:50:24 +0000 (23:50 +1000)]
Add in setting Data Type when option groups are created from custom fields

7 years agoFurther work on soft fail when option value value field doesn't match given data...
Seamus Lee [Sun, 5 Jun 2016 13:28:34 +0000 (23:28 +1000)]
Further work on soft fail when option value value field doesn't match given data type

7 years agoWIP on adding data type for option group
Seamus Lee [Sun, 5 Jun 2016 09:49:24 +0000 (19:49 +1000)]
WIP on adding data type for option group

7 years ago- Adjustments to fix end date quill.
Ravi Sharma [Sat, 10 Sep 2016 03:45:31 +0000 (09:15 +0530)]
- Adjustments to fix end date quill.

7 years agoMerge pull request #8998 from yashodha/CRM-19271
Yashodha Chaku [Fri, 9 Sep 2016 10:53:44 +0000 (16:23 +0530)]
Merge pull request #8998 from yashodha/CRM-19271

CRM-19271 - Repeat event: cannot repeat an event for more than 3 days…

7 years agofix typo in upgrdae
yashodha [Fri, 9 Sep 2016 09:29:22 +0000 (14:59 +0530)]
fix typo in upgrdae

7 years agoNFC remove debugging code mistakenly left in
Seamus Lee [Fri, 9 Sep 2016 08:03:59 +0000 (18:03 +1000)]
NFC remove debugging code mistakenly left in

7 years agoMerge pull request #9002 from ginkgomzd/patch-2
Yashodha Chaku [Thu, 8 Sep 2016 16:20:55 +0000 (21:50 +0530)]
Merge pull request #9002 from ginkgomzd/patch-2

CRM-19327 - remove invalid SQL character

7 years agoremove invalid SQL character
Michael Z Daryabeygi [Thu, 8 Sep 2016 14:49:54 +0000 (10:49 -0400)]
remove invalid SQL character

resolve issue posted to SE: https://civicrm.stackexchange.com/questions/12647/what-causes-the-sms-system-to-stop-working-and-throw-db-errors

7 years agoMerge pull request #8968 from yashodha/CRM-19293
Yashodha Chaku [Thu, 8 Sep 2016 10:47:14 +0000 (16:17 +0530)]
Merge pull request #8968 from yashodha/CRM-19293

CRM-19293: Dashboard options disappear after CiviContribute Component…

7 years agoFixes CRM-19323: Advanced search relationship date clause descriptions are inaccurate.
Ravi Sharma [Thu, 8 Sep 2016 09:40:34 +0000 (15:10 +0530)]
Fixes CRM-19323: Advanced search relationship date clause descriptions are inaccurate.

7 years agoCRM-19293: Dashboard options disappear after CiviContribute Component Settings save
yashodha [Thu, 8 Sep 2016 08:23:32 +0000 (13:53 +0530)]
CRM-19293: Dashboard options disappear after CiviContribute Component Settings save

----------------------------------------
* CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
  https://issues.civicrm.org/jira/browse/CRM-19293

7 years agoCRM-19293: Dashboard options disappear after CiviContribute Component Settings save
yashodha [Thu, 1 Sep 2016 10:13:30 +0000 (15:43 +0530)]
CRM-19293: Dashboard options disappear after CiviContribute Component Settings save

----------------------------------------
* CRM-19293: Dashboard options disappear after CiviContribute Component Settings save
  https://issues.civicrm.org/jira/browse/CRM-19293

7 years agoCRM-19271: schema changes reflected in DAO
yashodha [Thu, 8 Sep 2016 07:11:16 +0000 (12:41 +0530)]
CRM-19271: schema changes reflected in DAO

----------------------------------------
* CRM-19271: Repeat event: cannot repeat an event for more than 3 days
  https://issues.civicrm.org/jira/browse/CRM-19271

7 years agoCRM-19271 - Repeat event: cannot repeat an event for more than 3 days(handled upgrade...
yashodha [Thu, 8 Sep 2016 03:55:22 +0000 (09:25 +0530)]
CRM-19271 - Repeat event: cannot repeat an event for more than 3 days(handled upgrade as well)

----------------------------------------
* CRM-19271: Repeat event: cannot repeat an event for more than 3 days
  https://issues.civicrm.org/jira/browse/CRM-19271

7 years agoMerge pull request #8995 from code-wizard/master
Yashodha Chaku [Thu, 8 Sep 2016 03:48:24 +0000 (09:18 +0530)]
Merge pull request #8995 from code-wizard/master

Issue #CRM-19271 Fixed:  Repeat event: cannot repeat an event for more than 3 days

7 years agoMerge pull request #8991 from nielosz/fix-getMailingGroupIds-unknown-var
Yashodha Chaku [Thu, 8 Sep 2016 03:06:53 +0000 (08:36 +0530)]
Merge pull request #8991 from nielosz/fix-getMailingGroupIds-unknown-var

CRM-19322 - Fix unitialized table name var

7 years agoMerge pull request #8929 from twomice/CRM-19240
Mathieu Lutfy [Wed, 7 Sep 2016 21:03:45 +0000 (17:03 -0400)]
Merge pull request #8929 from twomice/CRM-19240

Fix CRM-19240

7 years agoMerge pull request #8961 from jmcclelland/CRM-19286
Yashodha Chaku [Wed, 7 Sep 2016 10:14:07 +0000 (15:44 +0530)]
Merge pull request #8961 from jmcclelland/CRM-19286

CRM-19286 - civicrm_survey is used by CiviCampaign and should be allo…

7 years agoCRM-17681 - "Master address belongs to" field gives the master address id rather...
jitendrapurohit [Wed, 7 Sep 2016 09:37:38 +0000 (15:07 +0530)]
CRM-17681 - "Master address belongs to" field gives the master address id rather than the contact name

7 years agoMerge pull request #8949 from jitendrapurohit/CRM-19262
Yashodha Chaku [Wed, 7 Sep 2016 09:40:44 +0000 (15:10 +0530)]
Merge pull request #8949 from jitendrapurohit/CRM-19262

CRM-19262 - Fix offline Pay Now Functionality

7 years agoMerge pull request #8970 from jitendrapurohit/CRM-19263
Yashodha Chaku [Wed, 7 Sep 2016 09:39:22 +0000 (15:09 +0530)]
Merge pull request #8970 from jitendrapurohit/CRM-19263

CRM-19263

7 years agoEdit the xml/schema/Core/ActionSechule.xml. Change start_action_condition character...
Ebuka Amaefula [Wed, 7 Sep 2016 09:35:55 +0000 (15:05 +0530)]
Edit the xml/schema/Core/ActionSechule.xml. Change start_action_condition character length from 32 to 62

7 years agoMerge pull request #8829 from monishdeb/CRM-19172
Yashodha Chaku [Wed, 7 Sep 2016 09:33:47 +0000 (15:03 +0530)]
Merge pull request #8829 from monishdeb/CRM-19172

CRM-19172: on behalf form + user account creation attempts to create user for org

7 years agoUpdate Mailing.php
nielosz [Wed, 7 Sep 2016 08:08:25 +0000 (10:08 +0200)]
Update Mailing.php

7 years agoBlock ID and PCP ID are bugging result on getPcpDashboardInfo function
Frederic Guzman [Tue, 6 Sep 2016 20:02:39 +0000 (16:02 -0400)]
Block ID and PCP ID are bugging result on getPcpDashboardInfo function

Now you can peek, this query is looking for PCP in database, and showing all tables of civicrm_pcp and civicrm_pcp_block, this include their "ID", it can be fail because depend the configuration of database server the result, i mean, the server will select between pcp_block's(table) ID or pcp's(table) ID(In my case, my database server, selected the block ID instead of PCP ID), it's bad because pcp(table) and pcp_block(table) they has the same ID field name, but, it's good structure schema in database, the problem is the query, and can be solve.

7 years agoMerge pull request #8989 from civicrm/4.7.11-rc
Tim Otten [Tue, 6 Sep 2016 19:43:31 +0000 (12:43 -0700)]
Merge pull request #8989 from civicrm/4.7.11-rc

4.7.11 rc

7 years agoCRM-19286 - add unit test to avoid future problems with surveys.
Jamie McClelland [Tue, 6 Sep 2016 15:12:02 +0000 (11:12 -0400)]
CRM-19286 - add unit test to avoid future problems with surveys.

7 years agoCRM-19286 - civicrm_survey is used by CiviCampaign and should be allowed.
Jamie McClelland [Wed, 31 Aug 2016 13:04:53 +0000 (09:04 -0400)]
CRM-19286 - civicrm_survey is used by CiviCampaign and should be allowed.

7 years agoreturn to the contrib edit form
jitendrapurohit [Tue, 6 Sep 2016 11:32:10 +0000 (17:02 +0530)]
return to the contrib edit form

7 years agoChange button name and amount
jitendrapurohit [Tue, 6 Sep 2016 05:45:00 +0000 (11:15 +0530)]
Change button name and amount

7 years agoadditional fix for offline pay now
jitendrapurohit [Tue, 6 Sep 2016 10:12:06 +0000 (15:42 +0530)]
additional fix for offline pay now

7 years agoFix unitialized table name var
nielosz [Tue, 6 Sep 2016 09:47:15 +0000 (11:47 +0200)]
Fix unitialized table name var

7 years agoMerge pull request #8979 from ergonlogic/dev/CRM-19306
Tim Otten [Mon, 5 Sep 2016 21:46:54 +0000 (14:46 -0700)]
Merge pull request #8979 from ergonlogic/dev/CRM-19306

Fixes CRM-19306: Fix documentation for upload directories in civicrm.…

7 years agoMerge pull request #8973 from seamuslee001/CRM-19301
Tim Otten [Mon, 5 Sep 2016 20:04:02 +0000 (13:04 -0700)]
Merge pull request #8973 from seamuslee001/CRM-19301

CRM-19301 fix dashboard upgrade for multilingual sites

7 years agoMerge pull request #8981 from colemanw/ApiExplorer
colemanw [Sun, 4 Sep 2016 15:58:12 +0000 (11:58 -0400)]
Merge pull request #8981 from colemanw/ApiExplorer

ApiExplorer - Fix formatting of getvalue return field

7 years agoCRM-19291 Fix up eileen's fix for multilingual use practice from 4.6.0 to use first...
Seamus Lee [Fri, 2 Sep 2016 23:46:15 +0000 (09:46 +1000)]
CRM-19291 Fix up eileen's fix for multilingual use practice from 4.6.0 to use first locale for name

7 years agoEnsure new column is added to base table when fixing up dashboard and rebuild multili...
Seamus Lee [Fri, 2 Sep 2016 22:14:31 +0000 (08:14 +1000)]
Ensure new column is added to base table when fixing up dashboard and rebuild multilingual structure afterwads

7 years agoRebuild localisation schema after dropping column
Seamus Lee [Fri, 2 Sep 2016 22:06:19 +0000 (08:06 +1000)]
Rebuild localisation schema after dropping column

7 years agoCRM-19301 fix dashboard upgrade for multilingual sites
Seamus Lee [Fri, 2 Sep 2016 08:17:32 +0000 (18:17 +1000)]
CRM-19301 fix dashboard upgrade for multilingual sites

7 years agoApiExplorer - Fix formatting of getvalue return field
Coleman Watts [Sun, 4 Sep 2016 01:26:17 +0000 (21:26 -0400)]
ApiExplorer - Fix formatting of getvalue return field

7 years agoFixes CRM-19306: Fix documentation for upload directories in civicrm.settings.php...
Christopher Gervais [Sat, 3 Sep 2016 19:35:41 +0000 (15:35 -0400)]
Fixes CRM-19306: Fix documentation for upload directories in civicrm.settings.php template.

7 years agoFix some Coding Standards whitespace violations
Flávio Veloso [Fri, 2 Sep 2016 23:31:59 +0000 (16:31 -0700)]
Fix some Coding Standards whitespace violations

7 years agoCRM-19123 Merging contacts: blank date fields write as 1970
Flávio Veloso [Fri, 2 Sep 2016 22:26:23 +0000 (15:26 -0700)]
CRM-19123 Merging contacts: blank date fields write as 1970

----------------------------------------
* CRM-19123: Merging contacts: blank date fields write as 1970
  https://issues.civicrm.org/jira/browse/CRM-19123

7 years agoadditional fixes for pay later
jitendrapurohit [Fri, 2 Sep 2016 08:35:22 +0000 (14:05 +0530)]
additional fixes for pay later

7 years agoadditional fixes
jitendrapurohit [Fri, 2 Sep 2016 07:01:32 +0000 (12:31 +0530)]
additional fixes

7 years agoAdditional fixes
jitendrapurohit [Thu, 1 Sep 2016 12:00:12 +0000 (17:30 +0530)]
Additional fixes

7 years agoMerge pull request #8967 from seamuslee001/CRM-19291
Eileen McNaughton [Fri, 2 Sep 2016 02:37:03 +0000 (14:37 +1200)]
Merge pull request #8967 from seamuslee001/CRM-19291

CRM-19291 put Eileen's fix into upgrade script

7 years agoMerge pull request #8965 from seamuslee001/CRM-19290
Tim Otten [Thu, 1 Sep 2016 23:18:15 +0000 (16:18 -0700)]
Merge pull request #8965 from seamuslee001/CRM-19290

CRM-19290 Fix date creation in Karma test

7 years agoCRM-19291 put Eileen's fix into upgrade script
Seamus Lee [Thu, 1 Sep 2016 10:05:32 +0000 (20:05 +1000)]
CRM-19291 put Eileen's fix into upgrade script

7 years agoCRM-19263 - Online Pay Now Fix
jitendrapurohit [Thu, 1 Sep 2016 09:52:09 +0000 (15:22 +0530)]
CRM-19263 - Online Pay Now Fix

7 years agoMerge pull request #8962 from KarinG/patch-1
Yashodha Chaku [Thu, 1 Sep 2016 07:38:49 +0000 (13:08 +0530)]
Merge pull request #8962 from KarinG/patch-1

CRM-19289 - English language/grammar edit

7 years agoCRM-19290 Fix date creation in Karma test
Seamus Lee [Wed, 31 Aug 2016 23:40:25 +0000 (09:40 +1000)]
CRM-19290 Fix date creation in Karma test

7 years agoEnglish grammar edit
Karin Gerritsen [Wed, 31 Aug 2016 17:37:18 +0000 (11:37 -0600)]
English grammar edit

7 years agoMerge pull request #8951 from jitendrapurohit/CRM-19275
Yashodha Chaku [Wed, 31 Aug 2016 09:36:07 +0000 (15:06 +0530)]
Merge pull request #8951 from jitendrapurohit/CRM-19275

CRM-19275 - DB Error on adding priceset when deferred revenue setting…