Eileen McNaughton [Thu, 22 Jun 2017 08:15:57 +0000 (20:15 +1200)]
Merge pull request #10542 from seamuslee001/CRM-20720
CRM-20720 CRM-20757 Fix issue where Price Options were not being sort…
Eileen McNaughton [Thu, 22 Jun 2017 06:09:52 +0000 (18:09 +1200)]
Merge pull request #10274 from eileenmcnaughton/activity2
CRM-19821 performance improvement on the activity search
eileen [Mon, 19 Jun 2017 07:57:52 +0000 (19:57 +1200)]
CRM-19821 turn action links into relative links.
This is to fix the test in the first instance but discussed with Seamus & Monish & both
felt that relative links are more correct
eileen [Mon, 22 May 2017 21:51:01 +0000 (09:51 +1200)]
CRM-19821 unit test
eileen [Fri, 28 Apr 2017 03:51:16 +0000 (15:51 +1200)]
CRM-19821 performance improvement on the activity search.
This commit removes 2 bad joins from the activity search
- priority_id - this is just removed from the returnProperties as it is not rendered
- activity_status_id - this is handled as a pseudoconstant rather than the bad join
activity_type_id is partially handled, however, there is a component_id filter
that needs to be fixed before the bad join on this
field can be removed.
Seamus Lee [Wed, 21 Jun 2017 21:55:29 +0000 (07:55 +1000)]
CRM-20720 CRM-20757 Fix issue where Price Options were not being sorted by weight
Eileen McNaughton [Wed, 21 Jun 2017 19:55:00 +0000 (07:55 +1200)]
Merge pull request #10306 from aydun/CRM-20525
CRM-20525 Fix version of mail sent for pay later mails from webform
Monish Deb [Wed, 21 Jun 2017 19:12:32 +0000 (00:42 +0530)]
Merge pull request #9777 from jitendrapurohit/CRM-19745fix
CRM-19745: Image URL field doesn't show up on CiviEvent Additional Pa…
Coleman Watts [Wed, 21 Jun 2017 19:11:31 +0000 (15:11 -0400)]
Merge branch '4.7.21-rc' into master
colemanw [Wed, 21 Jun 2017 19:11:03 +0000 (15:11 -0400)]
Merge pull request #10540 from colemanw/CRM-20091
CRM-20091 - Fix return value in api.customValue.gettree
Coleman Watts [Wed, 21 Jun 2017 17:34:36 +0000 (13:34 -0400)]
CRM-20091 - Fix return value in api.customValue.gettree
jitendrapurohit [Fri, 3 Feb 2017 12:05:15 +0000 (17:35 +0530)]
CRM-19745: Image URL field doesn't show up on CiviEvent Additional Participants Profile
Tim Otten [Wed, 21 Jun 2017 05:31:28 +0000 (22:31 -0700)]
Merge pull request #10534 from seamuslee001/CRM-20670
CRM-20670 (NFC) Style alter as per Eileen
Yashodha Chaku [Wed, 21 Jun 2017 04:23:36 +0000 (09:53 +0530)]
Merge pull request #10515 from yashodha/CRM-20741
CRM-20741 - Cancellation message shown as error
Seamus Lee [Wed, 21 Jun 2017 02:34:30 +0000 (12:34 +1000)]
CRM-20670 (NFC) Style alter as per Eileen
Eileen McNaughton [Wed, 21 Jun 2017 02:14:37 +0000 (14:14 +1200)]
Merge pull request #10455 from JO0st/CRM-20670
CRM-20670 fix editing membership types with a lot of members
Eileen McNaughton [Tue, 20 Jun 2017 22:29:12 +0000 (10:29 +1200)]
Merge pull request #10487 from mfb/CRM-20713
CRM-20713 - CiviMail - do not set mode = 'sms' if sms_provider_id = 'null'
Mathieu Lu [Tue, 20 Jun 2017 15:38:08 +0000 (11:38 -0400)]
Merge pull request #10449 from jmcclelland/CRM-20666
CRM-20666 - allow filenames up to 255 characters
Joost [Thu, 1 Jun 2017 09:55:51 +0000 (11:55 +0200)]
fixes editing membership type for membershiptypes with a lot of members
Monish Deb [Tue, 20 Jun 2017 07:29:38 +0000 (12:59 +0530)]
Merge pull request #10532 from monishdeb/CRM-20488_soft_credit_organization
CRM-20488: remove unused variable _honoreeProfileType
deb.monish [Tue, 20 Jun 2017 06:05:40 +0000 (11:35 +0530)]
CRM-20488: remove unused variable _honoreeProfileType
Eileen McNaughton [Tue, 20 Jun 2017 05:01:55 +0000 (17:01 +1200)]
Merge pull request #10528 from tschuettler/CRM-20746
CRM-20746 - CiviMail - Use body_text for text part of resubscription …
Mathieu Lu [Tue, 20 Jun 2017 02:49:50 +0000 (22:49 -0400)]
CRM-16395: Installation with localized default settings (4) (#10518)
CRM-16395: Installation with localized default settings
This makes it possible to have a file in "civicrm/l10n/xx_YY/settings.default.json" with default settings that correspond to the locale during installation (ex: default country, currency, date formats, etc).
Mathieu Lu [Tue, 20 Jun 2017 00:44:41 +0000 (20:44 -0400)]
Merge pull request #10432 from francescbassas/patch-11
CRM-20650 Translate strings
Eileen McNaughton [Mon, 19 Jun 2017 22:35:03 +0000 (10:35 +1200)]
Merge pull request #10424 from twomice/CRM-20401_subscription_urls
Fix CRM-20401: use native CiviCRM recurring links
Eileen McNaughton [Mon, 19 Jun 2017 22:27:13 +0000 (10:27 +1200)]
Merge pull request #10530 from davejenx/CRM-20443-master
CRM-20443 - SQL syntax error creating logging triggers if column name…
Monish Deb [Mon, 19 Jun 2017 20:16:25 +0000 (01:46 +0530)]
Merge pull request #10419 from twomice/CRM-20488_soft_credit_organization
Fix CRM-20488: remove restrictions on soft credit contact type.
Monish Deb [Mon, 19 Jun 2017 19:40:47 +0000 (01:10 +0530)]
Merge pull request #10447 from JMAConsulting/CRM-19478
CRM-19478: Handle p=null oddity for Paypal Pro Recurring payments
deb.monish [Mon, 19 Jun 2017 19:20:34 +0000 (00:50 +0530)]
minor fix
Allen Shaw [Tue, 13 Jun 2017 15:54:00 +0000 (10:54 -0500)]
Additional for CRM-20488: remove useless preProcess() method.
Allen Shaw [Fri, 26 May 2017 00:51:07 +0000 (19:51 -0500)]
Fix CRM-20488: remove restrictions on soft credit contact type.
Monish Deb [Mon, 19 Jun 2017 18:59:57 +0000 (00:29 +0530)]
Merge pull request #10524 from jitendrapurohit/CRM-20745
CRM-20745: Post date of recur not respected in credit card pledge pay…
Monish Deb [Mon, 19 Jun 2017 18:40:52 +0000 (00:10 +0530)]
Merge pull request #10521 from JMAConsulting/CRM-20495
CRM-20495 : 'Contribution amounts section' checkbox setting on contribution pages always shows as checked
Monish Deb [Mon, 19 Jun 2017 18:11:24 +0000 (23:41 +0530)]
Merge pull request #10457 from jitendrapurohit/CRM-20675
CRM-20675: Fix incorrect renewal activity created when membership upd…
Monish Deb [Mon, 19 Jun 2017 17:29:04 +0000 (22:59 +0530)]
Minor fix at unit test
Dave Jenkins [Mon, 19 Jun 2017 17:02:14 +0000 (18:02 +0100)]
CRM-20443 - SQL syntax error creating logging triggers if column name is reserved word - 4.7 version
Monish Deb [Mon, 19 Jun 2017 16:49:10 +0000 (22:19 +0530)]
Merge pull request #10467 from JMAConsulting/CRM-20682
CRM-20682: Include human readable contribution's custom field label in token widget for Thankyou letter
Thomas Schüttler [Mon, 19 Jun 2017 10:38:26 +0000 (12:38 +0200)]
CRM-20746 - CiviMail - Use body_text for text part of resubscription confirmation mails
----------------------------------------
* CRM-20746: CiviMail - text part of resubscribe confirmation mail contains html
https://issues.civicrm.org/jira/browse/CRM-20746
Jitendra Purohit [Mon, 19 Jun 2017 09:51:50 +0000 (15:21 +0530)]
Add test
Eileen McNaughton [Mon, 19 Jun 2017 01:41:51 +0000 (13:41 +1200)]
Merge pull request #10526 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Mon, 19 Jun 2017 00:18:56 +0000 (12:18 +1200)]
Merge pull request #10523 from seamuslee001/animated_image
(NFC) re add in animated-overlay.gif is no longer provided by jquery-ui
Eileen McNaughton [Sun, 18 Jun 2017 23:26:36 +0000 (11:26 +1200)]
Merge pull request #10525 from seamuslee001/contribution_test_rigger_fix
(NFC) Fix clearing messages to ensure test accuracy
Seamus Lee [Sun, 18 Jun 2017 22:07:30 +0000 (08:07 +1000)]
(NFC) Fix clearing messages to ensure test accuracy
Jitendra Purohit [Sun, 18 Jun 2017 08:13:13 +0000 (13:43 +0530)]
CRM-20745: Post date of recur not respected in credit card pledge payment
colemanw [Sun, 18 Jun 2017 02:43:05 +0000 (22:43 -0400)]
Merge pull request #10522 from colemanw/CRM-20743
CRM-20743 - Check tag permissions in UI and BAO
francescbassas [Sat, 17 Jun 2017 23:31:54 +0000 (01:31 +0200)]
Apply mlutfy changes
Seamus Lee [Sat, 17 Jun 2017 23:31:44 +0000 (09:31 +1000)]
(NFC) re add in animated-overlay.gif is no longer provided by jquery-ui
francescbassas [Sat, 17 Jun 2017 23:30:37 +0000 (01:30 +0200)]
Apply mlutfy changes
Coleman Watts [Sat, 17 Jun 2017 22:25:47 +0000 (18:25 -0400)]
Remove stray semicolon
Coleman Watts [Sat, 17 Jun 2017 22:22:01 +0000 (18:22 -0400)]
CRM-20743 - Check tag permissions in form layer
colemanw [Sat, 17 Jun 2017 22:19:29 +0000 (18:19 -0400)]
Merge pull request #10429 from JMAConsulting/CRM-20622
CRM-20622 , CRM-20673 : tags and groups panel layout/styling
deb.monish [Sat, 17 Jun 2017 20:24:13 +0000 (01:54 +0530)]
QA fixes
Coleman Watts [Sat, 17 Jun 2017 18:43:40 +0000 (14:43 -0400)]
CRM-20743 - Check tag permissions in UI and BAO
deb.monish [Wed, 14 Jun 2017 20:09:46 +0000 (01:39 +0530)]
CRM-20673: Tag and group edit form: implement Select2 for tags
deb.monish [Sun, 28 May 2017 10:08:03 +0000 (15:38 +0530)]
CRM-20622: contact edit: tags and groups panel layout/styling
deb.monish [Sat, 17 Jun 2017 15:17:37 +0000 (20:47 +0530)]
CRM-20495 : 'Contribution amounts section' checkbox setting on contribution pages always shows as checked
Monish Deb [Sat, 17 Jun 2017 10:59:17 +0000 (16:29 +0530)]
Merge pull request #10441 from JMAConsulting/CRM-20621
CRM-20621 : manage tags: the tag usage count is not accurate
CiviCRM [Sat, 17 Jun 2017 06:41:23 +0000 (06:41 +0000)]
Set version to 4.7.22
Tim Otten [Sat, 17 Jun 2017 06:06:27 +0000 (23:06 -0700)]
Merge pull request #10085 from totten/master-assets
CRM-20600 - AngularJS - Allowing hooking and static-caching
Tim Otten [Sat, 17 Jun 2017 05:16:15 +0000 (22:16 -0700)]
CRM-20600 - AssetBuiler - Add separate setting, `assetCache`
The default value (`auto`) behaves the same as the current behavior: enable
caching in production mode, disable caching in debug mode.
But it also allows you to enable/disable caching independent of the
prod/debug mode.
Mathieu Lu [Sat, 17 Jun 2017 03:42:51 +0000 (23:42 -0400)]
Merge pull request #9790 from fliespl/patch-3
CRM-19896 - customTranslateFunction not mapped
Mathieu Lu [Sat, 17 Jun 2017 02:18:42 +0000 (22:18 -0400)]
Merge pull request #10519 from johanv/attribution_chirojeugd
(NFC) Attribution Chirojeugd Vlaanderen
Tim Otten [Thu, 25 May 2017 03:43:07 +0000 (20:43 -0700)]
CRM-20600, CRM-20112 - AngularLoader - Add helper for base-pages and injections
This commit extracts the `Civi\Angular\Page\Main::registerResources()` and
creates a new utility-class, `AngularLoader`. The `AngularLoader` can be
used in new Angular base-pages, e.g.
```php
class Example extends CRM_Core_Page {
public function run() {
$loader = new \Civi\Angular\AngularLoader();
$loader->setPageName('civicrm/foo/bar');
$loader->setModules(array('crmApp', '...'));
$loader->load();
return parent::run();
}
}
```
The `AngularLoader` only loads the resources or assets (JS/CSS/HTML files).
To start Angular, you'll need to call `ng-app` or `angular.bootstrap(...)`.
One way to do this is to define a page-template:
```html
<!-- Example.tpl -->
<div ng-app="crmApp">
<div ng-view></div>
</div>
```
Or you can reuse the existing template:
```php
public function getTemplateFileName() {
return 'Civi/Angular/Page/Main.tpl';
}
```
Note: This is framed as a utility-class which loads the Angular resource
files. It's not a page-class/base-class. This approach allows us to call
the utility from other situations -- e.g. inject AngularJS onto an
pre-existing page via hook. Doing that may or may not be wise, but the
class-hierarchy shouldn't be the issue.
Tim Otten [Thu, 25 May 2017 03:40:04 +0000 (20:40 -0700)]
CRM-20600 - Civi\Angular\Manager - Add resolveDependencies(), resolveDefaultModules()
Tim Otten [Sat, 20 May 2017 00:24:58 +0000 (17:24 -0700)]
CRM-20600 - CRM_Core_Resources - Add hook for settings data
Tim Otten [Tue, 16 May 2017 09:46:33 +0000 (02:46 -0700)]
CRM-20600 - Civi\Angular\Manager - Add hook for modifying partials and dependencies
Tim Otten [Tue, 16 May 2017 06:43:57 +0000 (23:43 -0700)]
CRM-20600 - Civi\Angular\ChangeSet - Implement a utility for modifying HTML snippets via phpQuery
Tim Otten [Fri, 31 Mar 2017 19:55:45 +0000 (12:55 -0700)]
CRM-20600 - composer.json - Add phpQuery
Tim Otten [Tue, 23 May 2017 04:42:42 +0000 (21:42 -0700)]
CRM-20600 - Angular deps - Add missing/implicit dependencies
Several modules depended on `crmResource` but didn't declare it.
Tim Otten [Fri, 19 May 2017 04:25:58 +0000 (21:25 -0700)]
CRM-20600 - Angular deps - Move from *.js to *.php
If third-parties are allowed to alter the HTML content, then they may
introduce new dependencies. This means that they'll need to delcare those
dependencies.
This commit actually moves the declarations for any in-house modules to PHP.
Tim Otten [Fri, 19 May 2017 04:20:28 +0000 (21:20 -0700)]
CRM-20600 - Angular deps - Allow declaration in PHP code
If third-parties are allowed to alter the HTML content, then they may
introduce new dependencies. This means that they'll need to delcare those
dependencies.
Tangentially, this will also make it easier to construct more optimized
base-pages (e.g. "make a base-page with module X plus all its
dependencies").
Tim Otten [Fri, 19 May 2017 01:52:47 +0000 (18:52 -0700)]
CRM-20600 - civicrm/a - Avoid dirty caches for permissioned modules
The default behavior is to include a `bundleUrl` for a bundle of "all
Angular modules". However, some Angular modules like `crmMailing` are only
displayed if the current user has permission to access them. This means
that the list of "all Angular modules" can be different (depending on who
you are; albeit in practice there's a small# of permutations).
This patch ensures that two users who access a different list of modules
will see a different `bundleUrl`.
Tim Otten [Tue, 16 May 2017 05:29:07 +0000 (22:29 -0700)]
CRM-20600 - Civi\Angular\Manager::getStrings() - Scan raw HTML strings instead of *.html files
Rationale: If the raw HTML can be modified via hook, then the HTML files are
not truly representative of the final output. (e.g. a hook might add a new
string to some HTML.)
Note: This patch means that we no longer benefit from the cache in
`CRM_Core_Resources_Strings`. However, the typical user still pulls data
from a cache because we're using `AssetBuilder` to manage
`angular-modules.json`.
Note: `getStrings()` now requires a call to `getPartials()`, which is
expected to become more expensive (firing a hook). To avoid building the
partials twice, we introduce a private cache.
Tim Otten [Sat, 1 Apr 2017 05:07:49 +0000 (22:07 -0700)]
CRM-20600 - PartialSyntaxTest - Ensure that Angular partials are well-formed
Tim Otten [Fri, 31 Mar 2017 07:36:35 +0000 (00:36 -0700)]
CRM-20600 - Civi\Angular - Generate modules via AssetBuilder
In the typical use-case, AssetBuilder can avoid an extra CMS+Civi bootstrap
along with any build steps.
Tim Otten [Fri, 31 Mar 2017 05:55:47 +0000 (22:55 -0700)]
CRM-20600 - Implement AssetBuilder - See extended docblock in AssetBuilder.php
Tim Otten [Fri, 19 May 2017 03:39:11 +0000 (20:39 -0700)]
CRM-20600 - Move Angular metadata to civix-style files
This PR moves the metadata about Angular modules out of Civi\Angular\Manager
and into standalone files (`ang/*.ang.php`). This uses the same structure
as `civix`. Also, this makes it easier to navigate between the
JS/HTML/CSS/PHP content.
To test that these changes were safe, I ran the following command before and
after this commit:
$ cv ev 'var_dump(Civi::service("angular")->getModules());'
The results were substantively identical.
colemanw [Sat, 17 Jun 2017 01:34:51 +0000 (21:34 -0400)]
Merge pull request #10520 from seamuslee001/CRM-20744
CRM-20744 Use images in the bower_components version of datatables plugin rathe…
Seamus Lee [Sat, 17 Jun 2017 00:14:12 +0000 (10:14 +1000)]
Use images in the bower_components version of datatables plugin rather than packages
Tim Otten [Fri, 16 Jun 2017 22:35:26 +0000 (15:35 -0700)]
Merge pull request #10495 from seamuslee001/CRM-20243-phpword
CRM-20243 Remove outdated sample jquery.min.js from phpword package
Seamus Lee [Mon, 12 Jun 2017 09:32:44 +0000 (19:32 +1000)]
Remove all code in the samples folder as per comment from Tim
Seamus Lee [Mon, 12 Jun 2017 03:17:36 +0000 (13:17 +1000)]
CRM-20243 Remove outdated sample jquery.min.js from phpword package
Tim Otten [Fri, 16 Jun 2017 21:36:17 +0000 (14:36 -0700)]
Merge pull request #10329 from totten/master-caconfig
CRM-18408 - composer.json - Update ca-config
Johan Vervloet [Fri, 16 Jun 2017 21:20:42 +0000 (23:20 +0200)]
It seems those lists are sorted alphabetically :-)
Johan Vervloet [Fri, 16 Jun 2017 21:17:50 +0000 (23:17 +0200)]
Added Chirojeugd Vlaanderen to CONTRIBUTORS.txt.
Almost all contributions I did for CiviCRM, were sponsored by my
former employer Chirojeugd Vlaanderen.
Tim Otten [Fri, 16 Jun 2017 20:45:18 +0000 (13:45 -0700)]
CRM-18408 - composer.lock - Update ca-config
Tim Otten [Wed, 10 May 2017 20:10:43 +0000 (15:10 -0500)]
CRM-18408 - composer.json - Update ca-config
This loads a more recent build of `cacert.pem` for use on hosts which lack
one. It does not directly solve CRM-18408, but it complements the solution.
Tim Otten [Fri, 16 Jun 2017 19:05:53 +0000 (12:05 -0700)]
Merge pull request #10384 from seamuslee001/CRM-20561
CRM-20561 Use composer for Net_SMTP and Net_Socket and patch for TLS and CiviCR…
Jitendra Purohit [Fri, 2 Jun 2017 15:13:58 +0000 (20:43 +0530)]
CRM-20675: Fix incorrect renewal activity created when membership updated via api
colemanw [Fri, 16 Jun 2017 13:41:13 +0000 (09:41 -0400)]
Merge pull request #10477 from twomice/CRM-20692_support_jquery_tabs_options
CRM-20692: pass through options.
colemanw [Fri, 16 Jun 2017 13:27:31 +0000 (09:27 -0400)]
Merge pull request #10512 from johanv/CRM-20740-custom_field_not_null
CRM-20740 - Fix issue with check for custom_nn => ['IS NULL' => 1].
yashodha [Fri, 16 Jun 2017 09:46:43 +0000 (15:16 +0530)]
CRM-20741 - Cancellation message shown as error
deb.monish [Fri, 16 Jun 2017 05:14:22 +0000 (10:44 +0530)]
minor changes
Seamus Lee [Fri, 16 Jun 2017 04:08:49 +0000 (14:08 +1000)]
Merge pull request #4 from totten/seamuslee001-CRM-20561
CRM-20561 - Remove example files. Cleanup code style.
Tim Otten [Fri, 16 Jun 2017 04:03:44 +0000 (21:03 -0700)]
CRM-20561 - net-smtp-fix.sh - Cleanup code style
Tim Otten [Fri, 16 Jun 2017 04:03:18 +0000 (21:03 -0700)]
CRM-20561 - Net_SMTP - Remove example files
Tim Otten [Fri, 16 Jun 2017 03:39:09 +0000 (20:39 -0700)]
Merge pull request #10511 from totten/master-19303
CRM-19303 - Drupal - Fix computation of `civicrm.files` on multisite
Seamus Lee [Fri, 16 Jun 2017 03:16:54 +0000 (13:16 +1000)]
Merge pull request #3 from totten/seamuslee001-CRM-20561
CRM-8597, CRM-20561 - Restore fix for `&`
Tim Otten [Fri, 16 Jun 2017 03:13:22 +0000 (20:13 -0700)]
CRM-8597, CRM-20561 - Restore fix for `&`
colemanw [Fri, 16 Jun 2017 02:59:01 +0000 (22:59 -0400)]
Merge pull request #10390 from JMAConsulting/CRM-20611
CRM-20611: fix financial records of cancelled line_items on event fee change selection