Mukesh Ram [Wed, 21 Mar 2018 08:54:31 +0000 (14:24 +0530)]
Fix template structure
Mukesh Ram [Tue, 20 Mar 2018 05:14:38 +0000 (10:44 +0530)]
Fix table for Contribute
Mukesh Ram [Mon, 19 Mar 2018 07:24:20 +0000 (12:54 +0530)]
Move help section outside of block
Mukesh Ram [Mon, 19 Mar 2018 07:16:52 +0000 (12:46 +0530)]
Fix template structures
Mukesh Ram [Thu, 15 Mar 2018 14:05:03 +0000 (19:35 +0530)]
Fix template in pledge and batch
Mukesh Ram [Wed, 14 Mar 2018 11:36:04 +0000 (17:06 +0530)]
Fix transaction templates
Mukesh Ram [Tue, 13 Mar 2018 05:35:18 +0000 (11:05 +0530)]
Call labels from logic instead of static
Mukesh Ram [Sat, 10 Mar 2018 11:02:03 +0000 (16:32 +0530)]
Fix template structure
Mukesh Ram [Fri, 9 Mar 2018 10:10:06 +0000 (15:40 +0530)]
Fix classes and tags
Mukesh Ram [Fri, 9 Mar 2018 07:21:39 +0000 (12:51 +0530)]
Make pledge labels proper
Mukesh Ram [Fri, 9 Mar 2018 06:10:11 +0000 (11:40 +0530)]
Add appropriate labels
Mukesh Ram [Fri, 9 Mar 2018 04:42:17 +0000 (10:12 +0530)]
Fix style glitches
Mukesh Ram [Thu, 8 Mar 2018 13:00:25 +0000 (18:30 +0530)]
Make template structure proper
Mukesh Ram [Wed, 7 Mar 2018 11:50:23 +0000 (17:20 +0530)]
Add proper class to form
Mukesh Ram [Wed, 7 Mar 2018 11:00:24 +0000 (16:30 +0530)]
Fix template structure
Mukesh Ram [Mon, 5 Mar 2018 11:28:47 +0000 (16:58 +0530)]
Fixed template strucutre issues
colemanw [Thu, 1 Mar 2018 15:21:57 +0000 (10:21 -0500)]
Merge pull request #11735 from mukeshcompucorp/CRM-21814-add-proper-container-to-text
CRM-21814: Fixed text wrapping
colemanw [Wed, 28 Feb 2018 23:15:13 +0000 (18:15 -0500)]
Merge pull request #11742 from seanmadsen/NFC-CRM_PCP_Form_Event
(NFC) Remove redundant line, improve docblocks
Sean Madsen [Wed, 28 Feb 2018 21:40:03 +0000 (16:40 -0500)]
Clean up docblock
Sean Madsen [Wed, 28 Feb 2018 21:30:44 +0000 (16:30 -0500)]
Remove redundant line
colemanw [Wed, 28 Feb 2018 19:02:09 +0000 (14:02 -0500)]
Merge pull request #11738 from mukeshcompucorp/CRM-21817-move-help-section-outside-crm-block
CRM-21817: Move help section outside form block
Tim Otten [Wed, 28 Feb 2018 17:33:55 +0000 (09:33 -0800)]
Merge pull request #11740 from JMAConsulting/update-templates
[NFC] Update xml/templates/* headers
deb.monish [Wed, 28 Feb 2018 14:27:00 +0000 (19:57 +0530)]
Update xml/templates/* headers
Mukesh Ram [Wed, 28 Feb 2018 13:17:21 +0000 (18:47 +0530)]
CRM-21817: Move help section outside form block
Mukesh Ram [Wed, 28 Feb 2018 06:15:41 +0000 (11:45 +0530)]
CRM-21814: Fixed text wrapping
Eileen McNaughton [Wed, 28 Feb 2018 02:42:54 +0000 (15:42 +1300)]
Merge pull request #11731 from totten/master-setver
(release/1) Allow set-version.php to generate upgraders for major/minor increments
Tim Otten [Tue, 27 Feb 2018 22:59:34 +0000 (14:59 -0800)]
set-version.php - Update civicrm-version.php (if applicable)
Currently, this file is produced by GenCode, so it's not critical to update it via `set-version.php`. However, it's
a bit easier to test the process if this file is kept up-to-date.
In the near future, this file may be reworked to read from the canonical
source. However, the search/replace should still be safe then.
Tim Otten [Tue, 27 Feb 2018 22:33:16 +0000 (14:33 -0800)]
set-version.php - Add support for generating major/minor PHP files
Tim Otten [Tue, 27 Feb 2018 22:23:34 +0000 (14:23 -0800)]
CRM_Upgrade_Form - Move number/label mapping to CRM_Utils_EnglishNumber
Seamus Lee [Tue, 27 Feb 2018 20:14:57 +0000 (07:14 +1100)]
Merge pull request #11702 from jmcclelland/pdf-receipt-filename
ensure pdfFilename is set
Seamus Lee [Tue, 27 Feb 2018 19:55:46 +0000 (06:55 +1100)]
Merge pull request #11712 from jitendrapurohit/CRM-21795
CRM-21795 - Avoid fatal error to be displayed in log files.
Eileen McNaughton [Tue, 27 Feb 2018 19:42:41 +0000 (08:42 +1300)]
Merge pull request #11728 from JMAConsulting/CRM-21809
CRM-21809: 'Advance search' group by issue
Monish Deb [Tue, 27 Feb 2018 17:12:33 +0000 (22:42 +0530)]
Merge pull request #11725 from tschuettler/fix-field-required
CiviReport - Check for trueish values of the parameter 'required'
Monish Deb [Tue, 27 Feb 2018 17:11:36 +0000 (22:41 +0530)]
Merge pull request #11642 from JKingsnorth/CRM-21739
[NFC] CRM-21739 Test improvements for mailing getRecipients
Monish Deb [Tue, 27 Feb 2018 17:02:49 +0000 (22:32 +0530)]
Merge pull request #11729 from lcdservices/CRM-21810
CRM-21810 changelog panel UI tweaks
Brian Shaughnessy [Tue, 27 Feb 2018 15:51:50 +0000 (10:51 -0500)]
CRM-21810 changelog panel UI tweaks
deb.monish [Tue, 27 Feb 2018 13:18:37 +0000 (18:48 +0530)]
CRM-21809: 'Advance search' group by issue
JKingsnorth [Tue, 27 Feb 2018 12:22:15 +0000 (12:22 +0000)]
CRM-21739 [NFC] Refactoring for SMS recipient test
JKingsnorth [Mon, 26 Feb 2018 15:39:39 +0000 (15:39 +0000)]
CRM-21739 Test for getRecipients in/exclude mailing groups
Jitendra Purohit [Fri, 23 Feb 2018 06:30:11 +0000 (12:00 +0530)]
CRM-21795 - Avoid fatal error to be displayed in log files.
Thomas Schüttler [Tue, 27 Feb 2018 09:35:07 +0000 (10:35 +0100)]
Check for trueish required values
Eileen McNaughton [Mon, 26 Feb 2018 22:53:53 +0000 (11:53 +1300)]
Merge pull request #11696 from mydropwizard/phpword-0.14.0
Update to PHPWord 0.14.0
Eileen McNaughton [Mon, 26 Feb 2018 22:45:16 +0000 (11:45 +1300)]
Merge pull request #11723 from mukeshcompucorp/CRM-21805-fix-fields-and-labels-in-find-participants
CRM-21805: Fixed fields and labels in find participants
colemanw [Mon, 26 Feb 2018 22:43:58 +0000 (17:43 -0500)]
Merge pull request #11571 from magnolia61/CRM-21693_Show_Name_in_OnlinePayNow_UI
Crm 21693 show Display Name in online pay now UI
David Snopek [Mon, 26 Feb 2018 16:53:44 +0000 (10:53 -0600)]
Update composer.lock for PHPWord update
David Snopek [Tue, 20 Feb 2018 14:11:55 +0000 (08:11 -0600)]
Update to PHPWord 0.14.0
Mukesh Ram [Mon, 26 Feb 2018 12:59:50 +0000 (18:29 +0530)]
CRM-21805: Fixed fields and labels in find participants
colemanw [Mon, 26 Feb 2018 09:44:32 +0000 (04:44 -0500)]
Merge pull request #11719 from eileenmcnaughton/fatal
Throw exception instead of using fatal
eileen [Mon, 26 Feb 2018 02:32:35 +0000 (15:32 +1300)]
CRM-21804 improve error handling on duplicate contribution.
Duplicate contributions are a really not handled well anywhere in the form layer.
The CRM_Core_Error winds up using the fatal template, which has the same end
result for form users as if an exception were thrown, let's switch.
Note that this appears to be the only scenario when an error would
be returned so we can simply drop that handling
Monish Deb [Mon, 26 Feb 2018 04:15:05 +0000 (09:45 +0530)]
Merge pull request #11718 from eileenmcnaughton/website
CRM-21803 Fix another entity to be standardised & support custom data
eileen [Sun, 25 Feb 2018 22:03:58 +0000 (11:03 +1300)]
Fix another entity to be standardised & support custom data
colemanw [Sat, 24 Feb 2018 13:15:28 +0000 (08:15 -0500)]
Merge pull request #11688 from eileenmcnaughton/custom
Fix more entities to support custom fields (via api)
Seamus Lee [Sat, 24 Feb 2018 09:24:00 +0000 (20:24 +1100)]
Merge pull request #11713 from yashodha/update-year
(NFC) Update copyright header for 2018
Eileen McNaughton [Sat, 24 Feb 2018 07:50:16 +0000 (20:50 +1300)]
Merge pull request #11717 from seamuslee001/nfc_renewal_civilint_Fix
(NFC) MembershipRenewal.php - Fix civilint error
colemanw [Sat, 24 Feb 2018 02:58:06 +0000 (21:58 -0500)]
Merge pull request #11714 from mukeshcompucorp/CRM-21797-change-structure-of-campaign-search-pages
CRM-21797: Fixed structure for campaign search pages
colemanw [Sat, 24 Feb 2018 02:43:35 +0000 (21:43 -0500)]
Merge pull request #11694 from eileenmcnaughton/website
Move towards standardising website.create function.
Seamus Lee [Sat, 24 Feb 2018 01:27:30 +0000 (12:27 +1100)]
NFC fix civilint error on MembershipRenewal.php
eileen [Tue, 20 Feb 2018 03:28:21 +0000 (16:28 +1300)]
Move towards standardising website.create function.
Mukesh Ram [Fri, 23 Feb 2018 09:30:42 +0000 (15:00 +0530)]
CRM-21797: Fixed structure for campaign search pages
yashodha [Fri, 23 Feb 2018 08:52:57 +0000 (14:22 +0530)]
fix header
eileen [Mon, 19 Feb 2018 02:17:10 +0000 (15:17 +1300)]
Fix more entities to support custom fields (via api)
colemanw [Fri, 23 Feb 2018 04:23:24 +0000 (23:23 -0500)]
Merge pull request #11154 from agileware/CRM-20421
CRM-20421: Inherited memberships are converted to individual memberships when the "parent" for the membership is merged with another contact
Tim Otten [Thu, 22 Feb 2018 23:29:12 +0000 (15:29 -0800)]
Merge pull request #11711 from seamuslee001/variable_rename_filter_fields
(NFC) Rename fiterable fields param in _civicrm_api3_basic_array_get …
Seamus Lee [Thu, 22 Feb 2018 22:04:27 +0000 (09:04 +1100)]
Merge pull request #11709 from totten/master-extget
CRM-21792 Extension.get API - Fix regression (4.7.13) in result filtering
Seamus Lee [Thu, 22 Feb 2018 21:15:14 +0000 (08:15 +1100)]
(NFC) Rename fiterable fields param in _civicrm_api3_basic_array_get to be more explicit about what it is for
Tim Otten [Thu, 22 Feb 2018 20:26:12 +0000 (12:26 -0800)]
api_v3_ExtensionTest::testExtensionGet - Be a little less flaky
The test has a magic number which seems to be based on the number of
extensions in the `drupal-clean` build profile -- which is basically the
smallest number anyone might have. However, it gives false-negatives if you
have any other extensions around. Make it a little less flaky.
Tim Otten [Thu, 22 Feb 2018 20:15:24 +0000 (12:15 -0800)]
Extension.get API - Only apply special filters once (key/keys/full_name)
Filtering extensions by key is a good idea -- so good we have three ways to do it! ;)
All of these fields accept a `string|array<string>` input, which is different from
the typical filtering supported by `_civicrm_api3_basic_array_get()` (which only
matches on values)... If you happen to choose a basic filter that passes both
filters (i.e. a simple string-match), then it works. But if you choose a filter
where they behave differnetly (i.e. an array), then you get weird results.
Tim Otten [Thu, 22 Feb 2018 16:38:41 +0000 (08:38 -0800)]
Extension.get API - Fix regression (4.7.13) in result filtering
Overview
--------
When one calls the `Extension.get` API, it should support filtering. For
example, these commands would return only installed extensions or only
uninstalled extensions (respectively):
```
cv api Extension.get status=installed
cv api Extension.get status=uninstalled
```
Before
------
The implementation of `Extension.get` passes a list of all extensions down to
`_civicrm_api3_basic_array_get()` which is supposed to interpret any APIv3
options (such as filter-values/offsets/limits). However, it confuses the
`return` list (i.e. the names of any columns *that the user wants to see*) with the
*filterable* list (i.e. the names of any columns *for which filtering is
permitted*).
After
-----
The implementation of `Extension.get` passes a list of all extensions down to
`_civicrm_api3_basic_array_get()`. It also passes a fixed list of columns
which one might reasonably want to filter.
It might be nice to support filtering on all fields, but (a) several fields
wouldn't be sensible (because they're nested arrays) and (b) this provides a
smaller surface-area to maintain.
Comments
--------
The doc-block for `_civicrm_api3_basic_array_get()` describes the purpose of this field:
https://github.com/civicrm/civicrm-core/blob/4.7.0/api/v3/utils.php#L2390-L2391
Since ~v4.7.13, this line of code appears to have gone through several revisions, e.g.
* The regression was originally introduced by
517dfba8b
* Subsequent partial-fixes were
d4c44c700,
9776f417,
34239e81,
525ccb68
CC @lucianov88 @twomice @tschuettler @seamuslee001 for review
colemanw [Thu, 22 Feb 2018 16:45:51 +0000 (11:45 -0500)]
Merge pull request #11706 from JMAConsulting/CRM-21789
CRM-21789: 'Find Case' group by issue
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…
deb.monish [Thu, 22 Feb 2018 12:44:38 +0000 (18:14 +0530)]
test failure fix
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
deb.monish [Thu, 22 Feb 2018 08:13:41 +0000 (13:43 +0530)]
CRM-21789: 'Find Case' group by issue
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.
Jamie McClelland [Wed, 21 Feb 2018 22:11:27 +0000 (17:11 -0500)]
ensure pdfFilename is set
Avoid setting the filename to a non-existent variable.
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