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
jitendrapurohit [Tue, 20 Sep 2016 11:46:26 +0000 (17:16 +0530)]
CRM-16189 - Notice Fix #8848
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
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.
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)
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
deb.monish [Mon, 19 Sep 2016 13:35:11 +0000 (19:05 +0530)]
CRM-19389: Fatal Error in Forms (4.7.12 Regression)
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
deb.monish [Mon, 19 Sep 2016 08:09:44 +0000 (13:39 +0530)]
CRM-16189: additional test improvement dependent on pr-8847
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…
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
Chris Burgess [Sun, 18 Sep 2016 23:42:48 +0000 (11:42 +1200)]
Add comma on multiline array, reformat some commas.
Seamus Lee [Sun, 18 Sep 2016 21:50:00 +0000 (07:50 +1000)]
CRM-19382 Add in Dompdf Options use statement
Seamus Lee [Sun, 18 Sep 2016 21:46:38 +0000 (07:46 +1000)]
CRM-19382 Allow for remote images to be used in invoices
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
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)
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
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
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
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
Seamus Lee [Thu, 15 Sep 2016 23:44:59 +0000 (09:44 +1000)]
Fix licence block in pcptest
Seamus Lee [Thu, 15 Sep 2016 23:43:22 +0000 (09:43 +1000)]
Fix licence block on pcp api file
Eileen McNaughton [Thu, 15 Sep 2016 22:58:16 +0000 (10:58 +1200)]
Merge pull request #9049 from ggargani/PCPNewApi
Pcp api
Coleman Watts [Thu, 15 Sep 2016 22:29:29 +0000 (18:29 -0400)]
Dashlet header color tweak
ggargani [Thu, 15 Sep 2016 21:28:28 +0000 (23:28 +0200)]
civilint run
Fixe style issues
ggargani [Thu, 15 Sep 2016 21:06:32 +0000 (23:06 +0200)]
Pcp api
Get, Create, Delete method added
Test included
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 …
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
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
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…
Brian Shaughnessy [Thu, 15 Sep 2016 11:18:09 +0000 (07:18 -0400)]
fix array indentation
Seamus Lee [Thu, 15 Sep 2016 11:09:27 +0000 (21:09 +1000)]
api camel case fixes
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
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
Seamus Lee [Thu, 15 Sep 2016 06:24:03 +0000 (16:24 +1000)]
Fix english
Seamus Lee [Thu, 15 Sep 2016 06:14:12 +0000 (16:14 +1000)]
(NFC) Fix post upgrade message for 4.7.11
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…
Wahyu Kodar [Thu, 15 Sep 2016 04:14:33 +0000 (11:14 +0700)]
fix net amount api explore
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
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.
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 ...
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`.
Tim Otten [Wed, 14 Sep 2016 20:52:28 +0000 (13:52 -0700)]
(NFC) CRM-17789 - CRM_Utils_Cache - Cleanup docblock
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.
Tim Otten [Wed, 14 Sep 2016 20:50:57 +0000 (13:50 -0700)]
(NFC) CRM-17789 - CRM_Batch_Form_Entry - Cleanup docblock
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
Seamus Lee [Wed, 14 Sep 2016 21:51:56 +0000 (21:51 +0000)]
Fix all array_column and switch to collect() function
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
Tim Otten [Wed, 14 Sep 2016 19:51:24 +0000 (12:51 -0700)]
Merge pull request #9029 from kcristiano/CRM-19279
CRM-19729
Chris Burgess [Wed, 14 Sep 2016 12:28:07 +0000 (00:28 +1200)]
Coding standards / cleanup.
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
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
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…
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
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
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
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…
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...
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
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
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
Seamus Lee [Fri, 9 Sep 2016 22:21:24 +0000 (08:21 +1000)]
Update test to use new lastInesrtId function
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
Mattias Michaux [Wed, 1 Jun 2016 20:26:40 +0000 (22:26 +0200)]
replaced removed HTTP_RAW_POST_DATA with php input stream
Mattias Michaux [Wed, 25 May 2016 19:26:22 +0000 (21:26 +0200)]
Style fixes.
Mattias Michaux [Wed, 25 May 2016 19:11:34 +0000 (21:11 +0200)]
Additional mysqli fixes/enhancements.
mark burdett [Wed, 25 May 2016 18:15:26 +0000 (20:15 +0200)]
CRM-17789 - replace mysql extension with mysqli
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
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
Kevin Cristiano [Tue, 13 Sep 2016 15:34:44 +0000 (11:34 -0400)]
CRM-19279: fix formatting issues
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
Caleb Oki [Tue, 13 Sep 2016 15:23:42 +0000 (16:23 +0100)]
MultipleRecordFieldsListing.tpl extra th causing TypeError: i is undefined
Patel Nainesh [Tue, 13 Sep 2016 14:47:51 +0000 (20:17 +0530)]
CRM-19348 - membership-api: max_related is ignored
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
jitendrapurohit [Tue, 13 Sep 2016 11:26:11 +0000 (16:56 +0530)]
CRM-19702 - Fix contact reference field filter
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
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
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
Seamus Lee [Tue, 13 Sep 2016 05:12:45 +0000 (15:12 +1000)]
Fix up pear-execption-fix as per comment from tim
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
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
Seamus Lee [Wed, 31 Aug 2016 07:28:04 +0000 (17:28 +1000)]
CRM-19284 Load Credit Card validation package using composer
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
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
jitendrapurohit [Mon, 12 Sep 2016 13:22:46 +0000 (18:52 +0530)]
CRM-17789 - Fix Notice Error on PHP 7
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
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
Seamus Lee [Fri, 2 Sep 2016 23:52:41 +0000 (09:52 +1000)]
Fix variable issue found by Jitendra
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
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
Seamus Lee [Thu, 21 Jul 2016 00:20:44 +0000 (10:20 +1000)]
Shift Upgrade code to php for more stability
Seamus Lee [Thu, 21 Jul 2016 00:07:20 +0000 (10:07 +1000)]
Fix up OptionGroup Form
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
Seamus Lee [Wed, 20 Jul 2016 23:25:01 +0000 (09:25 +1000)]
Shift upgrade script to 4.7.10
Re run regen.sh
Seamus Lee [Fri, 2 Sep 2016 11:43:09 +0000 (21:43 +1000)]
Fix up Option Group Check
Seamus Lee [Wed, 13 Jul 2016 04:58:47 +0000 (04:58 +0000)]
Fix up upgrade script and add a system check
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
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
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
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