Samuel Vanhove [Mon, 24 Jul 2017 20:19:57 +0000 (16:19 -0400)]
CRM-20954 Fixing localized finantial status problems
Monish Deb [Mon, 24 Jul 2017 14:44:31 +0000 (20:14 +0530)]
Merge pull request #10653 from JKingsnorth/CRM-20863
CRM-20863 Improve report list ordering
Eileen McNaughton [Mon, 24 Jul 2017 12:55:55 +0000 (00:55 +1200)]
Merge pull request #10732 from JMAConsulting/CRM-20947
CRM-20947, fixed warning for deprecated function while generating inv…
Eileen McNaughton [Mon, 24 Jul 2017 12:45:59 +0000 (00:45 +1200)]
Merge pull request #10739 from civicrm/4.7.23-rc
4.7.23 rc merge to master
Monish Deb [Mon, 24 Jul 2017 11:37:47 +0000 (17:07 +0530)]
Merge pull request #10736 from eileenmcnaughton/reg
CRM-20950 Prt 2 Contact import mapping to wrong location type
eileen [Mon, 24 Jul 2017 10:19:00 +0000 (22:19 +1200)]
CRM-20950 Prt 2 Contact import mapping to wrong location type
Eileen McNaughton [Mon, 24 Jul 2017 09:58:54 +0000 (21:58 +1200)]
Merge pull request #10735 from eileenmcnaughton/reg
CRM-20950 Contact import mapping to wrong location type
eileen [Mon, 24 Jul 2017 09:56:43 +0000 (21:56 +1200)]
CRM-20950 Contact import mapping to wrong location type
Pradeep Nayak [Mon, 24 Jul 2017 02:20:26 +0000 (07:50 +0530)]
CRM-20947, fixed warning for deprecated function while generating invoice
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Mon, 24 Jul 2017 00:27:31 +0000 (12:27 +1200)]
Merge pull request #10664 from jitendrapurohit/CRM-20875
CRM-20875 - Fix membership import to avoid notice error to be thrown
Eileen McNaughton [Sun, 23 Jul 2017 22:36:33 +0000 (10:36 +1200)]
Merge pull request #10727 from JMAConsulting/CRM-20947
CRM-20947, fixed notice error deprecated CRM_Core_OptionGroup::getLabel
Eileen McNaughton [Sun, 23 Jul 2017 22:25:21 +0000 (10:25 +1200)]
Merge pull request #10724 from seamuslee001/CRM-19941
CRM-19941 CRM-20943 Fix issue in PHP7.1 using is non object mode in …
Pradeep Nayak [Sun, 23 Jul 2017 10:15:45 +0000 (15:45 +0530)]
CRM-20947, ficed notice error deprecated CRM_Core_OptionGroup::getLabel
----------------------------------------
* CRM-20947: Remove Deprecation Notice for Option group
https://issues.civicrm.org/jira/browse/CRM-20947
Eileen McNaughton [Sun, 23 Jul 2017 04:51:19 +0000 (16:51 +1200)]
Merge pull request #10722 from seamuslee001/CRM-20944
CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in…
Seamus Lee [Sat, 22 Jul 2017 22:18:55 +0000 (22:18 +0000)]
CRM-20944 Remove call to deprecated CRM_Core_OptionGroup::getValue in ActivityLinks.php
Seamus Lee [Sat, 22 Jul 2017 22:43:24 +0000 (22:43 +0000)]
CRM-19941 CRM-20943 Fix issue in PHP7.1 using is non object mode in AtoZ Pager
Tim Otten [Sat, 22 Jul 2017 18:04:10 +0000 (11:04 -0700)]
Merge pull request #10715 from totten/master-jdebug
CRM-19575 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG
Monish Deb [Fri, 21 Jul 2017 12:28:24 +0000 (17:58 +0530)]
Merge pull request #10710 from jitendrapurohit/participantfix
CRM-17236 - Custom dates fields displayed as (01/01/1970) in Events confirmation receipt
Jitendra Purohit [Thu, 20 Jul 2017 10:42:08 +0000 (16:12 +0530)]
Fix participant mails
Monish Deb [Fri, 21 Jul 2017 11:02:34 +0000 (16:32 +0530)]
Merge pull request #10704 from eileenmcnaughton/admin_form
CRM-20923 refactor tpl to be based on metadata not hard-coding
deb.monish [Fri, 21 Jul 2017 09:15:34 +0000 (14:45 +0530)]
style fix
Eileen McNaughton [Fri, 21 Jul 2017 09:01:26 +0000 (21:01 +1200)]
Merge pull request #10676 from fuzionnz/CRM-20884-remove_net_smtp_readme_symlink
Remove broken symlink from vendor/pear/net_smtp
Eileen McNaughton [Fri, 21 Jul 2017 08:59:42 +0000 (20:59 +1200)]
Merge pull request #10668 from jmcclelland/CRM-20876
CRM-20876 - ensure honor block variable is passed to template
Eileen McNaughton [Fri, 21 Jul 2017 08:52:56 +0000 (20:52 +1200)]
Merge pull request #10713 from mfb/CRM-20931
CRM-20931 - Allow contact custom fields to be added to Contribution Detail report
Eileen McNaughton [Fri, 21 Jul 2017 02:56:31 +0000 (14:56 +1200)]
Merge pull request #10714 from totten/master-gitignore
(NFC) gitignore - Remove obsolete entries
Tim Otten [Fri, 21 Jul 2017 02:53:38 +0000 (19:53 -0700)]
CRM-20932 - CRM_Utils_System_Joomla - Fix warning. Define JDEBUG
Background
==========
When running `cv en <extname>` on Joomla, there are repeated warnings, "Use
of undefined constant JDEBUG", and each includes a backtrace. This is hard
to read.
The bug appears to affect backend scripts; it's discussed with a solution in:
https://github.com/joomla/joomla-cms/issues/11512#issuecomment-
244937966
Before
======
`CRM_Utils_System_Joomla::loadBootStrap()` loads various config files.
However, these may or may not set `JDEBUG`.
After
=====
`CRM_Utils_System_Joomla::loadBootStrap()` defensively sets `JDEBUG` if no
other part of the bootstrap has done so.
Eileen McNaughton [Fri, 21 Jul 2017 02:46:13 +0000 (14:46 +1200)]
Merge pull request #10711 from colemanw/CRM-20929
CRM-20929 - Convey css classes to main page title from Angular
Coleman Watts [Fri, 21 Jul 2017 01:43:58 +0000 (21:43 -0400)]
CRM-20929 - Simply add crm-page-title class
Tim Otten [Fri, 21 Jul 2017 00:59:40 +0000 (17:59 -0700)]
(NFC) gitignore - Remove obsolete entries
The `packages` directory is actually a separate git repo, with its own copy
of `.gitignore`.
These rules have no effect in there.
The `packages` directory is ignored as a whole with one entry in
`gitignore`.
eileen [Thu, 20 Jul 2017 01:02:15 +0000 (13:02 +1200)]
CRM-20923 refactor tpl to be based on metadata not hard-coding
Change-Id: Iee2a7aa9fa93c5d20b95f3dbc45ec2f3cf7a216b
mark burdett [Thu, 20 Jul 2017 20:32:50 +0000 (13:32 -0700)]
CRM-20931 - Allow contact custom fields to be added to Contribution Detail report
As a bonus also add nickname column to the report :)
colemanw [Thu, 20 Jul 2017 16:38:17 +0000 (12:38 -0400)]
Merge pull request #10430 from JMAConsulting/IIDA-144
CRM-20648, fixed validation to allow participant to register if their…
colemanw [Thu, 20 Jul 2017 14:23:19 +0000 (10:23 -0400)]
Merge pull request #10706 from totten/master-regen-finact
regen.sh - Fix stale function call in sql/GenerateData.php
Coleman Watts [Thu, 20 Jul 2017 13:58:36 +0000 (09:58 -0400)]
CRM-20929 - Convey css classes to main page title from Angular
Edsel [Thu, 20 Jul 2017 12:59:42 +0000 (18:29 +0530)]
CRM-20648 Applied check exclusively to cancelled status
----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
https://issues.civicrm.org/jira/browse/CRM-20648
Pradeep Nayak [Mon, 29 May 2017 08:48:19 +0000 (14:18 +0530)]
CRM-20648, fixed validation to allow participant to register if their previous registration is cancelled
----------------------------------------
* CRM-20648: Allow registration in event with cancelled registration
https://issues.civicrm.org/jira/browse/CRM-20648
Tim Otten [Thu, 20 Jul 2017 05:33:47 +0000 (22:33 -0700)]
regen.sh - Fix stale function call in sql/GenerateData.php
In [#10463](https://github.com/civicrm/civicrm-core/pull/10463), the
function signature of `getInstrumentFinancialAccount()` changed slightly -- in that
the parameter became mandatory.
Grepping for other calls to `getInstrumentFinancialAccount()` shows that one of the unit-tests
works with example input `4`, so this does the same.
Before
======
Running "regen.sh" fails -- because `getInstrumentFinancialAccount` is called without a parameter.
After
=====
Running "regen.sh" completes -- because `getInstrumentFinancialAccount` is called with `4`.
Acceptance Prompts
==================
* The example data produced by `regen.sh` should contain suitable/similar values for financial records.
* Determine whether `4` is a suitable value.
colemanw [Thu, 20 Jul 2017 03:06:27 +0000 (23:06 -0400)]
Merge pull request #10682 from JMAConsulting/CRM-20890
CRM-20890: Move recieve_date between Contribution status and Revenue Recognition date in Contribution backoffice form
Eileen McNaughton [Thu, 20 Jul 2017 01:49:45 +0000 (13:49 +1200)]
Merge pull request #10660 from seamuslee001/CRM-20860-processor
CRM-20860 Allow payment processor field to use the Password QuickForm Field type
CiviCRM [Wed, 19 Jul 2017 16:44:50 +0000 (16:44 +0000)]
Set version to 4.7.24
Monish Deb [Wed, 19 Jul 2017 13:00:26 +0000 (18:30 +0530)]
Merge pull request #10683 from jitendrapurohit/CRM-20770
CRM-20891 : Separate membership pay later contribution sets the membe…
Jitendra Purohit [Wed, 19 Jul 2017 11:57:11 +0000 (17:27 +0530)]
add test
Eileen McNaughton [Wed, 19 Jul 2017 00:23:15 +0000 (12:23 +1200)]
Merge pull request #10697 from seamuslee001/4.7.22-rc
4.7.22 rc
Tim Otten [Wed, 12 Jul 2017 05:03:00 +0000 (22:03 -0700)]
Add 4.7.22 to release-notes.md
Tim Otten [Wed, 12 Jul 2017 04:29:05 +0000 (21:29 -0700)]
Add release notes for 4.7.22
Tim Otten [Wed, 12 Jul 2017 02:51:41 +0000 (19:51 -0700)]
CRM-20600 - Upgrader - Display warning if asset-caching is likely to fail
After releasing v4.7.21, there were several inquiries about sites in which
Angular pages failed to load. In cases diagnosed so far, this has been a
result of inconsistent configurations or overzealous HTTP restrictions
applied to the `imageUploadDir`.
Ordinarily, we would address this kind of thing with a status check.
Unfortunately, the problem breaks that "Status" page... so we have to
display a bit sooner.
colemanw [Tue, 18 Jul 2017 14:48:55 +0000 (10:48 -0400)]
Merge pull request #10690 from JMAConsulting/CRM-20902
[ready for review] CRM-20902 Fixed mailing opened query count for pie chart
colemanw [Tue, 18 Jul 2017 13:13:37 +0000 (09:13 -0400)]
Merge pull request #10689 from JMAConsulting/CRM-20901
[ready for core team to review]CRM-20901, Added submit credit card membership link
Monish Deb [Tue, 18 Jul 2017 11:58:30 +0000 (17:28 +0530)]
Merge pull request #10652 from jitendrapurohit/CRM-19017
CRM-19017 : Load default params for fragment query object and fix db error.
Edsel [Tue, 18 Jul 2017 06:40:20 +0000 (12:10 +0530)]
CRM-20902 Fixed mailing opened query count for pie chart
----------------------------------------
* CRM-20902: DB Syntax error on Mailing Opened Report
https://issues.civicrm.org/jira/browse/CRM-20902
Pradeep Nayak [Mon, 17 Jul 2017 17:43:38 +0000 (23:13 +0530)]
CRM-20901, Added submit credit card membership link
----------------------------------------
* CRM-20901: Add submit credit card membership link on membership form
https://issues.civicrm.org/jira/browse/CRM-20901
Eileen McNaughton [Mon, 17 Jul 2017 20:15:30 +0000 (08:15 +1200)]
Merge pull request #10649 from seamuslee001/CRM-20860
CRM-20860 Add in ability to create field type of password from metadata
Jitendra Purohit [Mon, 17 Jul 2017 13:57:47 +0000 (19:27 +0530)]
CRM-20770 : Separate membership pay later contribution sets the membership to Completed
deb.monish [Mon, 17 Jul 2017 13:06:45 +0000 (18:36 +0530)]
CRM-20890: Move recieve_date between Contribution status and Revenue Recognition date in Contribution backoffice form
Monish Deb [Mon, 17 Jul 2017 11:26:19 +0000 (16:56 +0530)]
Merge pull request #10627 from eileenmcnaughton/sett
CRM-20837 Make setting bug more explicit
Monish Deb [Mon, 17 Jul 2017 11:06:48 +0000 (16:36 +0530)]
Merge pull request #10662 from seamuslee001/CRM-20873
CRM-20873 : Fix issue where getTree try to load is_public field before it is added in upgrade
Seamus Lee [Fri, 14 Jul 2017 08:23:26 +0000 (18:23 +1000)]
Minor fix
Seamus Lee [Fri, 14 Jul 2017 08:21:22 +0000 (18:21 +1000)]
CRM-20873 FIx issue where getTree trys to load is_public field before it is added in upgrade
Monish Deb [Mon, 17 Jul 2017 08:23:59 +0000 (13:53 +0530)]
Merge pull request #10537 from PalanteJon/20754
CRM-20754 - Clear memory leak in CSV CLI import
Jon goldberg [Mon, 17 Jul 2017 04:50:42 +0000 (00:50 -0400)]
Use the freeResult DAO method
Chris Burgess [Sun, 16 Jul 2017 22:21:13 +0000 (10:21 +1200)]
Remove vendor/pear/net_smtp/README.rst also.
CRM-20884
Eileen McNaughton [Sun, 16 Jul 2017 21:49:35 +0000 (09:49 +1200)]
Merge pull request #10675 from JMAConsulting/CRM-20848
CRM-20848: Upgrade to 4.7.19 sets price_field to inactive if default Financial Types are disabled
deb.monish [Sun, 16 Jul 2017 18:48:32 +0000 (00:18 +0530)]
CRM-20848: Upgrade to 4.7.19 sets price_field to inactive if default Financial Types are disabled
Eileen McNaughton [Sat, 15 Jul 2017 20:42:57 +0000 (08:42 +1200)]
Merge pull request #10599 from eileenmcnaughton/api_no_id
CRM-20847 Support custom api with composite primary keys
Jitendra Purohit [Thu, 13 Jul 2017 14:30:27 +0000 (20:00 +0530)]
CRM-19017 : Load default params for fragment query object.
Eileen McNaughton [Sat, 15 Jul 2017 04:54:43 +0000 (16:54 +1200)]
Merge pull request #10669 from seamuslee001/clear_all_messages
Clear all Messages when running clearMessages by default
Seamus Lee [Sat, 15 Jul 2017 00:42:17 +0000 (10:42 +1000)]
Clear all Messages when running clearMessages by default
Tim Otten [Fri, 14 Jul 2017 20:05:11 +0000 (13:05 -0700)]
Merge pull request #10667 from mlutfy/master-crm20803-1
CRM-20803: Enable Farsi/Persian, Serbian and Ukranian.
Jamie McClelland [Fri, 14 Jul 2017 19:14:14 +0000 (15:14 -0400)]
CRM-20876 - ensure honor block variable is passed to template
Otherwise, it's not on the receipt.
Mathieu Lutfy [Fri, 14 Jul 2017 16:58:01 +0000 (12:58 -0400)]
CRM-20803: Enable Farsi/Persian, Serbian and Ukranian.
colemanw [Fri, 14 Jul 2017 15:46:13 +0000 (11:46 -0400)]
Merge pull request #10463 from JMAConsulting/CRM-20677
[ready for core team review] CRM-20677, used generalized function to retrieve financial account id
colemanw [Fri, 14 Jul 2017 15:43:18 +0000 (11:43 -0400)]
Merge pull request #10646 from JMAConsulting/deferred
[ready for core team review] CRM-20857: fixed Deferred Report for sql_mode=only_full_group_by
Jitendra Purohit [Fri, 14 Jul 2017 09:59:42 +0000 (15:29 +0530)]
Fix membership import to avoid notice error to be thrown
colemanw [Fri, 14 Jul 2017 05:50:34 +0000 (01:50 -0400)]
Merge pull request #10659 from totten/master-crmuiselect
CRM-20871 - crmUiSelect - UI should stay in sync with model
Seamus Lee [Thu, 13 Jul 2017 02:39:41 +0000 (02:39 +0000)]
Allow payment processor field to use the Password QuickForm Field type
Tim Otten [Fri, 14 Jul 2017 02:46:58 +0000 (19:46 -0700)]
CRM-20871 - crmUiSelect - UI should stay in sync with model
The `crmUiSelect` defines the function `$render()` -- whenever the model
changes, it should update execute `$render()` to update the UI. But it doesn't.
This issue is discussed more in https://stackoverflow.com/questions/
21084088/why-ngmodels-render-is-not-called-when-the-model-changes-in-angularjs
== Before ==
The `$render()` function for directive `crm-ui-select` is not called because the `select`
directive overrides it.
== After ==
The `$render()` function for directive `crm-ui-select` is called, even if
used on a `select` element.
== Acceptance Criteria ==
* The test page in https://github.com/totten/org.example.angpage (`civicrm/a/#/play`)
keeps elements synchronized.
* Existing screens which use `crm-ui-select` continue to work.
colemanw [Thu, 13 Jul 2017 22:04:06 +0000 (18:04 -0400)]
Merge pull request #10618 from colemanw/CRM-20830
CRM-20830 - Improve handling of overdue activities
colemanw [Thu, 13 Jul 2017 21:57:30 +0000 (17:57 -0400)]
Merge pull request #10656 from JMAConsulting/fatalerror
[ready for core team to review]CRM-20867, fixed fatal error
Pradeep Nayak [Thu, 13 Jul 2017 18:55:28 +0000 (00:25 +0530)]
CRM-20867, fixed fatal error
----------------------------------------
* CRM-20867: Class not found
https://issues.civicrm.org/jira/browse/CRM-20867
JKingsnorth [Thu, 13 Jul 2017 15:47:37 +0000 (16:47 +0100)]
CRM-20863 Improve report list ordering
Coleman Watts [Thu, 13 Jul 2017 14:49:30 +0000 (10:49 -0400)]
Code cleanup
Coleman Watts [Fri, 7 Jul 2017 18:40:42 +0000 (14:40 -0400)]
CRM-20830 - Trinary activity status types
Coleman Watts [Fri, 7 Jul 2017 02:33:06 +0000 (22:33 -0400)]
CRM-20830 - Improve handling of overdue activities
colemanw [Thu, 13 Jul 2017 14:11:53 +0000 (10:11 -0400)]
Merge pull request #10586 from colemanw/CRM-20794
CRM-20794 - Colors for case status
Seamus Lee [Thu, 13 Jul 2017 02:34:57 +0000 (02:34 +0000)]
CRM-20860 Add in ability to create field type of password from metadata
Pradeep Nayak [Wed, 12 Jul 2017 14:03:52 +0000 (19:33 +0530)]
CRM-20857, fixed report for sql_mode=only_full_group_by
----------------------------------------
* CRM-20857: Deferred Revenue report - DB Error: unknown error
https://issues.civicrm.org/jira/browse/CRM-20857
fixed style
colemanw [Tue, 11 Jul 2017 22:08:18 +0000 (18:08 -0400)]
Merge pull request #9784 from monishdeb/CRM-19702
CRM-19702: Fatal error when merging contact records with custom file fields
Tim Otten [Tue, 11 Jul 2017 21:57:04 +0000 (14:57 -0700)]
Merge pull request #10637 from mickadoo/CRM-20849-allow-duplicate-psr4-prefix
CRM-20849: Allow duplicate PSR-4 prefixes
Matthew Wire [Tue, 11 Jul 2017 20:45:20 +0000 (21:45 +0100)]
CRM-20851 php notice (#10639)
Fix php notice when is_primary is not set
deb.monish [Sat, 4 Feb 2017 06:11:24 +0000 (11:41 +0530)]
CRM-19702: Fatal error when merging contact records with custom file fields
Eileen McNaughton [Tue, 11 Jul 2017 20:23:24 +0000 (08:23 +1200)]
Merge pull request #10638 from mattwire/CRM-20772_statusbounce
CRM-20850 Replace fatal with statusBounce
Eileen McNaughton [Tue, 11 Jul 2017 20:19:57 +0000 (08:19 +1200)]
Merge pull request #10604 from jitendrapurohit/CRM-20809
CRM-20809 : Modify extension cache file to get created in uploads directory
colemanw [Tue, 11 Jul 2017 17:01:47 +0000 (13:01 -0400)]
Merge pull request #10642 from civicrm/revert-10370-CRM-20321
Revert "CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity"
colemanw [Tue, 11 Jul 2017 16:33:04 +0000 (12:33 -0400)]
Revert "CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity"
Jitendra Purohit [Thu, 6 Jul 2017 10:37:39 +0000 (16:07 +0530)]
modify fix to place cache dir in upload dir
deb.monish [Tue, 4 Jul 2017 11:38:00 +0000 (17:08 +0530)]
test failure fixes
Pradeep Nayak [Sat, 3 Jun 2017 01:12:43 +0000 (06:42 +0530)]
CRM-20677, updated getInstrumentFinancialAccount() to use api
----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
https://issues.civicrm.org/jira/browse/CRM-20677
CRM-20677. more changes
----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
https://issues.civicrm.org/jira/browse/CRM-20677
Pradeep Nayak [Sat, 3 Jun 2017 01:01:11 +0000 (06:31 +0530)]
CRM-20677, used generalized function to retrieve financial account id
----------------------------------------
* CRM-20677: Use generalised function to retrieve financial account
https://issues.civicrm.org/jira/browse/CRM-20677
Monish Deb [Tue, 11 Jul 2017 11:52:13 +0000 (17:22 +0530)]
Merge pull request #10431 from JMAConsulting/NoticeFixes-1
[ready for core team to review] CRM-20649, Fixed notice error on form rule
Monish Deb [Tue, 11 Jul 2017 11:37:16 +0000 (17:07 +0530)]
Merge pull request #10450 from JMAConsulting/CRM-20667
[ready for core team to review] CRM-20667, fixed addtional line creation when multiple membership is …
projects / civicrm-core.git / log