Eileen McNaughton [Tue, 27 Jun 2017 01:11:57 +0000 (13:11 +1200)]
Merge pull request #10554 from eileenmcnaughton/crazy_vars
[NFC] Cleanup towards CRM-20759, define variables more legibly & consistently.
colemanw [Mon, 26 Jun 2017 21:13:58 +0000 (17:13 -0400)]
Merge pull request #9886 from JMAConsulting/CRM-20169
CRM-20169 WIP (possibly wanting refactor of whole report) Added alterReportVar hook support to activity report
colemanw [Mon, 26 Jun 2017 21:02:42 +0000 (17:02 -0400)]
Merge pull request #10452 from JMAConsulting/CRM-20668
CRM-20668, Fixed Notice error
colemanw [Mon, 26 Jun 2017 20:57:17 +0000 (16:57 -0400)]
Merge pull request #10346 from JMAConsulting/CRM-20567
CRM-20567: backoffice membership via price set errors with non-aggregated column
colemanw [Mon, 26 Jun 2017 20:50:28 +0000 (16:50 -0400)]
Merge pull request #10497 from JMAConsulting/CRM-20721
CRM-20721: Add parameter to dateQueryBuilder fn to change date value to desired format
colemanw [Mon, 26 Jun 2017 20:29:43 +0000 (16:29 -0400)]
Merge pull request #10562 from JMAConsulting/CRM-20411
CRM-20411: mailing tab listing: MySQL 5.7 group by error
colemanw [Mon, 26 Jun 2017 19:50:28 +0000 (15:50 -0400)]
Merge pull request #10507 from lcdservices/CRM-20739
CRM-20739 process groups for import using fill
Eileen McNaughton [Mon, 26 Jun 2017 19:49:23 +0000 (07:49 +1200)]
Merge pull request #10561 from seamuslee001/CRM-20771
CRM-20771 Ensure that addColumn can handle translatable columns
deb.monish [Mon, 26 Jun 2017 12:48:03 +0000 (18:18 +0530)]
CRM-20411: mailing tab listing: MySQL 5.7 group by error
Seamus Lee [Mon, 26 Jun 2017 11:15:04 +0000 (21:15 +1000)]
CRM-20771 Ensure that addColumn can handle translatable columns
eileen [Fri, 23 Jun 2017 22:09:17 +0000 (10:09 +1200)]
Cleanup towards CRM-20759, define variables more legibly & consistently.
I really want the 2 copy & paste variants of this code loop to be combinable but I think it takes a numebr
of small changes to get there in a readable way
Eileen McNaughton [Mon, 26 Jun 2017 05:35:39 +0000 (17:35 +1200)]
Merge pull request #10492 from seamuslee001/CRM-20716
CRM-20716 Fix Array to string error because subject is an array not string
Yashodha Chaku [Mon, 26 Jun 2017 04:12:38 +0000 (09:42 +0530)]
Merge pull request #10550 from yashodha/CRM-20765
CRM-20765 - Missing id for 'onBehalfOfOrg' section
Eileen McNaughton [Sun, 25 Jun 2017 23:08:19 +0000 (11:08 +1200)]
Merge pull request #10560 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Sun, 25 Jun 2017 22:33:15 +0000 (10:33 +1200)]
Merge pull request #10555 from totten/4.7.21-install-port
CRM-20768 - Installer UI - Accept mysql port
Eileen McNaughton [Sun, 25 Jun 2017 22:30:19 +0000 (10:30 +1200)]
Merge pull request #10559 from civicrm/4.7.21-rc
4.7.21 rc
Eileen McNaughton [Sun, 25 Jun 2017 22:28:42 +0000 (10:28 +1200)]
Merge pull request #10556 from devarun/4.7.21-rc
CRM-20644: Column names on Advanced search results displayed on contacts are out of order.
Eileen McNaughton [Sun, 25 Jun 2017 06:32:50 +0000 (18:32 +1200)]
Merge pull request #10536 from yashodha/CRM-20753
CRM-20753 - Net amount doesn't respect localization
devarun [Sat, 24 Jun 2017 14:22:23 +0000 (19:52 +0530)]
CRM-20644: Column names on Advanced search results displayed on contacts are out of order.
Tim Otten [Sat, 24 Jun 2017 00:31:14 +0000 (17:31 -0700)]
CRM-20768 - install - Improve docblock
Tim Otten [Sat, 24 Jun 2017 00:24:33 +0000 (17:24 -0700)]
CRM-20768 - Install UI - Distinguish host/port in IPv6
Tim Otten [Fri, 23 Jun 2017 21:41:39 +0000 (14:41 -0700)]
CRM-20768 - install - Accept mysql port
== Background ==
In previous releases, the web-based installation script allowed you to enter
the MySQL "server" with a `host:port` combination (e.g. `127.0.0.1:3307`).
I believe this regressed during the mysql=>mysqli transition.
== Before ==
If you use the web-based install UI and enter a `host:port` combination, the
error messages indicate a confusing mix of information (e.g. some
indicating port 3306, some indicating port 3307).
== After ==
If you use the web-based install UI and enter a `host:port` combination, it
uses the specified port.
----------------------------------------
* CRM-20768: Web-based installation should accept non-standard MySQL port
https://issues.civicrm.org/jira/browse/CRM-20768
Tim Otten [Fri, 23 Jun 2017 21:23:43 +0000 (14:23 -0700)]
Merge pull request #10545 from totten/master-ui-bootstrap
CRM-20756 - Add Angular `ui.bootstrap` library
deb.monish [Fri, 23 Jun 2017 19:31:39 +0000 (01:01 +0530)]
added unit test
deb.monish [Fri, 12 May 2017 20:16:36 +0000 (01:46 +0530)]
CRM-20567: backoffice membership via price set errors with non-aggregated column
colemanw [Fri, 23 Jun 2017 15:22:00 +0000 (11:22 -0400)]
Merge pull request #10541 from JMAConsulting/CRM-20411
CRM-20411: mailing tab listing: MySQL 5.7 group by error
colemanw [Fri, 23 Jun 2017 15:19:50 +0000 (11:19 -0400)]
Merge pull request #10498 from JMAConsulting/CRM-20722
CRM-20722: 'Lock wait timeout exceeded' error triggered on smart group cache rebuild
colemanw [Fri, 23 Jun 2017 14:03:54 +0000 (10:03 -0400)]
Merge pull request #10407 from JMAConsulting/CRM-19653
CRM-19653: Custom field checkboxes migrated incorrectly on merge (part deux)
colemanw [Fri, 23 Jun 2017 13:59:16 +0000 (09:59 -0400)]
Merge pull request #10298 from colemanw/CRM-20387
CRM-20387 - Add invoice_number field for human readable contribution invoice
Monish Deb [Fri, 23 Jun 2017 13:10:45 +0000 (18:40 +0530)]
Merge pull request #10549 from jitendrapurohit/CRM-20761
CRM-20761 : Formrule error when priceset is selected on contribution page
Coleman Watts [Wed, 3 May 2017 21:15:28 +0000 (17:15 -0400)]
CRM-20387 - Add invoice_number field for human readable contribution invoice
yashodha [Fri, 23 Jun 2017 03:56:31 +0000 (09:26 +0530)]
CRM-20765 - Missing id for 'onBehalfOfOrg' section
Eileen McNaughton [Fri, 23 Jun 2017 03:05:08 +0000 (15:05 +1200)]
Merge pull request #10547 from eileenmcnaughton/extract
[NFC] Extract submit in mapFields to start adding unit testing (towards CRM-20759)
eileen [Thu, 22 Jun 2017 08:35:02 +0000 (20:35 +1200)]
Extract submit in mapFields to start adding unit testin (CRM-20759)
colemanw [Thu, 22 Jun 2017 14:27:22 +0000 (10:27 -0400)]
Merge pull request #10544 from eileenmcnaughton/deprecated
CRM-20758 remove call to deprecated function & add test
Jitendra Purohit [Thu, 22 Jun 2017 14:00:40 +0000 (19:30 +0530)]
CRM-20761: Formrule error when priceset is selected on contribution page
eileen [Thu, 22 Jun 2017 08:35:02 +0000 (20:35 +1200)]
CRM-20758 remove one more deprecated call
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…
Tim Otten [Thu, 22 Jun 2017 06:29:53 +0000 (23:29 -0700)]
CRM-20756 - Add Angular `ui.bootstrap` library
This adds the library
[ui.bootstrap](https://angular-ui.github.io/bootstrap/), which makes it
easier to include the functional elements of Bootstrap in AngularJS pages.
In the past, adding this was problematic, but now the situation has
improved:
1. civicrm-core has upgraded to AngularJS 1.5. (In the past, civicrm-core
used AngularJS 1.3, which was incompatible.)
2. civicrm-core allows optional AngularJS modules. (In the past, all
modules were loaded unconditionally, which could result in loading
new/unnecessary code for legacy users. Now, you can opt-out of this
behavior with `basePages=>array()`.)
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.
eileen [Thu, 22 Jun 2017 03:48:15 +0000 (15:48 +1200)]
CRM-20758 remove call to deprecated function & add test
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
deb.monish [Wed, 21 Jun 2017 20:30:21 +0000 (02:00 +0530)]
CRM-20411: mailing tab listing: MySQL 5.7 group by error
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
yashodha [Wed, 21 Jun 2017 06:41:49 +0000 (12:11 +0530)]
CRM-20753 - Net amount doesn't respect localization
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
projects / civicrm-core.git / log