civicrm-core.git
7 years agofix previous permission check
David Hayes [Tue, 20 Sep 2016 21:28:48 +0000 (16:28 -0500)]
fix previous permission check

7 years agoremove unnecessary permission check on event info page
David Hayes [Tue, 20 Sep 2016 21:25:23 +0000 (16:25 -0500)]
remove unnecessary permission check on event info page

7 years agoMerge pull request #9079 from jitendrapurohit/CRM-16189noticefix
Monish Deb [Tue, 20 Sep 2016 12:40:56 +0000 (18:10 +0530)]
Merge pull request #9079 from jitendrapurohit/CRM-16189noticefix

CRM-16189 - Notice Fix #8848

7 years agoCRM-16189 - Notice Fix #8848
jitendrapurohit [Tue, 20 Sep 2016 11:46:26 +0000 (17:16 +0530)]
CRM-16189 - Notice Fix #8848

7 years agoMerge pull request #8848 from JMAConsulting/CRM-16189-7
Monish Deb [Tue, 20 Sep 2016 08:48:32 +0000 (14:18 +0530)]
Merge pull request #8848 from JMAConsulting/CRM-16189-7

[ready-for-core-team-review]CRM-16189, freeze revenue recognition date if contribution is associated with participant and only membership

7 years agoMerge pull request #9070 from xurizaemon/tmp-cleanups-20160919a
Monish Deb [Tue, 20 Sep 2016 05:34:34 +0000 (11:04 +0530)]
Merge pull request #9070 from xurizaemon/tmp-cleanups-20160919a

Coding standards / cleanup.

7 years agoMerge pull request #9075 from monishdeb/CRM-19389
Monish Deb [Mon, 19 Sep 2016 20:42:49 +0000 (02:12 +0530)]
Merge pull request #9075 from monishdeb/CRM-19389

CRM-19389: Fatal Error in Forms (4.7.12 Regression)

7 years agofixing identation to 2-space default
Bernardo Araujo [Mon, 19 Sep 2016 20:25:05 +0000 (17:25 -0300)]
fixing identation to 2-space default

7 years agoMerge pull request #9069 from seamuslee001/master
Monish Deb [Mon, 19 Sep 2016 19:42:36 +0000 (01:12 +0530)]
Merge pull request #9069 from seamuslee001/master

CRM-19382 Allow for remote images to be used in invoices

7 years agochanged from using a custom function to get the enabled components to use CRM_Core_Co...
Bernardo Araujo [Mon, 19 Sep 2016 19:18:19 +0000 (16:18 -0300)]
changed from using a custom function to get the enabled components to use CRM_Core_Component::getEnabledComponents

7 years agoCRM-19389: Fatal Error in Forms (4.7.12 Regression)
deb.monish [Mon, 19 Sep 2016 13:35:11 +0000 (19:05 +0530)]
CRM-19389: Fatal Error in Forms (4.7.12 Regression)

7 years agoCRM-19374 - Advanced Search fails on Contribution Receive date filter
jitendrapurohit [Mon, 19 Sep 2016 13:06:11 +0000 (18:36 +0530)]
CRM-19374 - Advanced Search fails on Contribution Receive date filter

7 years agoMerge pull request #9071 from monishdeb/CRM-16189
Monish Deb [Mon, 19 Sep 2016 09:15:04 +0000 (14:45 +0530)]
Merge pull request #9071 from monishdeb/CRM-16189

CRM-16189: additional test improvement dependent on pr-8847

7 years agoCRM-16189: additional test improvement dependent on pr-8847
deb.monish [Mon, 19 Sep 2016 08:09:44 +0000 (13:39 +0530)]
CRM-16189: additional test improvement dependent on pr-8847

7 years agoMerge pull request #8847 from JMAConsulting/CRM-16189-6
Monish Deb [Mon, 19 Sep 2016 08:05:49 +0000 (13:35 +0530)]
Merge pull request #8847 from JMAConsulting/CRM-16189-6

[ready-for-core-team-review]CRM-16189, Added function to check payment associated with contributi…

7 years agoMerge pull request #8852 from bsilvern/CRM-19201
Monish Deb [Mon, 19 Sep 2016 05:46:49 +0000 (11:16 +0530)]
Merge pull request #8852 from bsilvern/CRM-19201

