civicrm-core.git
8 years agoFixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:14:56 +0000 (14:44 +0530)]
Fixes for Note preview CSS

8 years agoFixes for Note preview CSS
sushantpaste [Mon, 21 Mar 2016 09:10:29 +0000 (14:40 +0530)]
Fixes for Note preview CSS

8 years agoMerge pull request #7995 from monishdeb/CRM-18071
Monish Deb [Mon, 21 Mar 2016 08:02:52 +0000 (13:32 +0530)]
Merge pull request #7995 from monishdeb/CRM-18071

Crm 18071

8 years agoMerge pull request #8001 from monishdeb/CRM-18219
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

8 years agoMerge pull request #8006 from yashodha/CRM-18263
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

8 years agoCRM-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

8 years agoMerge pull request #8004 from PalanteJon/CRM-18264
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…

8 years agoMerge pull request #7959 from JMAConsulting/CRM-18163
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

8 years agoCRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet
Jon goldberg [Fri, 18 Mar 2016 19:47:16 +0000 (15:47 -0400)]
CRM-18264 - Fix potential upgrade crash when adding Getting Started dashlet

8 years agoMerge pull request #7993 from JKingsnorth/CRM-18257
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

8 years agoCRM-18219,CRM-9067 fixes on onbehalf
deb.monish [Fri, 18 Mar 2016 13:23:00 +0000 (18:53 +0530)]
CRM-18219,CRM-9067 fixes on onbehalf

8 years agoMerge pull request #7989 from fuzionnz/CRM-17952
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"

8 years agoMerge pull request #7977 from JMAConsulting/CRM-18219
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

8 years agoCRM18257: Add fullPage WYSIWYG style to message templates
JKingsnorth [Fri, 18 Mar 2016 09:28:49 +0000 (09:28 +0000)]
CRM18257: Add fullPage WYSIWYG style to message templates

8 years agoMake variable declaration less verbose
JKingsnorth [Fri, 18 Mar 2016 09:07:56 +0000 (09:07 +0000)]
Make variable declaration less verbose

8 years agoMerge pull request #7992 from jitendrapurohit/CRM-18255
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

8 years agoMerge pull request #7998 from josephlacey/CRM-18188
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

8 years agoMinor fix for CRM-16173, CRM-16831 - change labels, add separator, etc
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

8 years agoMerge pull request #7997 from TobiasLounsbury/CRM-18223-generic-hook
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()...

8 years agoCRM-18188 Fixing duplicate rules on required fields when creating tabbed contact...
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

8 years agoAdded call to hook_civicrm_fieldOptions() from within CRM_Core_PseudoConstant::get...
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.

8 years agoCRM-18071 fix
deb.monish [Thu, 17 Mar 2016 17:31:45 +0000 (23:01 +0530)]
CRM-18071 fix

minor fix

style fix

style fix

8 years agoCRM-18257: fullPage configuration option
JKingsnorth [Thu, 17 Mar 2016 15:53:50 +0000 (15:53 +0000)]
CRM-18257: fullPage configuration option

8 years agoMerge pull request #7861 from laryn/patch-8
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

8 years agoCRM-17952. Escape HTML in body_text field on "Headers, Footers, and Automated Messages"
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"

8 years agoCRM-18163, fixed problem related to CRM-15182
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

8 years agoMerge pull request #7818 from JMAConsulting/CRM-16526-1
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

8 years agoMerge pull request #7986 from colemanw/CRM-18243
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

8 years agoMerge pull request #7982 from jitendrapurohit/CRM-18183
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

8 years agoCRM-18243 - Remove call to deprecated function
Coleman Watts [Wed, 16 Mar 2016 13:26:17 +0000 (09:26 -0400)]
CRM-18243 - Remove call to deprecated function

8 years agoMerge pull request #7980 from galgeek/patch-2
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

8 years agoMerge pull request #7981 from rohankatkar/CRM-18183
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

