colemanw [Thu, 22 Feb 2018 16:40:31 +0000 (11:40 -0500)]
Merge pull request #11681 from jitendrapurohit/CRM-21778
CRM-21778 - Contact image uploaded from drupal webform don't render o…
Yashodha Chaku [Thu, 22 Feb 2018 11:18:08 +0000 (16:48 +0530)]
Merge pull request #11707 from jitendrapurohit/CRM-21771
CRM-21771: error when viewing event registration with linked contribu…
Jitendra Purohit [Thu, 22 Feb 2018 08:43:57 +0000 (14:13 +0530)]
CRM-21771: error when viewing event registration with linked contribution
Monish Deb [Thu, 22 Feb 2018 04:12:51 +0000 (09:42 +0530)]
Merge pull request #11699 from totten/master-i18n-sql
(civicrm-setup/1) CRM_Core_I18n - Loosen coupling to DB layer
Seamus Lee [Thu, 22 Feb 2018 03:28:55 +0000 (14:28 +1100)]
Merge pull request #11705 from totten/master-upgrade-ui-ver
/civicrm/upgrade - On finish screen, display actual version number
Tim Otten [Wed, 21 Feb 2018 23:57:15 +0000 (15:57 -0800)]
/civicrm/upgrade - On finish screen, display actual version number
This screen was hard-coded to always display the message "Thank you for
upgrading to 4.7...". This patch makes it dynamic, plugging in the
actual version number.
colemanw [Wed, 21 Feb 2018 17:56:39 +0000 (12:56 -0500)]
Merge pull request #11701 from samuelsov/tsfix
(NFC) remove starting whitespace in ts about installments
Tim Otten [Wed, 21 Feb 2018 17:27:31 +0000 (09:27 -0800)]
Merge pull request #11700 from JMAConsulting/CRM-21787
CRM-21787 : Simplify CRM_Utils_System::version() to fetch version directly from xml/version.xml
Tim Otten [Wed, 21 Feb 2018 16:29:40 +0000 (08:29 -0800)]
Merge pull request #11695 from JMAConsulting/civicrm-setup#11
[civicrm-setup#11] Remove templates/CRM/common/version.tpl
Samuel Vanhove [Wed, 21 Feb 2018 15:11:30 +0000 (10:11 -0500)]
(NFC) remove starting whitespace in ts
deb.monish [Wed, 21 Feb 2018 07:55:52 +0000 (13:25 +0530)]
CRM-21787: Keep up-to-date without running GenCode on all builds
deb.monish [Wed, 21 Feb 2018 03:14:25 +0000 (08:44 +0530)]
add version.tpl in checklist
deb.monish [Tue, 20 Feb 2018 10:33:27 +0000 (16:03 +0530)]
Remove templates/CRM/common/version.tpl
deb.monish [Wed, 21 Feb 2018 03:14:25 +0000 (08:44 +0530)]
add version.tpl in checklist
Eileen McNaughton [Tue, 20 Feb 2018 23:50:58 +0000 (12:50 +1300)]
Merge pull request #11671 from eileenmcnaughton/nfc
Deduper - Pass arrays rather than strings to construct URLs
Tim Otten [Tue, 20 Feb 2018 23:42:26 +0000 (15:42 -0800)]
Merge pull request #11698 from reneolivo/patch-1
Fix wrong tag defintion
Tim Otten [Tue, 20 Feb 2018 22:27:31 +0000 (14:27 -0800)]
(civicrm-setup/1) CRM_Core_I18n - Loosen coupling to DB layer
Overview
--------
The `ts()`/`{ts}` feature from `CRM_Core_I18n` has an option to escape output
(e.g. `{ts escape="sql"}Activities{/ts}`). However, SQL encoding is subjective
(depending on the connection details). For `{ts}` to support this feature, it
must have a dependency on the DB subsystem (e.g. it eventually calls `CRM_Core_DAO`).
For https://github.com/civicrm/civicrm-setup/issues/1, we have an issue
where expressions like `{ts escape="sql"}Activities{/ts}` fail during
installation because `CRM_Core_DAO` is not fully available.
This change loosens the coupling, so that we can use `{ts escape="sql"}Activities{/ts}`
without needing `CRM_Core_DAO` per se.
Before
------
`ts`/`CRM_Core_I18n` is tightly coupled to `CRM_Core_DAO`. There is no way
to use `{ts escape=sql}Activities{/ts}` without spinning-up `CRM_Core_DAO`.
After
-----
`ts`/`CRM_Core_I18n` *defaults* to calling `CRM_Core_DAO`. However, this can
be overriden by manipulating a property.
Comments
--------
* I feel a little dirty keeping any coupling between i18n and the DB.
However, changing this would mean removing support for the
`{ts escape=sql}` option, and that would be a clear compatibility-break.
* Arguably, there may be a microsecond-level penalty in using
`call_user_func($SQL_ESCAPER)` rather than a specific class/function.
However, it's only incurred if you actually call `{ts escape=sql}`
while setting `$SQL_ESCAPER`, and that's pretty rare circumstance.
The typical runtime use-cases for `ts()` are unaffected.
René Olivo [Tue, 20 Feb 2018 20:03:23 +0000 (16:03 -0400)]
Fix wrong tag defintion
This notification template has a wrong HTML definition which makes it break a bit .
<img src="https://user-images.githubusercontent.com/
1642119/
36434765-
36c7bf66-1636-11e8-84a5-
2ffb75ef5eab.png" />
colemanw [Tue, 20 Feb 2018 15:54:36 +0000 (10:54 -0500)]
Merge pull request #11689 from eileenmcnaughton/groupOrg
Fix GroupNesting, GroupOrganization, Domain to work with singleValueAlter
deb.monish [Tue, 20 Feb 2018 10:33:27 +0000 (16:03 +0530)]
Remove templates/CRM/common/version.tpl
Eileen McNaughton [Tue, 20 Feb 2018 08:40:33 +0000 (21:40 +1300)]
Merge pull request #11692 from eileenmcnaughton/form
CRM-21391 Convert Activity to use core Task class
Eileen McNaughton [Tue, 20 Feb 2018 00:48:44 +0000 (13:48 +1300)]
Merge pull request #11693 from eileenmcnaughton/cont_form
CRM-21391 Convert Contribute to use core Task class
Eileen McNaughton [Mon, 19 Feb 2018 22:31:24 +0000 (11:31 +1300)]
Merge pull request #11682 from totten/master-i18n-preboot
(civicrm-setup#1) CRM_Core_I18n - Don't require immediate bootstrap
Matthew Wire [Mon, 19 Feb 2018 14:15:06 +0000 (14:15 +0000)]
PHP doesn't allow abstract static functions.
Matthew Wire [Tue, 2 Jan 2018 09:04:50 +0000 (16:04 +0700)]
Convert Contribute to use core Task class
Matthew Wire [Tue, 2 Jan 2018 09:02:30 +0000 (16:02 +0700)]
Convert Activity to use core Task class
colemanw [Mon, 19 Feb 2018 16:29:49 +0000 (11:29 -0500)]
Merge pull request #11690 from mattwire/CRM-21781_dont_fatal_on_contact_view
CRM-21781 Don't crash CiviCRM when missing contact ID
Matthew Wire [Mon, 19 Feb 2018 10:03:05 +0000 (10:03 +0000)]
Don't crash CiviCRM when missing contact ID
eileen [Mon, 19 Feb 2018 06:17:51 +0000 (19:17 +1300)]
Fix GroupNesting, GroupOrganization, Domain to work with singleValueAlter
Eileen McNaughton [Sun, 18 Feb 2018 23:32:20 +0000 (12:32 +1300)]
Merge pull request #11687 from totten/master-topsort
composer.json - De-fork dependency, marcj/topsort
Tim Otten [Sun, 18 Feb 2018 21:27:07 +0000 (13:27 -0800)]
composer.json - De-fork dependency, marcj/topsort
When this dependency was originally added, we needed a few patches (for PHP 5.3 compatibility)
and initially used a forked version of library. Of course, it's undesirable to use a fork
in the long term (e.g. harder to apply upgrades; harder to merge into other build processes).
In the intervening period, upstream has merged the patches for PHP 5.3, and
we've politely asked downstream to get over PHP 5.3, so we're covered on
both ends. Let's get back on the mainline branch!
Eileen McNaughton [Sun, 18 Feb 2018 21:07:29 +0000 (10:07 +1300)]
Merge pull request #11685 from colemanw/4-7-28-up
Ignore errors when upgrade step already took place
Eileen McNaughton [Sun, 18 Feb 2018 21:05:45 +0000 (10:05 +1300)]
Merge pull request #11686 from civicrm/4.7.31-rc
4.7.31 rc
colemanw [Sun, 18 Feb 2018 13:13:24 +0000 (08:13 -0500)]
Merge pull request #11411 from mattwire/CRM-21558_case_batch_task
CRM-21558 Add batch update via profile for cases
Monish Deb [Sun, 18 Feb 2018 02:52:41 +0000 (08:22 +0530)]
Merge pull request #11676 from seamuslee001/CRM-21759
CRM-21759 Remove template variable as not needed and causing issues o…
colemanw [Sat, 17 Feb 2018 22:07:16 +0000 (17:07 -0500)]
Merge pull request #11670 from eileenmcnaughton/warn
CRM-21766 quash reload warning on dedupe conflicts screen
colemanw [Sat, 17 Feb 2018 22:01:55 +0000 (17:01 -0500)]
Merge pull request #11608 from eileenmcnaughton/mailing_custom
CRM-21140 extend support for custom data to Mailing api
colemanw [Sat, 17 Feb 2018 21:59:54 +0000 (16:59 -0500)]
Merge pull request #11496 from magnolia61/CRM-21639-NoIndex_when_event_is_not_public
CRM-21639 NOINDEX Event Info page when event is non-public or in the past
Coleman Watts [Sat, 17 Feb 2018 18:16:29 +0000 (13:16 -0500)]
Ignore errors when upgrade step already took place
colemanw [Fri, 16 Feb 2018 19:04:23 +0000 (14:04 -0500)]
Merge pull request #11665 from JMAConsulting/CRM-21760-rc
CRM-21760: Manager Name is missing in 'Find Cases' search list
colemanw [Fri, 16 Feb 2018 19:03:59 +0000 (14:03 -0500)]
Remove unused var
Monish Deb [Fri, 16 Feb 2018 14:09:06 +0000 (19:39 +0530)]
Merge pull request #11677 from totten/master-xml-install
(civicrm-setup#1) Facilitate more direct installation
colemanw [Fri, 16 Feb 2018 13:15:23 +0000 (08:15 -0500)]
Merge pull request #11678 from mukeshcompucorp/CRM-21770-change-position-of-help-div-in-export-participant
CRM-21770: Change position of help div
Tim Otten [Fri, 16 Feb 2018 11:45:29 +0000 (03:45 -0800)]
(civicrm-setup#1) CRM_Core_I18n - Don't require immediate bootstrap
For civicrm/civicrm-setup#1, the general goal is to allow installing the
database schema without needing to run `GenCode`.
The current draft is crashing because the SQL does translation using `ts()`.
But if you try to use `ts()` in a pre-boot environment, it will attempt to
boot automatically so that it can read `$config->customTranslateFunction.
This is a chicken-egg situation. We haven't yet reached the phase where the
installer can boot up Civi... because we don't have the SQL... but the SQL
can't be generated (translated) because Civi hasn't been booted.
The aim of this patch is to loosen the coupling between `ts()`
and `CRM_Core_Config` so that `ts()` can be used on its own.
> Aside: You might ask how this works today -- basically, `GenCode` does a
> database-less-boot, which placates `ts()`. However, the `civicrm-setup`
> will eventually need to do full-boot, and AFAIK we don't have any
> situations where one transitions from database-less-boot to full-boot; I
> have a gut fear that such a transition would be its own slipper slope.
Monish Deb [Fri, 16 Feb 2018 10:35:51 +0000 (16:05 +0530)]
Merge pull request #11252 from mattwire/CRM-21405_outboundsms_mobile_notprimary
CRM-21405 Allow "Outbound SMS" when Mobile is not primary phone number
Jitendra Purohit [Fri, 16 Feb 2018 09:39:19 +0000 (15:09 +0530)]
CRM-21778 - Contact image uploaded from drupal webform don't render on summary page
Matthew Wire [Wed, 8 Nov 2017 11:24:16 +0000 (11:24 +0000)]
Allow "Outbound SMS" when Mobile is not primary phone number
Monish Deb [Fri, 16 Feb 2018 08:53:58 +0000 (14:23 +0530)]
Merge pull request #11675 from totten/master-phonecaps
Add/Edit Contact - Fix inconsistent capitalization
Mukesh Ram [Fri, 16 Feb 2018 04:49:24 +0000 (10:19 +0530)]
CRM-21770: Change position of help div
Tim Otten [Thu, 15 Feb 2018 21:19:54 +0000 (13:19 -0800)]
xml/GenCode.php - Only allow CLI execution
If we're going to bundle the `xml` folder so that it can be used by the
installer, then we don't this particular file to be web-accessible.
Tim Otten [Thu, 15 Feb 2018 21:16:36 +0000 (13:16 -0800)]
distmaker - Include xml schema in tarballs
Tim Otten [Thu, 15 Feb 2018 21:11:37 +0000 (13:11 -0800)]
CRM_Core_CodeGen_Specification - Allow use from civicrm-setup
For https://github.com/civicrm/civicrm-setup/issues/1, this change allows
`civicrm-setup` to read the XML metadata in the same way as GenCode -- which
helps us to install the current schema without any intermediate files.
Seamus Lee [Thu, 15 Feb 2018 20:54:52 +0000 (07:54 +1100)]
CRM-21759 Remove template variable as not needed and causing issues on Joomla in 4.7.30
Tim Otten [Thu, 15 Feb 2018 18:05:04 +0000 (10:05 -0800)]
Add/Edit Contact - Fix inconsistent capitalization
In this context, there are several links: "Add another phone number", "Add
another IM", "Add another website". They should all be capitalized according
the same rules (e.g. standard sentence case).
Tim Otten [Thu, 15 Feb 2018 17:19:30 +0000 (09:19 -0800)]
Merge pull request #11667 from JMAConsulting/CRM-21765
CRM-21765: Commit files to git which are static but are generated from CodeGen like DAO files
colemanw [Thu, 15 Feb 2018 14:18:57 +0000 (09:18 -0500)]
Merge pull request #11585 from mukeshcompucorp/fix-page-structure
CRM-21708: Fixed page structure by adding/removing classes
Richard van Oosterhout [Tue, 9 Jan 2018 11:42:19 +0000 (12:42 +0100)]
CRM-21639 NOINDEX Event Info page when event is non-public
eileen [Thu, 15 Feb 2018 04:51:42 +0000 (17:51 +1300)]
[NFC] pass arrays rather than strings to construct urls in dedupe code
When we pass a query it is urlencoded and any quotes in the string are not subsequently htmlentity encoded plus
I think the url construction is generally cleaner
deb.monish [Wed, 14 Feb 2018 17:54:42 +0000 (23:24 +0530)]
CRM-21765: Commit files to git which are static but are generated from CodeGen like DAO files
eileen [Thu, 15 Feb 2018 01:23:16 +0000 (14:23 +1300)]
CRM-21766 quash reload warning
Eileen McNaughton [Wed, 14 Feb 2018 20:40:21 +0000 (09:40 +1300)]
Merge pull request #11622 from omarabuhussein/CRM-21733-membership-override-improvments
CRM-21733: Adding the ability to override membership until specific date
colemanw [Wed, 14 Feb 2018 18:01:39 +0000 (13:01 -0500)]
Merge pull request #11498 from magnolia61/CRM-21639_NOINDEX_Print_Preview_pages
CRM-21639_NOINDEX_Print_preview_pages
deb.monish [Sun, 11 Feb 2018 18:40:12 +0000 (00:10 +0530)]
CRM-21760: Manager Name is missing in 'Find Cases' search list
CiviCRM [Wed, 14 Feb 2018 01:45:38 +0000 (01:45 +0000)]
Set version to 4.7.32
Eileen McNaughton [Tue, 13 Feb 2018 20:36:38 +0000 (09:36 +1300)]
Merge pull request #11664 from eileenmcnaughton/geo
Change geocoder message check.
Eileen McNaughton [Tue, 13 Feb 2018 20:00:29 +0000 (09:00 +1300)]
Merge pull request #11520 from JMAConsulting/CRM-21654
CRM-21654: Support custom file field on Batch Entry Profile
eileen [Mon, 12 Feb 2018 19:40:08 +0000 (08:40 +1300)]
Change geocoder message check.
We should be using a dummy geocoder - but since we are not let's at least check for the correct message
Eileen McNaughton [Mon, 12 Feb 2018 19:26:56 +0000 (08:26 +1300)]
Merge pull request #11597 from seamuslee001/CRM-20996
CRM-20996 fix db error when using the Copy function for profiles from…
Eileen McNaughton [Mon, 12 Feb 2018 19:01:58 +0000 (08:01 +1300)]
Merge pull request #11644 from omarabuhussein/CRM-21743-fix-copying-event-template
CRM-21743: Fix creating new event template from existing one
Eileen McNaughton [Mon, 12 Feb 2018 05:18:31 +0000 (18:18 +1300)]
Merge pull request #11661 from Detsieber/core-2
dev/core#2 Display Inbound Email: linefeed fixed
Eileen McNaughton [Sun, 11 Feb 2018 22:10:50 +0000 (11:10 +1300)]
Merge pull request #11539 from eileenmcnaughton/payment
CRM-17647 fix for submitting payment with thousand separator
deb.monish [Sun, 11 Feb 2018 13:37:21 +0000 (19:07 +0530)]
additional fixes
eileen [Wed, 17 Jan 2018 22:56:05 +0000 (11:56 +1300)]
CRM-17647 fix for submitting payment with thousand separator
Detlev Sieber [Fri, 9 Feb 2018 09:57:51 +0000 (10:57 +0100)]
dev/core#2 Display Inbound Email: linefeed fixed
deb.monish [Mon, 15 Jan 2018 05:45:47 +0000 (11:15 +0530)]
CRM-21654: Support custom file field on Batch Entry Profile
Eileen McNaughton [Fri, 9 Feb 2018 00:00:02 +0000 (13:00 +1300)]
Merge pull request #11655 from JMAConsulting/CRM-20676-ut
Unit test for CRM-20676 fix
Eileen McNaughton [Thu, 8 Feb 2018 23:56:10 +0000 (12:56 +1300)]
Merge pull request #11656 from JMAConsulting/CRM-21751
CRM-21751: Move SMS provider ID to 'Select Recipients' page from 'SMS content'
Eileen McNaughton [Thu, 8 Feb 2018 19:59:58 +0000 (08:59 +1300)]
Merge pull request #11659 from JMAConsulting/ut-fix
Unit test fixes
deb.monish [Thu, 8 Feb 2018 12:26:36 +0000 (17:56 +0530)]
Unit test fixes
Monish Deb [Thu, 8 Feb 2018 07:54:02 +0000 (13:24 +0530)]
Merge pull request #11654 from eileenmcnaughton/greetings_earthling
CRM-21750 support addressee_id, email_greeting_id, postal_greeting_id as api filters
Monish Deb [Thu, 8 Feb 2018 07:27:17 +0000 (12:57 +0530)]
Merge pull request #11638 from ixiam/CRM-21343
CRM-21343: Add cancel filters for Contribution search
deb.monish [Thu, 8 Feb 2018 06:49:46 +0000 (12:19 +0530)]
CRM-21751: Move SMS provider ID to 'Select Recipients' page from 'SMS content'
Monish Deb [Thu, 8 Feb 2018 05:45:14 +0000 (11:15 +0530)]
Merge pull request #11646 from eileenmcnaughton/thous
CRM-17647 fix batch form & Online Event form to do money cleaning on the form
Monish Deb [Thu, 8 Feb 2018 05:34:16 +0000 (11:04 +0530)]
Merge pull request #11461 from mattwire/tax_calcs_on_edit_contribution
CRM-20676 Add tax_amount to contribution create params so it doesn't get added …
deb.monish [Thu, 8 Feb 2018 05:30:13 +0000 (11:00 +0530)]
Unit test for CRM-20676 fix
eileen [Thu, 8 Feb 2018 01:05:33 +0000 (14:05 +1300)]
Remove code comment previously rendered obsolute by removing clean action
eileen [Wed, 7 Feb 2018 08:41:31 +0000 (21:41 +1300)]
CRM-17647 add tests & form cleaning of event thousand separators
style fix
eileen [Wed, 7 Feb 2018 08:08:28 +0000 (21:08 +1300)]
CRM-17647 fix another instance of mishandling thousand separators
eileen [Thu, 8 Feb 2018 04:50:33 +0000 (17:50 +1300)]
CRM-21750 support addressee_id, email_greeting_id, postal_greeting_id as api filters
Eileen McNaughton [Thu, 8 Feb 2018 03:47:07 +0000 (16:47 +1300)]
Merge pull request #11636 from eileenmcnaughton/view_only
CRM-21738 fix transfer of view_only custom data.
Monish Deb [Thu, 8 Feb 2018 03:24:08 +0000 (08:54 +0530)]
Merge pull request #11652 from eileenmcnaughton/hack_test
Fix unit test to not rely on hacking the DB to have ids for price set…
Eileen McNaughton [Thu, 8 Feb 2018 02:49:36 +0000 (15:49 +1300)]
Merge pull request #11653 from eileenmcnaughton/evil
CRM-21749 fix obscure regression :Mailing api no longer respecting '_skip_evil_bao_auto_schedule_'
eileen [Tue, 6 Feb 2018 05:36:02 +0000 (18:36 +1300)]
CRM-21738 fix transfer of view_only custom data.
View only custom data was not being transferred during the merge despite code in order
to achieve that. The reason was the metadata was being used from the (hateful)
getGroupTree function, but without passing $permissions = FALSE it was not
returning viewOnly fields. Note that this metadata retrieval function is a bad place for
filtering - they should be in separate functions.
eileen [Thu, 8 Feb 2018 01:07:07 +0000 (14:07 +1300)]
CRM-21749 fix obscure regression :Mailing api no longer respecting '_skip_evil_bao_auto_schedule_'
Eileen McNaughton [Thu, 8 Feb 2018 00:33:30 +0000 (13:33 +1300)]
Merge pull request #11645 from eileenmcnaughton/prox_smart_group
CRM-21744 fix proximity search to work with smart groups
eileen [Wed, 7 Feb 2018 23:03:22 +0000 (12:03 +1300)]
Fix unit test to not rely on hacking the DB to have ids for price sets & associated values
eileen [Wed, 7 Feb 2018 07:22:00 +0000 (20:22 +1300)]
CRM-21744 fix proximity search to work with smart groups
Eileen McNaughton [Wed, 7 Feb 2018 22:42:46 +0000 (11:42 +1300)]
Merge pull request #11631 from mattwire/CRM-20625_payproc_extension_dont_kill_civi
CRM-20625 Don't crash if we can't find the payment processor class.
colemanw [Wed, 7 Feb 2018 22:22:46 +0000 (17:22 -0500)]
Merge pull request #11621 from eileenmcnaughton/trait
CRM-19752 Improve performance for non-ACL users on summaryQuery
Matthew Wire [Mon, 5 Feb 2018 15:38:29 +0000 (15:38 +0000)]
Don't crash if we can't find the payment processor class. Add warning when editing a payment processor that doesn't exist.