Crm 19201 - Searching/reporting CiviCampaign/CiviCase activities

7 years agoAdd comma on multiline array, reformat some commas.
Chris Burgess [Sun, 18 Sep 2016 23:42:48 +0000 (11:42 +1200)]
Add comma on multiline array, reformat some commas.

7 years agoCRM-19382 Add in Dompdf Options use statement
Seamus Lee [Sun, 18 Sep 2016 21:50:00 +0000 (07:50 +1000)]
CRM-19382 Add in Dompdf Options use statement

7 years agoCRM-19382 Allow for remote images to be used in invoices
Seamus Lee [Sun, 18 Sep 2016 21:46:38 +0000 (07:46 +1000)]
CRM-19382 Allow for remote images to be used in invoices

7 years ago(NFC) ignore downloaded extensions in drupal-demo civibuild
Seamus Lee [Sun, 18 Sep 2016 00:00:08 +0000 (10:00 +1000)]
(NFC) ignore downloaded extensions in drupal-demo civibuild

7 years agoMerge pull request #9039 from totten/master-cleanup-phan
Tim Otten [Sat, 17 Sep 2016 22:24:59 +0000 (15:24 -0700)]
Merge pull request #9039 from totten/master-cleanup-phan

(NFC-ish) Multiple doc block cleanups

7 years agoMerge pull request #8940 from seamuslee001/mollux-php7-master
Tim Otten [Sat, 17 Sep 2016 22:24:30 +0000 (15:24 -0700)]
Merge pull request #8940 from seamuslee001/mollux-php7-master

CRM-17789 - Use mysqli (rebased from mollux/mfb PRs)

7 years agoFixed CRM-19334
Bernardo Araujo [Fri, 16 Sep 2016 22:04:41 +0000 (19:04 -0300)]
Fixed CRM-19334

7 years agoCRM-19377 - avoid static function errors on upgrade.
Jamie McClelland [Fri, 16 Sep 2016 15:08:33 +0000 (11:08 -0400)]
CRM-19377 - avoid static function errors on upgrade.

7 years agoCRM-19376 - ensure is_for_organization data is transferred.
Jamie McClelland [Fri, 16 Sep 2016 14:33:04 +0000 (10:33 -0400)]
CRM-19376 - ensure is_for_organization data is transferred.

In 4.6 -> 4.7 migration the is_for_organization flag from the
contribution table was being lost.

7 years agoCRM-19149 Followup code cleanup as per pradpnayak
Seamus Lee [Fri, 16 Sep 2016 13:40:00 +0000 (23:40 +1000)]
CRM-19149 Followup code cleanup as per pradpnayak

7 years agoMerge pull request #8982 from wahyukodar/master
Yashodha Chaku [Fri, 16 Sep 2016 11:25:07 +0000 (16:55 +0530)]
Merge pull request #8982 from wahyukodar/master

fix https://issues.civicrm.org/jira/browse/CRM-19149

7 years agoMerge pull request #9028 from patelnainesh222/patch-1
Yashodha Chaku [Fri, 16 Sep 2016 09:35:54 +0000 (15:05 +0530)]
Merge pull request #9028 from patelnainesh222/patch-1

CRM-19348 - membership-api: max_related is ignored

7 years agoMerge pull request #8983 from KarinG/CRM-19309
Monish Deb [Fri, 16 Sep 2016 04:54:12 +0000 (10:24 +0530)]
Merge pull request #8983 from KarinG/CRM-19309

repeatTransaction lineItems - includes tests - CRM-19309

7 years agoMerge pull request #9051 from seamuslee001/pcp-copywrite-fix
Yashodha Chaku [Fri, 16 Sep 2016 03:49:12 +0000 (09:19 +0530)]
Merge pull request #9051 from seamuslee001/pcp-copywrite-fix

(NFC) Fix Licence block in pcp test and api files

7 years agoFix licence block in pcptest
Seamus Lee [Thu, 15 Sep 2016 23:44:59 +0000 (09:44 +1000)]
Fix licence block in pcptest

7 years agoFix licence block on pcp api file
Seamus Lee [Thu, 15 Sep 2016 23:43:22 +0000 (09:43 +1000)]
Fix licence block on pcp api file

7 years agoMerge pull request #9049 from ggargani/PCPNewApi
Eileen McNaughton [Thu, 15 Sep 2016 22:58:16 +0000 (10:58 +1200)]
Merge pull request #9049 from ggargani/PCPNewApi

