Yashodha Chaku [Wed, 23 Mar 2016 05:56:14 +0000 (11:26 +0530)]
Merge pull request #8015 from cividesk/CRM-12280-4.7
Fix for CRM-18280
Monish Deb [Wed, 23 Mar 2016 05:11:54 +0000 (10:41 +0530)]
Merge pull request #7950 from JKingsnorth/CRM-18196
CRM-18196 Track mailto: links in CiviMail
Monish Deb [Wed, 23 Mar 2016 05:06:28 +0000 (10:36 +0530)]
Merge pull request #7940 from seamuslee001/CRM-18181
CRM-18181 Get all mailings that use mailings that an acled user can see
Nicolas Ganivet [Wed, 23 Mar 2016 03:11:07 +0000 (21:11 -0600)]
Fix for CRM-18280
Monish Deb [Tue, 22 Mar 2016 12:23:10 +0000 (17:53 +0530)]
Merge pull request #7970 from otetard/CRM-18235
CRM-18235: Allow to define `returnPath` in `CRM_Utils_Mail::send()`.
Monish Deb [Tue, 22 Mar 2016 06:48:23 +0000 (12:18 +0530)]
Merge pull request #8005 from joeyisking/CRM-18270
CRM-18270 Activity description not rendering html
Yashodha Chaku [Tue, 22 Mar 2016 03:50:00 +0000 (09:20 +0530)]
Merge pull request #8009 from yashodha/fix.CRM-18249
fix version and year
yashodha [Mon, 21 Mar 2016 14:30:03 +0000 (20:00 +0530)]
some more minor fixes
yashodha [Mon, 21 Mar 2016 13:57:21 +0000 (19:27 +0530)]
some more minor fixes
yashodha [Mon, 21 Mar 2016 12:56:03 +0000 (18:26 +0530)]
some indentation fixes
yashodha [Mon, 21 Mar 2016 10:16:33 +0000 (15:46 +0530)]
fix version and year
Yashodha Chaku [Mon, 21 Mar 2016 10:14:34 +0000 (15:44 +0530)]
Merge pull request #8008 from sushantpaste/note-css
Fixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:14:56 +0000 (14:44 +0530)]
Fixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:10:29 +0000 (14:40 +0530)]
Fixes for Note preview CSS
Monish Deb [Mon, 21 Mar 2016 08:02:52 +0000 (13:32 +0530)]
Merge pull request #7995 from monishdeb/CRM-18071
Crm 18071
Monish Deb [Mon, 21 Mar 2016 07:54:49 +0000 (13:24 +0530)]
Merge pull request #8001 from monishdeb/CRM-18219
CRM-18219,CRM-9067 fixes on onbehalf
Yashodha Chaku [Mon, 21 Mar 2016 06:16:56 +0000 (11:46 +0530)]
Merge pull request #8006 from yashodha/CRM-18263
CRM-18263: copy profile broken
yashodha [Mon, 21 Mar 2016 05:00:09 +0000 (10:30 +0530)]
CRM-18263: copy profile broken
----------------------------------------
* CRM-18263: copy profile broken
https://issues.civicrm.org/jira/browse/CRM-18263
Joseph Martin [Mon, 21 Mar 2016 04:18:45 +0000 (15:18 +1100)]
Updated formatting
Joseph Martin [Mon, 21 Mar 2016 02:59:00 +0000 (13:59 +1100)]
CRM-18270 Activity description not rendering html
colemanw [Sat, 19 Mar 2016 00:22:39 +0000 (20:22 -0400)]
Merge pull request #8004 from PalanteJon/CRM-18264
CRM-18264 - Fix potential upgrade crash when adding Getting Started d…
colemanw [Fri, 18 Mar 2016 22:30:28 +0000 (18:30 -0400)]
Merge pull request #7959 from JMAConsulting/CRM-18163
CRM-18163 Unsupervised Organization Rule for On Behalf Of Contributions
Jon goldberg [Fri, 18 Mar 2016 19:47:16 +0000 (15:47 -0400)]
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
colemanw [Fri, 18 Mar 2016 13:44:05 +0000 (09:44 -0400)]
Merge pull request #7993 from JKingsnorth/CRM-18257
[WIP] CRM-18257: WYSIWYG fullPage config option
deb.monish [Fri, 18 Mar 2016 13:23:00 +0000 (18:53 +0530)]
CRM-18219,CRM-9067 fixes on onbehalf
Yashodha Chaku [Fri, 18 Mar 2016 12:27:58 +0000 (17:57 +0530)]
Merge pull request #7989 from fuzionnz/CRM-17952
CRM-17952. Escape HTML on "Headers, Footers, and Automated Messages"
Monish Deb [Fri, 18 Mar 2016 10:21:01 +0000 (15:51 +0530)]
Merge pull request #7977 from JMAConsulting/CRM-18219
CRM-18219 Fixed bug related to required sign up for on behalf orgs
JKingsnorth [Fri, 18 Mar 2016 09:28:49 +0000 (09:28 +0000)]
CRM18257: Add fullPage WYSIWYG style to message templates
JKingsnorth [Fri, 18 Mar 2016 09:07:56 +0000 (09:07 +0000)]
Make variable declaration less verbose
Monish Deb [Fri, 18 Mar 2016 08:51:35 +0000 (14:21 +0530)]
Merge pull request #7992 from jitendrapurohit/CRM-18255
Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc
Yashodha Chaku [Fri, 18 Mar 2016 06:53:57 +0000 (12:23 +0530)]
Merge pull request #7998 from josephlacey/CRM-18188
CRM-18188 Fixing duplicate rules on required fields when creating tabbed contact custom data
jitendrapurohit [Thu, 17 Mar 2016 09:15:57 +0000 (14:45 +0530)]
Minor fix for CRM-16173, CRM-16831 - change labels, add separator, etc
minor fix
Tim Otten [Thu, 17 Mar 2016 22:17:19 +0000 (15:17 -0700)]
Merge pull request #7997 from TobiasLounsbury/CRM-18223-generic-hook
Added call to hook_civicrm_fieldOptions()...
Joseph Lacey [Thu, 17 Mar 2016 21:24:32 +0000 (17:24 -0400)]
CRM-18188 Fixing duplicate rules on required fields when creating tabbed contact custom data.
----------------------------------------
* CRM-18188: Tabbed Custom Data Required Field Submit Values Ignored
https://issues.civicrm.org/jira/browse/CRM-18188
Tobias Lounsbury [Thu, 17 Mar 2016 20:01:41 +0000 (13:01 -0700)]
Added call to hook_civicrm_fieldOptions() from within CRM_Core_PseudoConstant::get() for fields that validate against a callback.
deb.monish [Thu, 17 Mar 2016 17:31:45 +0000 (23:01 +0530)]
CRM-18071 fix
minor fix
style fix
style fix
JKingsnorth [Thu, 17 Mar 2016 15:53:50 +0000 (15:53 +0000)]
CRM-18257: fullPage configuration option
Eileen McNaughton [Thu, 17 Mar 2016 08:11:21 +0000 (21:11 +1300)]
Merge pull request #7861 from laryn/patch-8
CRM-18092: Add batch info to bookkeeping report
Mattias Michaux [Thu, 17 Mar 2016 07:14:12 +0000 (20:14 +1300)]
CRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
Pradeep Nayak [Wed, 16 Mar 2016 21:22:30 +0000 (02:52 +0530)]
CRM-18163, fixed problem related to CRM-15182
----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
https://issues.civicrm.org/jira/browse/CRM-18163
* CRM-15182: on behalf of: preloaded org is not preserved
https://issues.civicrm.org/jira/browse/CRM-15182
Eileen McNaughton [Wed, 16 Mar 2016 20:53:47 +0000 (09:53 +1300)]
Merge pull request #7818 from JMAConsulting/CRM-16526-1
CRM-16526 [needs-review] Financial ACL API tests
colemanw [Wed, 16 Mar 2016 15:14:46 +0000 (11:14 -0400)]
Merge pull request #7986 from colemanw/CRM-18243
CRM-18243 - Remove call to deprecated function
Monish Deb [Wed, 16 Mar 2016 13:26:27 +0000 (18:56 +0530)]
Merge pull request #7982 from jitendrapurohit/CRM-18183
QA fix for CRM-18183
Coleman Watts [Wed, 16 Mar 2016 13:26:17 +0000 (09:26 -0400)]
CRM-18243 - Remove call to deprecated function
Yashodha Chaku [Wed, 16 Mar 2016 11:21:49 +0000 (16:51 +0530)]
Merge pull request #7980 from galgeek/patch-2
handle more better date formats
Monish Deb [Wed, 16 Mar 2016 10:47:46 +0000 (16:17 +0530)]
Merge pull request #7981 from rohankatkar/CRM-18183
CRM-18183: Custom file upload fields broken in backend
jitendrapurohit [Wed, 16 Mar 2016 10:17:11 +0000 (15:47 +0530)]
QA fix for CRM-18183
Web Access [Wed, 16 Mar 2016 09:53:14 +0000 (15:23 +0530)]
CRM-18183
CiviCRM [Wed, 16 Mar 2016 09:44:58 +0000 (02:44 -0700)]
Update version to 4.7.5
Eileen McNaughton [Wed, 16 Mar 2016 02:54:20 +0000 (15:54 +1300)]
Merge pull request #7979 from eileenmcnaughton/lybunt
CRM-18246 Lybunt group clause not being included in temp table due to…
Barbara Miller [Wed, 16 Mar 2016 01:19:46 +0000 (18:19 -0700)]
handle more better date formats
this is the same issue as https://issues.civicrm.org/jira/browse/CRM-13063 but in a different location, Contribution.php's _assignMesssageVariablesToTemplate, per IRC with Eileen, xurizaemon, and others
eileen [Tue, 15 Mar 2016 22:59:25 +0000 (11:59 +1300)]
CRM-18246 Lybunt group clause not being included in temp table due to order of operations
Edsel [Tue, 15 Mar 2016 12:03:07 +0000 (17:33 +0530)]
CRM-18219 Added display of org fields on thank you page
----------------------------------------
* CRM-18219: Organization data shows up as required fields on contribution confirm page
https://issues.civicrm.org/jira/browse/CRM-18219
Edsel [Tue, 15 Mar 2016 07:54:47 +0000 (13:24 +0530)]
CRM-18219 Fixed bug related to required sign up for on behalf orgs
----------------------------------------
* CRM-18219: Organization data shows up as required fields on contribution confirm page
https://issues.civicrm.org/jira/browse/CRM-18219
Yashodha Chaku [Tue, 15 Mar 2016 11:44:17 +0000 (17:14 +0530)]
Merge pull request #7978 from eileenmcnaughton/CRM-18240
CRM-18240 Add number of installments & acknowledgement sent to pledge…
eileenmcnaugton [Tue, 15 Mar 2016 09:31:00 +0000 (22:31 +1300)]
CRM-18240 Add number of installments & acknowledgement sent to pledge search
Eileen McNaughton [Tue, 15 Mar 2016 01:22:58 +0000 (14:22 +1300)]
Merge pull request #7946 from eileenmcnaughton/CRM-18106
CRM-18106 create activity against contact deleted by merge
Eileen McNaughton [Mon, 14 Mar 2016 23:51:16 +0000 (12:51 +1300)]
Merge pull request #7975 from joannechester/patch-1
CRM-17406 update token list for scheduled reminders
Eileen McNaughton [Mon, 14 Mar 2016 23:33:31 +0000 (12:33 +1300)]
Merge pull request #7938 from eileenmcnaughton/CRM-18178
CRM-18178 exclude _bak & _backup tables from trigger creation
Eileen McNaughton [Mon, 14 Mar 2016 23:10:54 +0000 (12:10 +1300)]
Merge pull request #7974 from totten/master-contr-tkn-test
CRM_Contribute_ActionMapping_ByTypeTest - Check that contribution tokens work
joannechester [Mon, 14 Mar 2016 23:05:39 +0000 (10:05 +1100)]
CRM-17406 update token list for scheduled reminders
Processing capability for contribution tokens already exists. This is just adding them to the token dropdown list for easy selection.
Eileen McNaughton [Mon, 14 Mar 2016 21:28:20 +0000 (10:28 +1300)]
Merge pull request #7962 from eileenmcnaughton/CRM-18213
CRM-18213 remove hard-coding of DAO names
Tim Otten [Mon, 14 Mar 2016 21:26:52 +0000 (14:26 -0700)]
CRM_Contribute_ActionMapping_ByTypeTest - Check that contribution tokens work
Monish Deb [Mon, 14 Mar 2016 12:54:59 +0000 (18:24 +0530)]
Merge pull request #7969 from monishdeb/CRM-18224
CRM-18224 fix
Yashodha Chaku [Mon, 14 Mar 2016 12:28:45 +0000 (17:58 +0530)]
Merge pull request #7971 from yashodha/CRM-18201
CRM-18201: Change form title 'Export All or Selected Fields' to 'Expo…
Eileen McNaughton [Mon, 14 Mar 2016 11:43:05 +0000 (00:43 +1300)]
Merge pull request #7968 from eileenmcnaughton/time
CRM-18232 Handle 'etc/UTF' timezone + CRM-18233 test fix
yashodha [Mon, 14 Mar 2016 11:29:16 +0000 (16:59 +0530)]
CRM-18201: Change form title 'Export All or Selected Fields' to 'Export Options'
----------------------------------------
* CRM-18201: Change form title "Export All or Selected Fields" to "Export Options"
https://issues.civicrm.org/jira/browse/CRM-18201
Olivier Tétard [Mon, 14 Mar 2016 11:25:40 +0000 (12:25 +0100)]
CRM-18235: Allow to define `returnPath` in CRM_Utils_Mail::send().
Allow user to define a specific `Return-Path` header when sending an e-mail using the `CRM_Utils_Mail::send()` method.
To proceed, just define `returnPath` in the `$params` which is given to the function. If `returnPath` is not defined, use the previous method to define `returnPath`.
Yashodha Chaku [Mon, 14 Mar 2016 11:16:52 +0000 (16:46 +0530)]
Merge pull request #7966 from jitendrapurohit/CRM-18103
CRM-18103 - Warning in Pledge.php caused by null initial_reminder_day
deb.monish [Mon, 14 Mar 2016 10:56:30 +0000 (16:26 +0530)]
notice fix
deb.monish [Mon, 14 Mar 2016 10:08:27 +0000 (15:38 +0530)]
CRM-18224 fix
eileenmcnaugton [Mon, 14 Mar 2016 09:19:51 +0000 (22:19 +1300)]
CRM-18233 Fix modified_date action schedule test
eileenmcnaugton [Mon, 14 Mar 2016 09:19:26 +0000 (22:19 +1300)]
CRM-18232 Handle 'etc/UTF' timezone
Yashodha Chaku [Mon, 14 Mar 2016 08:52:25 +0000 (14:22 +0530)]
Merge pull request #7967 from yashodha/CRM-18220
CRM-18220: Notice asking to be reported on Add Contacts to Organizati…
yashodha [Mon, 14 Mar 2016 07:26:23 +0000 (12:56 +0530)]
CRM-18220: Notice asking to be reported on Add Contacts to Organization and on Add Members to Household forms
----------------------------------------
* CRM-18220: Notice asking to be reported on Add Contacts to Organization and on Add Members to Household forms
https://issues.civicrm.org/jira/browse/CRM-18220
jitendrapurohit [Mon, 14 Mar 2016 06:39:58 +0000 (12:09 +0530)]
CRM-18103 - Warning in Pledge.php caused by null initial_reminder_day
Eileen McNaughton [Mon, 14 Mar 2016 03:58:07 +0000 (16:58 +1300)]
Merge pull request #7965 from eileenmcnaughton/comments
minor comment tidyups
eileenmcnaugton [Mon, 14 Mar 2016 02:07:49 +0000 (15:07 +1300)]
minor comment tidyups
Eileen McNaughton [Fri, 11 Mar 2016 21:04:13 +0000 (10:04 +1300)]
Merge pull request #7880 from dgbauleo/crm-17498
Removing unsupported status change options when the contribution is completed
Eileen McNaughton [Fri, 11 Mar 2016 20:59:29 +0000 (09:59 +1300)]
Merge pull request #7893 from eileenmcnaughton/CRM-18128
CRM-18128 Stop bypassing caching for state_province abbreviation
Eileen McNaughton [Fri, 11 Mar 2016 20:49:09 +0000 (09:49 +1300)]
Merge pull request #7944 from eileenmcnaughton/sanity
Enough with double caching hard coded arrays
Monish Deb [Fri, 11 Mar 2016 14:20:20 +0000 (19:50 +0530)]
Merge pull request #7963 from jitendrapurohit/CRM-18174
CRM-18174 -- DB Error when Exporting Contact Using "Merge Household" …
Edsel [Fri, 11 Mar 2016 12:19:46 +0000 (17:49 +0530)]
CRM-18163 Finished webtest
----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
https://issues.civicrm.org/jira/browse/CRM-18163
Yashodha Chaku [Fri, 11 Mar 2016 09:49:05 +0000 (15:19 +0530)]
Merge pull request #7957 from JMAConsulting/CRM-18204
Crm 18204
jitendrapurohit [Fri, 11 Mar 2016 08:53:29 +0000 (14:23 +0530)]
CRM-18174 -- DB Error when Exporting Contact Using "Merge Household" and "Select fields" Options
Pradeep Nayak [Fri, 11 Mar 2016 08:40:25 +0000 (14:10 +0530)]
--CRM-18204, modified code to use checkProfileType function
Pradeep Nayak [Thu, 10 Mar 2016 13:49:53 +0000 (19:19 +0530)]
--CRM-18204, remove Create mode, Edit mode, listing mode and HMTL form snippet links if uf group type is not contact
Pradeep Nayak [Thu, 10 Mar 2016 13:48:52 +0000 (19:18 +0530)]
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Pradeep Nayak [Thu, 10 Mar 2016 13:45:47 +0000 (19:15 +0530)]
CRM-18204, used contact type and contact sub type for checking uf group type
----------------------------------------
* CRM-18204: Enables use of Mixed Profile for create mode
https://issues.civicrm.org/jira/browse/CRM-18204
Monish Deb [Fri, 11 Mar 2016 05:15:58 +0000 (10:45 +0530)]
Merge pull request #7956 from jitendrapurohit/activity-report
remove unwanted lines after #7827
eileen [Fri, 11 Mar 2016 01:37:28 +0000 (14:37 +1300)]
CRM-18213 remove hard-coded DAO names
Change-Id: I2b6e66b225f5ecbebce737656f0a41e0372174f1
Eileen McNaughton [Fri, 11 Mar 2016 02:41:40 +0000 (15:41 +1300)]
Merge pull request #7960 from eileenmcnaughton/uniquid
CRM-18193 make unique ID for request available to php & mysql
Eileen McNaughton [Fri, 11 Mar 2016 02:40:49 +0000 (15:40 +1300)]
Merge pull request #7961 from TobiasLounsbury/CRM-18211-separate-membership-payment
CRM-18211: Added check to verify existence of Contribution before cal…
Tobias Lounsbury [Fri, 11 Mar 2016 01:34:20 +0000 (17:34 -0800)]
Fixed unintentional tab characters
eileen [Fri, 11 Mar 2016 01:23:50 +0000 (14:23 +1300)]
CRM-18213 remove hard-coding of DAO names
Tobias Lounsbury [Fri, 11 Mar 2016 01:22:47 +0000 (17:22 -0800)]
CRM-18211: Added check to verify existence of Contribution before calling completeTransaction
eileen [Fri, 11 Mar 2016 00:49:24 +0000 (13:49 +1300)]
CRM-18193 make unique ID for request available to php & mysql
Pradeep Nayak [Thu, 10 Mar 2016 20:08:56 +0000 (01:38 +0530)]
CRM-18163, fixed jenkin's style check
----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
https://issues.civicrm.org/jira/browse/CRM-18163
Pradeep Nayak [Thu, 10 Mar 2016 19:59:27 +0000 (01:29 +0530)]
CRM-18163, removed code that explicitly set org id using org name
----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
https://issues.civicrm.org/jira/browse/CRM-18163
colemanw [Thu, 10 Mar 2016 18:50:17 +0000 (13:50 -0500)]
Merge pull request #7954 from nielosz/fix-expand-subgroups
CRM-18184 - Fix expanding subgroups in manage-groups-view
projects / civicrm-core.git / log