Michael McAndrew [Mon, 11 Dec 2017 10:43:13 +0000 (10:43 +0000)]
Some &s have become encoded twice (not sure why). Running htmlspecialchars_decode twice decodes them.
Michael McAndrew [Mon, 11 Dec 2017 10:41:54 +0000 (10:41 +0000)]
Include some HTML tags in the sample HTML header and footer.
Michael McAndrew [Fri, 8 Dec 2017 11:54:31 +0000 (11:54 +0000)]
only create 'template' for plain text version if plain text has been submitted
Michael McAndrew [Wed, 20 Sep 2017 13:31:41 +0000 (14:31 +0100)]
fixing whitespace errors
Michael McAndrew [Wed, 20 Sep 2017 12:09:35 +0000 (13:09 +0100)]
Create text version after token replacement.
Michael McAndrew [Tue, 19 Sep 2017 13:22:57 +0000 (14:22 +0100)]
removing white space
Michael McAndrew [Tue, 19 Sep 2017 13:11:19 +0000 (14:11 +0100)]
convert any html contained in tokens to plain text for plain text emails
Eileen McNaughton [Wed, 6 Sep 2017 04:16:02 +0000 (16:16 +1200)]
Merge pull request #10908 from jitendrapurohit/CRM-20533
CRM-20533 - Drop false indices directly from update indices button
Eileen McNaughton [Wed, 6 Sep 2017 04:13:59 +0000 (16:13 +1200)]
Merge pull request #10950 from totten/master-setstk-doc
(NFC) SettingsStack - Finish incomplete docblock
Tim Otten [Wed, 6 Sep 2017 03:19:48 +0000 (20:19 -0700)]
(NFC) SettingsStack - Finish incomplete docblock
Eileen McNaughton [Wed, 6 Sep 2017 02:43:06 +0000 (14:43 +1200)]
Merge pull request #10949 from civicrm/4.7.24-rc
4.7.24 rc merge
Eileen McNaughton [Wed, 6 Sep 2017 02:01:37 +0000 (14:01 +1200)]
Merge pull request #10948 from colemanw/CRM-20941
CRM-20941 - Display correct version number in upgrade message
Coleman Watts [Wed, 6 Sep 2017 01:08:43 +0000 (21:08 -0400)]
CRM-20941 - Add punctuation to the end of sentences.
Coleman Watts [Wed, 6 Sep 2017 01:05:10 +0000 (21:05 -0400)]
CRM-20941 - Display correct version number in upgrade message
Eileen McNaughton [Wed, 6 Sep 2017 00:55:08 +0000 (12:55 +1200)]
Merge pull request #10907 from seamuslee001/CRM-21110
CRM-21110 Do not run same/similar query twice when generating Relatio…
Eileen McNaughton [Tue, 5 Sep 2017 22:10:31 +0000 (10:10 +1200)]
Merge pull request #10944 from mattwire/CRM-21152_membership_status_spec
CRM-21152 Add spec for MembershipStatus.calc API function
Eileen McNaughton [Tue, 5 Sep 2017 22:08:57 +0000 (10:08 +1200)]
Merge pull request #9783 from mattwire/back_to_single_lang
CRM-19968 SQL tweaks to make it more likely that reverting to single language w…
Tim Otten [Tue, 5 Sep 2017 16:22:09 +0000 (09:22 -0700)]
Merge pull request #10945 from mattwire/nfc_changes
CRM-21153 NFC Fix mispelled variable
Matthew Wire [Thu, 17 Aug 2017 20:00:43 +0000 (21:00 +0100)]
Fix mispelled variable
Matthew Wire [Tue, 5 Sep 2017 14:04:09 +0000 (15:04 +0100)]
Add spec for MembershipStatus.calc API function
Eileen McNaughton [Tue, 5 Sep 2017 02:32:44 +0000 (14:32 +1200)]
Merge pull request #10940 from seamuslee001/CRM-20769-fields
CRM-20769 Add in columns to support customising profile buttons
Seamus Lee [Tue, 5 Sep 2017 00:41:32 +0000 (10:41 +1000)]
CRM-20769 Add in columns to support customising profile buttons
Eileen McNaughton [Tue, 5 Sep 2017 01:11:50 +0000 (13:11 +1200)]
Merge pull request #10926 from MegaphoneJon/CRM-21121
CRM-21121 - Fix crash with sql_mode is only_full_group_by
Tim Otten [Mon, 4 Sep 2017 22:17:05 +0000 (15:17 -0700)]
Merge pull request #10938 from eileenmcnaughton/deltest
Reinstate accidentally deleted test.
Eileen McNaughton [Mon, 4 Sep 2017 21:26:07 +0000 (09:26 +1200)]
Merge pull request #10939 from MegaphoneJon/xml-install
CRM-21142 - CiviCRM installer - Check for XML module before install
Jon goldberg [Mon, 4 Sep 2017 19:02:33 +0000 (15:02 -0400)]
Better labeling of XML requirement
Monish Deb [Mon, 4 Sep 2017 17:41:18 +0000 (23:11 +0530)]
Merge pull request #10719 from JKingsnorth/CRM-20935
CRM-20935 Remove related profile links when event deleted
Jon goldberg [Mon, 4 Sep 2017 16:00:33 +0000 (12:00 -0400)]
Check for XML module before install
JKingsnorth [Mon, 4 Sep 2017 13:20:10 +0000 (14:20 +0100)]
CRM-20935 Remove related profile links when event deleted
eileen [Mon, 4 Sep 2017 13:14:52 +0000 (01:14 +1200)]
Reinstate accidentally deleted test.
This got deleted in renaming a file, re-adding
Monish Deb [Mon, 4 Sep 2017 11:38:01 +0000 (17:08 +0530)]
Merge pull request #10915 from eileenmcnaughton/primary
CRM-20855: Disabling "Search Primary Details Only" causes partial CiviMail delivery failure
deb.monish [Mon, 24 Jul 2017 20:16:38 +0000 (01:46 +0530)]
CRM-20855: Disabling "Search Primary Details Only" causes partial CiviMail delivery failure
CRM-20855: Adjust variables for clarity
I'm concerned about the use of $apiEntity to mean 'do something unconnected' so suggest
a specific paramteter.
Eileen McNaughton [Mon, 4 Sep 2017 04:57:54 +0000 (16:57 +1200)]
Merge pull request #10785 from kenwest/CRM-20982
CRM-20982 Configure the SMTP mailer to identify itself to the SMTP se…
colemanw [Mon, 4 Sep 2017 04:29:22 +0000 (00:29 -0400)]
Merge pull request #10937 from colemanw/CRM-21139
CRM-21139 - Add crm-i.css to common/fatal.tpl
Coleman Watts [Mon, 4 Sep 2017 03:45:02 +0000 (23:45 -0400)]
CRM-21139 - Add crm-i.css to common/fatal.tpl
colemanw [Mon, 4 Sep 2017 01:33:34 +0000 (21:33 -0400)]
Merge pull request #10929 from seamuslee001/CRM-20237
CRM-20237 Don't add in extra copy of ids and only use most recent id …
Eileen McNaughton [Sun, 3 Sep 2017 21:42:37 +0000 (09:42 +1200)]
Merge pull request #8724 from JMAConsulting/CRM-18231
CRM-18231 Environment variables
Eileen McNaughton [Fri, 1 Sep 2017 23:08:40 +0000 (11:08 +1200)]
Merge pull request #10933 from civicrm/4.7.24-rc
4.7.24 rc
colemanw [Fri, 1 Sep 2017 14:34:37 +0000 (10:34 -0400)]
Merge pull request #10932 from jitendrapurohit/CRM-21135-rcfix
CRM-21135 - Activity filter preference are not remembered when enable…
Jitendra Purohit [Fri, 1 Sep 2017 10:53:17 +0000 (16:23 +0530)]
CRM-21135 - Activity filter preference are not remembered when enabled in display settings
deb.monish [Tue, 29 Aug 2017 07:36:41 +0000 (13:06 +0530)]
QA fixes
Yashodha Chaku [Fri, 1 Sep 2017 03:15:07 +0000 (08:45 +0530)]
CRM-21130 - Search builder throws error if location type has space (#10928)
* CRM-21130 - Search builder throws error if location type has space
* minor fixes
Seamus Lee [Fri, 1 Sep 2017 02:05:11 +0000 (12:05 +1000)]
Update tests following changes by Eileen
eileen [Fri, 1 Sep 2017 01:34:26 +0000 (13:34 +1200)]
CRM-20237 keep some of original name in name field
Alar [Fri, 1 Sep 2017 01:56:06 +0000 (03:56 +0200)]
CRM-21128 Personal Campaign Page selection with force=1 in Find Contributions (#8997)
* Personal Campaign can now be passed in force mode
Passing pcpid=n with force=1 alloow to search on corresponding Personal
Campaign id
* Improves parameter passing
Now cope with both single value form (pcpid=n) and multivalue form
(pcpid[]=n&pcpid[]=m)
* Removed useless ++$n
* Fixed checkstyle warnings
* Operator spacing and comment indentation
Seamus Lee [Fri, 1 Sep 2017 00:43:50 +0000 (10:43 +1000)]
CRM-20237 Don't add in extra copy of ids and only use most recent id copied from in title and don't put copy of details in name for pricesets
Eileen McNaughton [Thu, 31 Aug 2017 21:31:53 +0000 (09:31 +1200)]
Merge pull request #10831 from MiyaNoctem/CRM-20858-fix-merge-of-unselected-custom-fields
CRM-20858: Fix Merging of Unselected Custom Fields
deb.monish [Tue, 29 Aug 2017 05:11:25 +0000 (10:41 +0530)]
additional fixes
Edsel [Mon, 14 Mar 2016 10:41:00 +0000 (16:11 +0530)]
CRM-18231 Added settings on developer page
Monish Deb [Thu, 31 Aug 2017 20:20:14 +0000 (01:50 +0530)]
Merge pull request #10923 from jitendrapurohit/CRM-21126
CRM-21126: fix default selection of member_is_primary input
Monish Deb [Thu, 31 Aug 2017 19:59:43 +0000 (01:29 +0530)]
Merge pull request #10921 from eileenmcnaughton/cachekey
CRM-21124 fix error on cacheKey when too long
Monish Deb [Thu, 31 Aug 2017 19:49:20 +0000 (01:19 +0530)]
Merge pull request #10731 from eileenmcnaughton/pref_comm
CRM-19933 proposed fix for import wiping out preferred comm method (possibly CRM-20035 too)
colemanw [Thu, 31 Aug 2017 19:03:09 +0000 (15:03 -0400)]
Merge pull request #10890 from eileenmcnaughton/dedupe
Towards CRM-20155 clean up form code in order to consolidate function…
Camilo Rodriguez [Thu, 31 Aug 2017 13:38:12 +0000 (13:38 +0000)]
CRM-20858: Remove Uneeded Variable
eileen [Mon, 24 Jul 2017 01:51:45 +0000 (13:51 +1200)]
CRM-19933 proposed fix for import wiping out preferred comm method
Jitendra Purohit [Thu, 31 Aug 2017 08:32:08 +0000 (14:02 +0530)]
modify check to 0 or 1
Jon goldberg [Thu, 31 Aug 2017 04:21:38 +0000 (00:21 -0400)]
CRM-21121 - Fix crash with sql_mode is only_full_group_by
Eileen McNaughton [Thu, 31 Aug 2017 02:28:54 +0000 (14:28 +1200)]
Merge pull request #10924 from MegaphoneJon/CRM-21129
CRM-21129 - CLI API CSV import doesn't allow single-column CSVs
Monish Deb [Wed, 30 Aug 2017 20:14:34 +0000 (01:44 +0530)]
Merge pull request #10757 from jitendrapurohit/CRM-20964
CRM-20964: Include queue id while retrieving rows from Event Queue
Jon goldberg [Wed, 30 Aug 2017 18:47:16 +0000 (14:47 -0400)]
CRM-21129 - CLI API CSV import doesn't allow single-column CSVs
Jitendra Purohit [Wed, 30 Aug 2017 09:42:44 +0000 (15:12 +0530)]
CRM-21126: fix default selection of member_is_primary input
eileen [Wed, 30 Aug 2017 05:19:17 +0000 (17:19 +1200)]
CRM-21124 fix error on cacheKey when too long
Eileen McNaughton [Wed, 30 Aug 2017 02:57:51 +0000 (14:57 +1200)]
Merge pull request #10734 from jitendrapurohit/CRM-20949
CRM-20949 - Fix payment processor assignment
Tim Otten [Tue, 29 Aug 2017 20:51:44 +0000 (13:51 -0700)]
Merge pull request #10886 from eileenmcnaughton/task
NFC remove some unused vars, fix comment
Monish Deb [Tue, 29 Aug 2017 20:48:41 +0000 (02:18 +0530)]
Merge pull request #10906 from MegaphoneJon/CRM-21108-2
CRM-21108 - Greatly improve performance of adding contacts
colemanw [Tue, 29 Aug 2017 17:50:26 +0000 (13:50 -0400)]
Merge pull request #10916 from eileenmcnaughton/permission_problem_address_get
CRM-20027 add test for locBlock permission issue
Eileen McNaughton [Tue, 29 Aug 2017 10:32:19 +0000 (22:32 +1200)]
Merge pull request #10917 from mattwire/CRM-21118_messagetemplate_buttons_at_top
CRM-21118 Add action links at top of page on message template overview
Eileen McNaughton [Tue, 29 Aug 2017 10:29:32 +0000 (22:29 +1200)]
Merge pull request #10585 from JMAConsulting/CRM-17748
[ready for core team review] CRM-17748: Expose options to CRM_Core_DAO
eileen [Tue, 29 Aug 2017 08:21:15 +0000 (20:21 +1200)]
CRM-20027 add test for locBlock permission issue
Eileen McNaughton [Tue, 29 Aug 2017 09:20:45 +0000 (21:20 +1200)]
Merge pull request #9973 from lcdservices/CRM-19469
CRM-19469 support returning payment params after mapping
Matthew Wire [Tue, 29 Aug 2017 09:15:58 +0000 (10:15 +0100)]
Add action links at top of page
Seamus Lee [Tue, 29 Aug 2017 04:19:09 +0000 (14:19 +1000)]
Drop Table before returning from function
Include word temporary hopefully appeases jenkins
Eileen McNaughton [Tue, 29 Aug 2017 08:01:00 +0000 (20:01 +1200)]
Merge pull request #10780 from jitendrapurohit/CRM-20979
CRM-20979 - expose pre help for price fields to the UI
Eileen McNaughton [Tue, 29 Aug 2017 03:00:02 +0000 (15:00 +1200)]
Merge pull request #10874 from totten/master-ts-warn
CRM-21079, CRM-9683 - Display advisories about DATETIME/TIMESTAMP columns
Eileen McNaughton [Tue, 29 Aug 2017 02:21:38 +0000 (14:21 +1200)]
Merge pull request #10730 from eileenmcnaughton/test_name
Renamed test class.
Tim Otten [Tue, 29 Aug 2017 02:03:11 +0000 (19:03 -0700)]
CRM-21079, CRM-9683 - CRM_Utils_Check - Expand advice
Jon goldberg [Mon, 28 Aug 2017 22:50:28 +0000 (18:50 -0400)]
CRM-21108 - handle single or multi-dimensional contact detail arrays
Eileen McNaughton [Mon, 28 Aug 2017 21:11:44 +0000 (09:11 +1200)]
Merge pull request #10888 from mattwire/CRM-21092_financial_batch_fixes
Fix PHP Warnings. Replace fatal with statusBounce. Mark appendBreadCr…
Eileen McNaughton [Mon, 28 Aug 2017 21:09:06 +0000 (09:09 +1200)]
Merge pull request #10860 from mattwire/CRM-21065_optiongroup_to_pseudoconstant
CRM-21065 Replace some CRM_Core_OptionGroup::values with CRM_Activity_BAO_Activ…
Eileen McNaughton [Mon, 28 Aug 2017 21:05:54 +0000 (09:05 +1200)]
Merge pull request #10865 from mattwire/CRM-21069_check_eventid
CRM-21069 Fix crash when event_id is not set
Matthew Wire [Mon, 28 Aug 2017 17:37:36 +0000 (18:37 +0100)]
Add warning log message about bad data
Matthew Wire [Mon, 28 Aug 2017 17:19:06 +0000 (18:19 +0100)]
Update based on comments from @eileenmcnaughton
Jitendra Purohit [Sat, 26 Aug 2017 16:07:37 +0000 (21:37 +0530)]
CRM-20533 - Drop false/missing indices directly from update indices button
Seamus Lee [Mon, 28 Aug 2017 05:50:49 +0000 (15:50 +1000)]
CRM-21110 Do not run same/similar query twice when generating Relationships Tab in CiviCRM
Jon goldberg [Sun, 27 Aug 2017 22:56:57 +0000 (18:56 -0400)]
Fix comments on new unit test
Jon goldberg [Thu, 24 Aug 2017 22:28:15 +0000 (18:28 -0400)]
CRM-21108 - Refactor greeting token replacement code to avoid calls to expensive queries in most situations
Formatting fixes
Eileen McNaughton [Sun, 27 Aug 2017 06:50:00 +0000 (18:50 +1200)]
Merge pull request #10863 from rtobias81/lastModified-graceful
CRM-21068 - getLastModified fails more gracefully now.
Eileen McNaughton [Sun, 27 Aug 2017 06:39:07 +0000 (18:39 +1200)]
Merge pull request #10882 from jitendrapurohit/CRM-21087
CRM-21087: Payment popup goes weird if you click 'adjust payment amount'
colemanw [Fri, 25 Aug 2017 16:43:15 +0000 (12:43 -0400)]
Merge pull request #10903 from colemanw/CRM-20680
CRM-20680 - Only spin the logo in the menubar
colemanw [Fri, 25 Aug 2017 16:26:55 +0000 (12:26 -0400)]
Merge pull request #10892 from herbdool/crm21098
CRM-21098
Coleman Watts [Fri, 25 Aug 2017 16:26:29 +0000 (12:26 -0400)]
CRM-20680 - Only spin the logo in the menubar
Eileen McNaughton [Fri, 25 Aug 2017 04:04:01 +0000 (16:04 +1200)]
Merge pull request #10889 from jmcclelland/CRM-21094
CRM-21094 - improve layout order of fields in SurveyDetails report
Tim Otten [Fri, 25 Aug 2017 01:05:22 +0000 (18:05 -0700)]
Merge pull request #10894 from seanmadsen/patch-1
(NFC) Update contributor-key.yml
colemanw [Thu, 24 Aug 2017 14:15:56 +0000 (10:15 -0400)]
Use delegated click handler
Herb vd Dool [Wed, 23 Aug 2017 15:54:53 +0000 (11:54 -0400)]
crm21098 hide the Backdrop admin menu when CiviCRM admin menu is visible
colemanw [Wed, 23 Aug 2017 23:49:08 +0000 (19:49 -0400)]
Merge pull request #10893 from twomice/CRM-21099_canceled_refunded_label
Fix CRM-21099.
Jamie McClelland [Wed, 23 Aug 2017 22:25:23 +0000 (18:25 -0400)]
CRM-21094 - formatting fixes
Eileen McNaughton [Wed, 23 Aug 2017 21:57:02 +0000 (09:57 +1200)]
Merge pull request #10718 from JMAConsulting/CRM-20936
CRM-20936: Hide statuses on backoffice contribution form
Eileen McNaughton [Wed, 23 Aug 2017 21:45:09 +0000 (09:45 +1200)]
Merge pull request #10628 from jitendrapurohit/CRM-20838
CRM-20838 - Add check for missing log tables on system status
Eileen McNaughton [Wed, 23 Aug 2017 21:43:23 +0000 (09:43 +1200)]
Merge pull request #10896 from civicrm/4.7.24-rc
4.7.24 rc