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.
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
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
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
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" …
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
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
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…
jitendrapurohit [Thu, 10 Mar 2016 12:49:08 +0000 (18:19 +0530)]
remove unwanted lines after #7827
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
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
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
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'
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
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.
jitendrapurohit [Thu, 10 Mar 2016 05:59:08 +0000 (11:29 +0530)]
CRM-18200 - Warning thrown on saving 'Financial Batch'
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
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
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.
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.
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
Uelen Paulo [Wed, 9 Mar 2016 12:35:53 +0000 (09:35 -0300)]
CRM-17571 - fixing checkstyles warnings
Monish Deb [Wed, 9 Mar 2016 07:43:29 +0000 (13:13 +0530)]
Merge pull request #7934 from eileenmcnaughton/CRM-18172
CRM-18172 only load up dashlets relevant to the current domain
Monish Deb [Wed, 9 Mar 2016 07:37:03 +0000 (13:07 +0530)]
Merge pull request #7948 from jitendrapurohit/CRM-18161
CRM-18161 - Display total cancelled soft credits in summary
eileen [Thu, 3 Mar 2016 00:59:10 +0000 (13:59 +1300)]
CRM-18106 create activity against contact deleted by merge
jitendrapurohit [Wed, 9 Mar 2016 06:51:47 +0000 (12:21 +0530)]
additional fixes
unknown [Fri, 4 Mar 2016 17:08:15 +0000 (17:08 +0000)]
Display total cancelled soft credits in summary
colemanw [Wed, 9 Mar 2016 02:00:53 +0000 (21:00 -0500)]
Merge pull request #7947 from colemanw/CRM-18192
CRM-18192 - Remove Sunlight code from core
Coleman Watts [Wed, 9 Mar 2016 00:35:58 +0000 (19:35 -0500)]
CRM-18192 - Remove Sunlight code from core
colemanw [Wed, 9 Mar 2016 00:26:20 +0000 (19:26 -0500)]
Merge pull request #7943 from ujjwalwahi/master
CRM-18187 - Bug fix for enable a disabled group
Eileen McNaughton [Tue, 8 Mar 2016 22:50:38 +0000 (11:50 +1300)]
Merge pull request #7945 from eileenmcnaughton/priority
CRM-18134 test to see if priority_id sets to Normal by default & sinc…
eileen [Wed, 2 Mar 2016 04:24:32 +0000 (17:24 +1300)]
CRM-18106 add contact deleted by merge activity type
eileen [Tue, 8 Mar 2016 22:16:59 +0000 (11:16 +1300)]
CRM-18134 test to see if priority_id sets to Normal by default & since it does, don't pass it in
eileen [Thu, 3 Mar 2016 00:59:57 +0000 (13:59 +1300)]
Enough with double caching hard coded arrays
Eileen McNaughton [Tue, 8 Mar 2016 21:43:15 +0000 (10:43 +1300)]
Merge pull request #7942 from saurabhbatra96/CRM-18169
CRM-18169 - Accounting Batch Export to CSV results in Fatal Error & Whitescreen
Eileen McNaughton [Tue, 8 Mar 2016 21:24:43 +0000 (10:24 +1300)]
Merge pull request #7841 from JMAConsulting/CRM-16526-2
CRM-16526 [fantastic PR that adds tests] Unit tests for Financial Type ACL test
Eileen McNaughton [Tue, 8 Mar 2016 20:05:29 +0000 (09:05 +1300)]
Merge pull request #7925 from eileenmcnaughton/CRM-18166
CRM-18166 Update receipt_date in IPN calls
Ujjwal Wahi [Tue, 8 Mar 2016 19:16:21 +0000 (00:46 +0530)]
CRM-18187 - Bug fix for enable a disabled group
----------------------------------------
* CRM-18187: Can't enable a disabled group
https://issues.civicrm.org/jira/browse/CRM-18187
Uelen Paulo [Tue, 8 Mar 2016 17:32:51 +0000 (14:32 -0300)]
CRM-17571 - fixing a missing mistake from select searchByLabel type
Edsel [Tue, 8 Mar 2016 14:14:29 +0000 (19:44 +0530)]
CRM-16526 CIVI-3 Fixed Jenkins test failure
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Tue, 8 Mar 2016 14:06:37 +0000 (19:36 +0530)]
CRM-16526 CIVI-3 Fixed Jenkins test failure
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Edsel [Tue, 8 Mar 2016 13:19:23 +0000 (18:49 +0530)]
CRM-16526 CIVI-3 Fixed Jenkins test failure
----------------------------------------
* CRM-16526: ACLs for Financial Types
https://issues.civicrm.org/jira/browse/CRM-16526
Eileen McNaughton [Tue, 8 Mar 2016 09:40:58 +0000 (22:40 +1300)]
Merge pull request #7914 from jitendrapurohit/CRM-18061
CRM-18061 -- Test secret/publishable keys get overwritten with live keys on payment processor configuration save
Saurabh Batra [Tue, 8 Mar 2016 08:15:27 +0000 (13:45 +0530)]
CRM-18169 - https://issues.civicrm.org/jira/browse/CRM-18169
Monish Deb [Tue, 8 Mar 2016 06:19:29 +0000 (11:49 +0530)]
Merge pull request #7941 from rohankatkar/CRM-17182-simple-warningFix
Warning fix for QA
Web Access [Tue, 8 Mar 2016 06:10:00 +0000 (11:40 +0530)]
Warning fix for QA
projects / civicrm-core.git / log