Pcp api

7 years agoDashlet header color tweak
Coleman Watts [Thu, 15 Sep 2016 22:29:29 +0000 (18:29 -0400)]
Dashlet header color tweak

7 years agocivilint run
ggargani [Thu, 15 Sep 2016 21:28:28 +0000 (23:28 +0200)]
civilint run

Fixe style issues

7 years agoPcp api
ggargani [Thu, 15 Sep 2016 21:06:32 +0000 (23:06 +0200)]
Pcp api

Get, Create, Delete method added
Test included

7 years agoMerge pull request #9046 from monishdeb/CRM-19339
Monish Deb [Thu, 15 Sep 2016 17:38:35 +0000 (23:08 +0530)]
Merge pull request #9046 from monishdeb/CRM-19339

CRM-19339: Can't create invoice PDF in Chrome and Firefox, This site …

7 years agoFix for CRM-19371
Michael McAndrew [Thu, 15 Sep 2016 15:13:12 +0000 (16:13 +0100)]
Fix for CRM-19371

7 years agoCRM-19339: Can't create invoice PDF in Chrome and Firefox, This site can't be reached...
deb.monish [Thu, 15 Sep 2016 14:02:59 +0000 (19:32 +0530)]
CRM-19339: Can't create invoice PDF in Chrome and Firefox, This site can't be reached, ERR_INVALID_RESPONSE, File not Found

7 years agoMerge pull request #9023 from lcdservices/CRM-19354
Yashodha Chaku [Thu, 15 Sep 2016 13:16:40 +0000 (18:46 +0530)]
Merge pull request #9023 from lcdservices/CRM-19354

CRM-19354 fix fatal on pdf generation if no trxn_id exists

7 years agoMerge pull request #8697 from eileenmcnaughton/pcp
Eileen McNaughton [Thu, 15 Sep 2016 11:50:46 +0000 (23:50 +1200)]
Merge pull request #8697 from eileenmcnaughton/pcp

CRM-18191 CRM-19064 refactor bizareness from PCP create to enable api…

7 years agofix array indentation
Brian Shaughnessy [Thu, 15 Sep 2016 11:18:09 +0000 (07:18 -0400)]
fix array indentation

7 years agoapi camel case fixes
Seamus Lee [Thu, 15 Sep 2016 11:09:27 +0000 (21:09 +1000)]
api camel case fixes

7 years agoCRM-18191 CRM-19064 refactor bizareness from PCP create to enable api fn.
eileen [Wed, 13 Jul 2016 12:25:10 +0000 (00:25 +1200)]
CRM-18191 CRM-19064 refactor bizareness from PCP create to enable api fn.

This add function is really wierd & blocking writing an api for pcp - this will get past issues in #7878

7 years agoMerge pull request #9042 from seamuslee001/sl_upgrade_notice_fix
Yashodha Chaku [Thu, 15 Sep 2016 08:07:08 +0000 (13:37 +0530)]
Merge pull request #9042 from seamuslee001/sl_upgrade_notice_fix

(NFC) Fix post upgrade message for 4.7.11

7 years agoFix english
Seamus Lee [Thu, 15 Sep 2016 06:24:03 +0000 (16:24 +1000)]
Fix english

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 agofix net amount api explore
Wahyu Kodar [Thu, 15 Sep 2016 04:14:33 +0000 (11:14 +0700)]
fix net amount api explore

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 ago(NFC) CRM-17789 - Replace `@return $this` with types (more)
Tim Otten [Wed, 14 Sep 2016 21:21:24 +0000 (14:21 -0700)]
(NFC) CRM-17789 - Replace `@return $this` with types (more)

The "phan" analyzer does not seem to understand `@return $this` correctly;
instead, we should indicate a more specific return type.

7 years agoCRM-17789 - CRM_Core_Form, CRM_Report_Form - Fix visibility of _options, _action
Tim Otten [Wed, 14 Sep 2016 20:54:33 +0000 (13:54 -0700)]
CRM-17789 - CRM_Core_Form, CRM_Report_Form - Fix visibility of _options, _action

There are a handful of places in the core codebase which pass
around the `$form` and access `_action` or `_options`. This
is pretty suspicious ... and invalid ...

