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
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
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.
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
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
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
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
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 …
Matthew Wire [Tue, 11 Jul 2017 10:00:57 +0000 (11:00 +0100)]
Replace fatal with statusBounce
mickadoo [Tue, 11 Jul 2017 09:40:28 +0000 (10:40 +0100)]
CRM-20849: Use "addPsr4" instead of "setPsr4", which replaces existing PSR-4 prefixes with the same name in the autoloader.
Monish Deb [Tue, 11 Jul 2017 09:17:29 +0000 (14:47 +0530)]
Merge pull request #10370 from JMAConsulting/CRM-20321
CRM-20321, CRM-20652 : Changing membership type should change related contribution and generalise changeFeeSelection function to be used for any entity
Monish Deb [Tue, 11 Jul 2017 07:34:56 +0000 (13:04 +0530)]
Merge pull request #10629 from jitendrapurohit/CRM-20834
CRM-20834 - Drupal user not created via Profile due to missing email …
Eileen McNaughton [Tue, 11 Jul 2017 04:49:00 +0000 (16:49 +1200)]
Merge pull request #10635 from civicrm/4.7.22-rc
4.7.22 rc
Eileen McNaughton [Tue, 11 Jul 2017 04:30:28 +0000 (16:30 +1200)]
Merge pull request #10636 from jitendrapurohit/CRM-20834-rc
CRM-20834 - Drupal user not created via Profile due to missing email
Jitendra Purohit [Tue, 11 Jul 2017 03:29:07 +0000 (08:59 +0530)]
CRM-20834 - Drupal user not created via Profile due to missing email
eileen [Tue, 4 Jul 2017 03:05:15 +0000 (15:05 +1200)]
CRM-20847 Support custom api with composite primary keys
Do not add id if the field does not exist and add unit tests.
This adds a couple of checks in the api to not add the id field
Note that Grant is an example of an api which uses a uniqueName on
id & I checked manually that is still returned. SyntaxConformance
tests cover this a lot, but I still also added one check to the grant test.
Eileen McNaughton [Mon, 10 Jul 2017 22:07:08 +0000 (10:07 +1200)]
Merge pull request #10615 from mepps/CRM-20828
CRM-20828 Remove limit 1 from saved mappings selection
Eileen McNaughton [Mon, 10 Jul 2017 22:05:27 +0000 (10:05 +1200)]
Merge pull request #10597 from jitendrapurohit/CRM-20805
CRM-20805 : Fatal Error when adding new membership type on a contribu…
Eileen McNaughton [Mon, 10 Jul 2017 22:01:55 +0000 (10:01 +1200)]
Merge pull request #10633 from colemanw/CRM-20842
CRM-20842 - Update api explorer page title
Eileen McNaughton [Mon, 10 Jul 2017 21:41:56 +0000 (09:41 +1200)]
Merge pull request #10634 from JMAConsulting/CRM-20673
CRM-20673: maintain same tag order on both edit form and manage tag page
deb.monish [Mon, 10 Jul 2017 20:16:10 +0000 (01:46 +0530)]
CRM-20673: maintain same tag order on both edit form and manage tag page
Tim Otten [Mon, 10 Jul 2017 19:54:07 +0000 (12:54 -0700)]
Merge pull request #10626 from totten/4.7.22-port
CRM-20829 Set port to null on default to stop failing requirements
colemanw [Mon, 10 Jul 2017 18:10:46 +0000 (14:10 -0400)]
Merge pull request #10631 from twomice/CRM-20509_contibution_report_note_is_null
CRM-20509: CiviReport: ACL limits in WHERE were too restrictive.
Coleman Watts [Mon, 10 Jul 2017 16:42:32 +0000 (12:42 -0400)]
CRM-20842 - Update api explorer page title
colemanw [Mon, 10 Jul 2017 16:38:10 +0000 (12:38 -0400)]
Merge pull request #10632 from mickadoo/CRM-20833-update-api4-entity-namespace
CRM-20833: Change APIv4 Entity Namespace Again
mickadoo [Mon, 10 Jul 2017 16:28:45 +0000 (17:28 +0100)]
CRM-20833: Change api4 entity namespace again
Allen Shaw [Mon, 10 Jul 2017 16:21:10 +0000 (11:21 -0500)]
CRM-20509: CiviReport: ACL limits in WHERE were too restrictive.
colemanw [Mon, 10 Jul 2017 15:04:38 +0000 (11:04 -0400)]
Merge pull request #10588 from JMAConsulting/CRM-20793
[ready for core team review] CRM-20793, CRM-20799: Add filter - activity date and status on search criteria of activity listing AND make activity filter user preference an optional setting
colemanw [Mon, 10 Jul 2017 15:02:13 +0000 (11:02 -0400)]
Merge pull request #10068 from agh1/crm-20351
CRM-20351 Multiple pages repeat stuff in the page run() method, invoking hooks multiple times
Jitendra Purohit [Mon, 10 Jul 2017 12:46:43 +0000 (18:16 +0530)]
CRM-20834 - Drupal user not created via Profile due to missing email field
eileen [Mon, 10 Jul 2017 01:04:02 +0000 (13:04 +1200)]
CRM-20837 Make setting bug more explicit
Tim Otten [Sat, 8 Jul 2017 23:25:53 +0000 (16:25 -0700)]
Merge pull request #10622 from seamuslee001/smtp_socket_fix
Put back _ in socket and socket_options to refer correctly to staic v…
Seamus Lee [Fri, 7 Jul 2017 21:25:07 +0000 (21:25 +0000)]
Put back _ in socket and socket_options to refer correctly to staic variables
colemanw [Sat, 8 Jul 2017 01:10:27 +0000 (21:10 -0400)]
Merge pull request #10625 from mickadoo/CRM-20833-update-api4-entity-namespace
CRM-20833: Change APIv4 Entity Namespace
Tim Otten [Sat, 8 Jul 2017 00:54:39 +0000 (17:54 -0700)]
Merge remote-tracking branch 'origin/4.7.22-rc'
Margaret Epps [Thu, 6 Jul 2017 23:43:50 +0000 (19:43 -0400)]
CRM-20829 Uppercase NULL for style
Margaret Epps [Thu, 6 Jul 2017 21:00:26 +0000 (17:00 -0400)]
CRM-20829 Set port to null on default to avoid failing requirements
Tim Otten [Sat, 8 Jul 2017 00:33:30 +0000 (17:33 -0700)]
Merge pull request #10624 from totten/master-4723
Rename v4.7.22 to v4.7.23
mickadoo [Sat, 8 Jul 2017 00:00:11 +0000 (01:00 +0100)]
CRM-20833: Change api4 entity namespace
CiviCRM [Fri, 7 Jul 2017 23:45:06 +0000 (23:45 +0000)]
Rename v4.7.22 to v4.7.23 (continued)
CiviCRM [Fri, 7 Jul 2017 23:19:33 +0000 (23:19 +0000)]
Rename v4.7.22 to v4.7.23
There seems to be a consensus for issuing a quick patch to `4.7.21` as `4.7.22`. This means that `master` needs
to be renumbered as `4.7.23`.
CiviCRM [Fri, 7 Jul 2017 23:07:35 +0000 (23:07 +0000)]
Set version to 4.7.22
deb.monish [Thu, 4 May 2017 17:54:43 +0000 (23:24 +0530)]
fix test failures
Andrew Hunt [Tue, 28 Mar 2017 19:37:36 +0000 (15:37 -0400)]
CRM-20351 ACL: Don't repeat stuff in the page run() method
deb.monish [Mon, 5 Jun 2017 19:31:22 +0000 (01:01 +0530)]
additional fixes on QA
deb.monish [Mon, 29 May 2017 15:46:47 +0000 (21:16 +0530)]
CRM-20652: Generalise changeFeeSelection function to be used for any entity other
deb.monish [Wed, 17 May 2017 13:09:32 +0000 (18:39 +0530)]
CRM-20321: Changing membership type should change related contribution
Tim Otten [Fri, 7 Jul 2017 19:50:41 +0000 (12:50 -0700)]
Merge pull request #10621 from agh1/fix-bgm
Release notes: Mathieu primary affiliation still Coop SymbioTIC
Andrew Hunt [Fri, 7 Jul 2017 17:22:04 +0000 (13:22 -0400)]
Release notes: Mathieu primary affiliation still Coop SymbioTIC
Monish Deb [Fri, 7 Jul 2017 12:12:15 +0000 (17:42 +0530)]
Merge pull request #10619 from francescbassas/patch-11
Misspelling
Monish Deb [Fri, 7 Jul 2017 11:54:06 +0000 (17:24 +0530)]
Merge pull request #10613 from jitendrapurohit/CRM-20823
CRM-20823 : Price Set field with an Expiry Date still being required …
Monish Deb [Fri, 7 Jul 2017 11:43:59 +0000 (17:13 +0530)]
Merge pull request #10535 from jitendrapurohit/CRM-20752
CRM-20752: Editing a Cancelled Pledge updates the status of it to Pen…
Monish Deb [Fri, 7 Jul 2017 11:28:17 +0000 (16:58 +0530)]
Merge pull request #10565 from eileenmcnaughton/extract
CRM-20759, add ability to import to 'Primary' address add unit testing, move deprecated function into calling class
francescbassas [Fri, 7 Jul 2017 09:23:33 +0000 (11:23 +0200)]
Misspelling
colemanw [Fri, 7 Jul 2017 02:09:32 +0000 (22:09 -0400)]
Merge pull request #10609 from totten/master-case-settings
CRM-20816 - Expose CiviCase settings through "Settings" framework
Tim Otten [Fri, 7 Jul 2017 00:15:04 +0000 (17:15 -0700)]
CRM-20816 - Rename civicaseAllowMultipleCaseClients to civicaseAllowMultipleClients
The second instance of the word "case" seems redundant. Nip it in the bud.
Tim Otten [Fri, 7 Jul 2017 00:11:58 +0000 (17:11 -0700)]
CRM-20816 - XMLProcessor - Consolidate implementation of setting-lookup
Tim Otten [Thu, 6 Jul 2017 23:51:44 +0000 (16:51 -0700)]
CRM-20816 - Rename `auto` to `default`
Tim Otten [Thu, 6 Jul 2017 22:42:43 +0000 (15:42 -0700)]
Merge pull request #10616 from civicrm/4.7.21-rc
4.7.21 rc
Monish Deb [Thu, 6 Jul 2017 20:00:36 +0000 (01:30 +0530)]
Merge pull request #10551 from jitendrapurohit/CRM-20633
CRM-20633 : custom field set displayed twice on register event Partic…
Monish Deb [Thu, 6 Jul 2017 19:44:14 +0000 (01:14 +0530)]
Merge pull request #10578 from eileenmcnaughton/deprecated
CRM-20786 Move deprecated utils functions to the import classes
Monish Deb [Thu, 6 Jul 2017 19:31:48 +0000 (01:01 +0530)]
Merge pull request #10580 from eileenmcnaughton/deprecated3
CRM-20786 stop calling deprecated function, that does not do anything…
Margaret Epps [Thu, 6 Jul 2017 16:17:58 +0000 (12:17 -0400)]
CRM-20828 Remove limit 1 to saved mappings selection
Monish Deb [Thu, 6 Jul 2017 12:35:00 +0000 (18:05 +0530)]
Merge pull request #10607 from JMAConsulting/CRM-20773
CRM-20773: Contribution tab shows Receive Date twice instead of ThankYou date
Jitendra Purohit [Thu, 6 Jul 2017 10:15:54 +0000 (15:45 +0530)]
CRM-20823 : Price Set field with an Expiry Date still being required after being expired
Monish Deb [Thu, 6 Jul 2017 11:39:06 +0000 (17:09 +0530)]
Merge pull request #10587 from JMAConsulting/isPayment
CRM-20797, fixed sql to use is_payment = 1 to get payments
Tim Otten [Thu, 6 Jul 2017 02:46:44 +0000 (19:46 -0700)]
Merge pull request #10611 from totten/4.7.21-rc-notes
Release notes - Multiple updates for v4.7.21
Tim Otten [Thu, 6 Jul 2017 01:48:15 +0000 (18:48 -0700)]
release-notes/4.7.21 - Fix references to subordinate PRs
Tim Otten [Thu, 6 Jul 2017 01:55:20 +0000 (18:55 -0700)]
release-notes/4.7.21 - Add section for security advisories
projects / civicrm-core.git / log