8 years agoQA fix for CRM-18183
jitendrapurohit [Wed, 16 Mar 2016 10:17:11 +0000 (15:47 +0530)]
QA fix for CRM-18183

8 years agoCRM-18183
Web Access [Wed, 16 Mar 2016 09:53:14 +0000 (15:23 +0530)]
CRM-18183

8 years agoUpdate version to 4.7.5
CiviCRM [Wed, 16 Mar 2016 09:44:58 +0000 (02:44 -0700)]
Update version to 4.7.5

8 years agoMerge pull request #7979 from eileenmcnaughton/lybunt
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…

8 years agohandle more better date formats
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

8 years agoCRM-18246 Lybunt group clause not being included in temp table due to order of operations
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

8 years agoCRM-18219 Added display of org fields on thank you page
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

8 years agoCRM-18219 Fixed bug related to required sign up for on behalf orgs
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

8 years agoMerge pull request #7978 from eileenmcnaughton/CRM-18240
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…

8 years agoCRM-18240 Add number of installments & acknowledgement sent to pledge search
eileenmcnaugton [Tue, 15 Mar 2016 09:31:00 +0000 (22:31 +1300)]
CRM-18240 Add number of installments & acknowledgement sent to pledge search

8 years agoMerge pull request #7946 from eileenmcnaughton/CRM-18106
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

8 years agoMerge pull request #7975 from joannechester/patch-1
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

8 years agoMerge pull request #7938 from eileenmcnaughton/CRM-18178
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

8 years agoMerge pull request #7974 from totten/master-contr-tkn-test
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

8 years agoCRM-17406 update token list for scheduled reminders
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.

8 years agoMerge pull request #7962 from eileenmcnaughton/CRM-18213
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

8 years agoCRM_Contribute_ActionMapping_ByTypeTest - Check that contribution tokens work
Tim Otten [Mon, 14 Mar 2016 21:26:52 +0000 (14:26 -0700)]
CRM_Contribute_ActionMapping_ByTypeTest - Check that contribution tokens work

8 years agoMerge pull request #7969 from monishdeb/CRM-18224
Monish Deb [Mon, 14 Mar 2016 12:54:59 +0000 (18:24 +0530)]
Merge pull request #7969 from monishdeb/CRM-18224

CRM-18224 fix

8 years agoMerge pull request #7971 from yashodha/CRM-18201
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…

8 years agoMerge pull request #7968 from eileenmcnaughton/time
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

8 years agoCRM-18201: Change form title 'Export All or Selected Fields' to 'Export Options'
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

8 years agoMerge pull request #7966 from jitendrapurohit/CRM-18103
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

8 years agonotice fix
deb.monish [Mon, 14 Mar 2016 10:56:30 +0000 (16:26 +0530)]
notice fix

8 years agoCRM-18224 fix
deb.monish [Mon, 14 Mar 2016 10:08:27 +0000 (15:38 +0530)]
CRM-18224 fix

8 years agoCRM-18233 Fix modified_date action schedule test
eileenmcnaugton [Mon, 14 Mar 2016 09:19:51 +0000 (22:19 +1300)]
CRM-18233 Fix modified_date action schedule test

8 years agoCRM-18232 Handle 'etc/UTF' timezone
eileenmcnaugton [Mon, 14 Mar 2016 09:19:26 +0000 (22:19 +1300)]
CRM-18232 Handle 'etc/UTF' timezone

8 years agoMerge pull request #7967 from yashodha/CRM-18220
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…

8 years agoCRM-18220: Notice asking to be reported on Add Contacts to Organization and on Add...
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

8 years agoCRM-18103 - Warning in Pledge.php caused by null initial_reminder_day
jitendrapurohit [Mon, 14 Mar 2016 06:39:58 +0000 (12:09 +0530)]
CRM-18103 - Warning in Pledge.php caused by null initial_reminder_day

8 years agoMerge pull request #7965 from eileenmcnaughton/comments
Eileen McNaughton [Mon, 14 Mar 2016 03:58:07 +0000 (16:58 +1300)]
Merge pull request #7965 from eileenmcnaughton/comments