7 years agoCRM-17789 - api/v3/ReportTemplate - Indicate type correctly
Tim Otten [Wed, 14 Sep 2016 20:52:46 +0000 (13:52 -0700)]
CRM-17789 - api/v3/ReportTemplate - Indicate type correctly

The return value of `civicrm_api*()` is generally `array`, but when used
with `getvalue` it can be scalar (specifically, `string` in this case).
This produces a type-warning in phan because it cannot tell that the true
return type is `string`.

7 years ago(NFC) CRM-17789 - CRM_Utils_Cache - Cleanup docblock
Tim Otten [Wed, 14 Sep 2016 20:52:28 +0000 (13:52 -0700)]
(NFC) CRM-17789 - CRM_Utils_Cache - Cleanup docblock

7 years ago(NFC) CRM-17789 - Replace `@return $this` with types
Tim Otten [Wed, 14 Sep 2016 20:51:30 +0000 (13:51 -0700)]
(NFC) CRM-17789 - Replace `@return $this` with types

The "phan" analyzer does not seem to understand `@return $this` correctly;
instead, we should indicate a more specific return type.

7 years ago(NFC) CRM-17789 - CRM_Batch_Form_Entry - Cleanup docblock
Tim Otten [Wed, 14 Sep 2016 20:50:57 +0000 (13:50 -0700)]
(NFC) CRM-17789 - CRM_Batch_Form_Entry - Cleanup docblock

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 agoCoding standards / cleanup.
Chris Burgess [Wed, 14 Sep 2016 12:28:07 +0000 (00:28 +1200)]
Coding standards / cleanup.

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 agoCRM-17789 Allow end users to stop the switch to mysqli for the dsn
Seamus Lee [Fri, 9 Sep 2016 21:48:59 +0000 (07:48 +1000)]
CRM-17789 Allow end users to stop the switch to mysqli for the dsn

7 years agoRevert change to dsns as per discussion with Tim, also add in information on new...
Seamus Lee [Fri, 9 Sep 2016 22:29:12 +0000 (08:29 +1000)]
Revert change to dsns as per discussion with Tim, also add in information on new DB_DSN_MODE

7 years agoUpdate test to use new lastInesrtId function
Seamus Lee [Fri, 9 Sep 2016 22:21:24 +0000 (08:21 +1000)]
Update test to use new lastInesrtId function

7 years agoUpdate transaction test to run against core and to work on either mysql or mysqli...
Seamus Lee [Sun, 28 Aug 2016 23:55:50 +0000 (09:55 +1000)]
Update transaction test to run against core and to work on either mysql or mysqli depending on what the dsn setting is

7 years agoreplaced removed HTTP_RAW_POST_DATA with php input stream
Mattias Michaux [Wed, 1 Jun 2016 20:26:40 +0000 (22:26 +0200)]
replaced removed HTTP_RAW_POST_DATA with php input stream

7 years agoStyle fixes.
Mattias Michaux [Wed, 25 May 2016 19:26:22 +0000 (21:26 +0200)]
Style fixes.

7 years agoAdditional mysqli fixes/enhancements.
Mattias Michaux [Wed, 25 May 2016 19:11:34 +0000 (21:11 +0200)]
Additional mysqli fixes/enhancements.

7 years agoCRM-17789 - replace mysql extension with mysqli
mark burdett [Wed, 25 May 2016 18:15:26 +0000 (20:15 +0200)]
CRM-17789 - replace mysql extension with mysqli

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-19348 - membership-api: max_related is ignored
Patel Nainesh [Tue, 13 Sep 2016 14:47:51 +0000 (20:17 +0530)]
CRM-19348 - membership-api: max_related is ignored

7 years agoCRM-19355
tschuettler [Tue, 13 Sep 2016 13:51:44 +0000 (15:51 +0200)]
CRM-19355

Hide hidden smart group from unsubscribe list

7 years agoCRM-19354 fix fatal on pdf generation if no trxn_id exists
Brian Shaughnessy [Tue, 13 Sep 2016 13:11:24 +0000 (09:11 -0400)]
CRM-19354 fix fatal on pdf generation if no trxn_id exists

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 agoCorrect Formatting
danbrellis [Sun, 11 Sep 2016 01:17:46 +0000 (21:17 -0400)]
Correct Formatting

Removed white space in linebreak

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