minor comment tidyups

8 years agominor comment tidyups
eileenmcnaugton [Mon, 14 Mar 2016 02:07:49 +0000 (15:07 +1300)]
minor comment tidyups

8 years agoMerge pull request #7880 from dgbauleo/crm-17498
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

8 years agoMerge pull request #7893 from eileenmcnaughton/CRM-18128
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

8 years agoMerge pull request #7944 from eileenmcnaughton/sanity
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

8 years agoMerge pull request #7963 from jitendrapurohit/CRM-18174
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" …

8 years agoCRM-18163 Finished webtest
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

8 years agoMerge pull request #7957 from JMAConsulting/CRM-18204
Yashodha Chaku [Fri, 11 Mar 2016 09:49:05 +0000 (15:19 +0530)]
Merge pull request #7957 from JMAConsulting/CRM-18204

Crm 18204

8 years agoCRM-18174 -- DB Error when Exporting Contact Using "Merge Household" and "Select...
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

8 years ago--CRM-18204, modified code to use checkProfileType function
Pradeep Nayak [Fri, 11 Mar 2016 08:40:25 +0000 (14:10 +0530)]
--CRM-18204, modified code to use checkProfileType function

8 years ago--CRM-18204, remove Create mode, Edit mode, listing mode and HMTL form snippet links...
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

8 years agoCRM-18204, used contact type and contact sub type for checking uf group type
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

8 years agoCRM-18204, used contact type and contact sub type for checking uf group type
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

8 years agoMerge pull request #7956 from jitendrapurohit/activity-report
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

8 years agoCRM-18213 remove hard-coded DAO names
eileen [Fri, 11 Mar 2016 01:37:28 +0000 (14:37 +1300)]
CRM-18213 remove hard-coded DAO names

Change-Id: I2b6e66b225f5ecbebce737656f0a41e0372174f1

8 years agoMerge pull request #7960 from eileenmcnaughton/uniquid
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

8 years agoMerge pull request #7961 from TobiasLounsbury/CRM-18211-separate-membership-payment
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…

8 years agoFixed unintentional tab characters
Tobias Lounsbury [Fri, 11 Mar 2016 01:34:20 +0000 (17:34 -0800)]
Fixed unintentional tab characters

8 years agoCRM-18213 remove hard-coding of DAO names
eileen [Fri, 11 Mar 2016 01:23:50 +0000 (14:23 +1300)]
CRM-18213 remove hard-coding of DAO names

8 years agoCRM-18211: Added check to verify existence of Contribution before calling completeTra...
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

8 years agoCRM-18193 make unique ID for request available to php & mysql
eileen [Fri, 11 Mar 2016 00:49:24 +0000 (13:49 +1300)]
CRM-18193 make unique ID for request available to php & mysql

8 years agoCRM-18163, fixed jenkin's style check
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

8 years agoCRM-18163, removed code that explicitly set org id using org name
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

8 years agoMerge pull request #7954 from nielosz/fix-expand-subgroups
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

8 years agoMerge pull request #7955 from jitendrapurohit/CRM-18167
Monish Deb [Thu, 10 Mar 2016 13:43:58 +0000 (19:13 +0530)]
Merge pull request #7955 from jitendrapurohit/CRM-18167

CRM-18167 - Activity count displays incorrectly on Activity pane in M…

8 years agoremove unwanted lines after #7827
jitendrapurohit [Thu, 10 Mar 2016 12:49:08 +0000 (18:19 +0530)]
remove unwanted lines after #7827

8 years agoCRM-18161 - Activity count displays incorrectly on Activity pane in Manage Case form
jitendrapurohit [Thu, 10 Mar 2016 12:43:19 +0000 (18:13 +0530)]
CRM-18161 - Activity count displays incorrectly on Activity pane in Manage Case form

8 years agoMerge pull request #7827 from circleinteractive/master
Yashodha Chaku [Thu, 10 Mar 2016 10:56:02 +0000 (16:26 +0530)]
Merge pull request #7827 from circleinteractive/master

Changes to CRM/Report/Form/Activity.php regarding Civicase permissions

8 years agoCRM-18184 - Fix expanding subgroups in manage-groups-view
Niels Heinemann [Thu, 10 Mar 2016 09:53:20 +0000 (10:53 +0100)]
CRM-18184 - Fix expanding subgroups in manage-groups-view

----------------------------------------
* CRM-18184: Manage groups: Can't expand sub groups if title editable
  https://issues.civicrm.org/jira/browse/CRM-18184

8 years agoMerge pull request #7953 from jitendrapurohit/CRM-18200
Monish Deb [Thu, 10 Mar 2016 09:35:31 +0000 (15:05 +0530)]
Merge pull request #7953 from jitendrapurohit/CRM-18200

CRM-18200 - Warning thrown on saving 'Financial Batch'

8 years agoMerge pull request #7952 from ujjwalwahi/master
Yashodha Chaku [Thu, 10 Mar 2016 08:33:29 +0000 (14:03 +0530)]
Merge pull request #7952 from ujjwalwahi/master

CRM-18194 - Bug fix for group type set to empty while updating Group

8 years agoMerge pull request #7951 from mlutfy/dmaster-crm18197
Yashodha Chaku [Thu, 10 Mar 2016 08:21:11 +0000 (13:51 +0530)]
Merge pull request #7951 from mlutfy/dmaster-crm18197

CRM-18197: Activity report: fix view-contact links when multiple assign/targets.

8 years agoCRM-18200 - Warning thrown on saving 'Financial Batch'
jitendrapurohit [Thu, 10 Mar 2016 05:59:08 +0000 (11:29 +0530)]
CRM-18200 - Warning thrown on saving 'Financial Batch'

8 years agoMerge pull request #7883 from agh1/petition-custom-fields-47
colemanw [Wed, 9 Mar 2016 20:37:28 +0000 (15:37 -0500)]
Merge pull request #7883 from agh1/petition-custom-fields-47

CRM-17614 show survey custom fields in petition and survey UI

8 years agoCRM-18194 - Bug fix for group type set to empty while updating Group
Ujjwal Wahi [Wed, 9 Mar 2016 12:04:13 +0000 (17:34 +0530)]
CRM-18194 - Bug fix for group type set to empty while updating Group

----------------------------------------
* CRM-18194: Group Type is set to empty while updating Group
  https://issues.civicrm.org/jira/browse/CRM-18194

8 years agoMerge pull request #7900 from sarehag/CRM-17558
colemanw [Wed, 9 Mar 2016 15:46:17 +0000 (10:46 -0500)]
Merge pull request #7900 from sarehag/CRM-17558

Crm 17558:Resolving conflicted for labels by changing id for one group.

8 years agoCRM-18197: Activity report: fix view-contact links when multiple assign/target contacts.
Mathieu Lutfy [Wed, 9 Mar 2016 15:33:29 +0000 (10:33 -0500)]
CRM-18197: Activity report: fix view-contact links when multiple assign/target contacts.

8 years agoCRM-18163 CIVI-3 Added webtest for dedupe org on postal code when onbehalf contributi...
Edsel [Wed, 9 Mar 2016 14:10:14 +0000 (19:40 +0530)]
CRM-18163 CIVI-3 Added webtest for dedupe org on postal code when onbehalf contribution is done

----------------------------------------
* CRM-18163: Unsupervised Organization Rule for On Behalf Of Contributions
  https://issues.civicrm.org/jira/browse/CRM-18163

8 years agoMerge pull request #7913 from uelenpaulo/CRM-17571
Monish Deb [Wed, 9 Mar 2016 13:29:31 +0000 (18:59 +0530)]
Merge pull request #7913 from uelenpaulo/CRM-17571

CRM-17571 - enabling search builder through label instead of id