kurund [Tue, 17 Dec 2013 05:52:38 +0000 (21:52 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-16-21-42-04
Conflicts:
CRM/Event/BAO/Participant.php
templates/CRM/common/Navigation.tpl
colemanw [Tue, 17 Dec 2013 03:54:27 +0000 (19:54 -0800)]
Merge pull request #2224 from colemanw/4.4
CRM-13929 - fix drupal jQuery vs cj collision
Coleman Watts [Tue, 17 Dec 2013 03:53:51 +0000 (19:53 -0800)]
CRM-13929 - fix drupal jQuery vs cj collision
Kurund Jalmi [Mon, 16 Dec 2013 18:26:02 +0000 (10:26 -0800)]
Merge pull request #2221 from monishdeb/CRM-13924
CRM-13924 fix - notices
monishdeb [Mon, 16 Dec 2013 09:37:23 +0000 (15:07 +0530)]
CRM-13924 fix - notices
http://issues.civicrm.org/jira/browse/CRM-13924
deepak-srivastava [Mon, 16 Dec 2013 08:19:23 +0000 (00:19 -0800)]
Merge pull request #2170 from eileenmcnaughton/CRM-13918
CRM-13918 add report_template.getrows, report_template.getstatistics api functions
Coleman Watts [Sun, 15 Dec 2013 03:58:37 +0000 (19:58 -0800)]
CRM-13979 - Fix tag name display during delete
Graylin Kim [Sun, 15 Dec 2013 02:15:38 +0000 (21:15 -0500)]
Fixes CRM-13979 by moving the status update out of the BAO layer.
Kurund Jalmi [Fri, 13 Dec 2013 16:45:26 +0000 (08:45 -0800)]
Merge pull request #2212 from davecivicrm/participantBAONoticeFix
Notice fix in CRM_Participant_BAO_Participant::add
Kurund Jalmi [Fri, 13 Dec 2013 16:44:50 +0000 (08:44 -0800)]
Merge pull request #2213 from pratik-joshi/CRM-13961
CRM-13961
Kurund Jalmi [Fri, 13 Dec 2013 16:43:28 +0000 (08:43 -0800)]
Merge pull request #2214 from pratik-joshi/CRM-13963
CRM-13963
Kurund Jalmi [Fri, 13 Dec 2013 16:42:08 +0000 (08:42 -0800)]
Merge pull request #2215 from monishdeb/CRM-13972
Crm 13972 fix
Kurund Jalmi [Fri, 13 Dec 2013 16:41:16 +0000 (08:41 -0800)]
Merge pull request #2216 from monishdeb/CRM-13738-fix
CRM-13738 related fix
monishdeb [Fri, 13 Dec 2013 16:32:48 +0000 (22:02 +0530)]
CRM-13738 related fix
----------------------------------------
* CRM-13738: Activity Report fails if filtering on any contact
http://issues.civicrm.org/jira/browse/CRM-13738
monishdeb [Fri, 13 Dec 2013 16:25:26 +0000 (21:55 +0530)]
CRM-13972 fix - Preferred Language reset after editing contact
http://issues.civicrm.org/jira/browse/CRM-13972
Kurund Jalmi [Fri, 13 Dec 2013 16:09:47 +0000 (08:09 -0800)]
Merge pull request #2193 from monishdeb/CRM-13734
CRM-13734 fix - Some basic case activities are not reserved
Pratik Joshi [Fri, 13 Dec 2013 10:14:22 +0000 (15:44 +0530)]
CRM-13963
Pratik Joshi [Fri, 13 Dec 2013 09:53:33 +0000 (15:23 +0530)]
CRM-13961
Dave Greenberg [Fri, 13 Dec 2013 04:29:18 +0000 (20:29 -0800)]
Notice fix in CRM_Participant_BAO_Participant::add
colemanw [Thu, 12 Dec 2013 23:19:05 +0000 (15:19 -0800)]
Merge pull request #2211 from colemanw/master
CRM-10693 - Fix ajaxFormError bug
Coleman Watts [Thu, 12 Dec 2013 23:18:31 +0000 (15:18 -0800)]
CRM-10693 - Fix ajaxFormError bug
colemanw [Thu, 12 Dec 2013 22:36:24 +0000 (14:36 -0800)]
Merge pull request #2209 from colemanw/ajax
CRM-13863 - Allow sorting to happen through ajax
colemanw [Thu, 12 Dec 2013 22:34:24 +0000 (14:34 -0800)]
Merge pull request #2185 from jaapjansma/CRM-13946
fixed CRM-13946 set default database connection to UTF-8
colemanw [Thu, 12 Dec 2013 22:29:44 +0000 (14:29 -0800)]
Merge pull request #2210 from colemanw/4.4
CRM-13969 - Fix error if no tags defined
Coleman Watts [Thu, 12 Dec 2013 22:28:45 +0000 (14:28 -0800)]
CRM-13969 - Fix error if no tags defined
Coleman Watts [Thu, 12 Dec 2013 22:13:58 +0000 (14:13 -0800)]
CRM-13863 - Ajaxify option value admin screens
Coleman Watts [Thu, 12 Dec 2013 22:13:29 +0000 (14:13 -0800)]
CRM-13863 - Allow sorting to happen through ajax
Dave Greenberg [Thu, 12 Dec 2013 19:44:35 +0000 (11:44 -0800)]
Merge pull request #2206 from pratik-joshi/CRM-13907
CRM-13907
Kurund Jalmi [Thu, 12 Dec 2013 18:18:27 +0000 (10:18 -0800)]
Merge pull request #1869 from monishdeb/CRM-13630
CRM-13630 fixes and Premium improvement
colemanw [Thu, 12 Dec 2013 17:28:30 +0000 (09:28 -0800)]
Merge pull request #2204 from eileenmcnaughton/CRM-13711
CRM-13711 fix - Price-set validation break in noAmount and noLabel case ...
dlobo [Thu, 12 Dec 2013 15:19:25 +0000 (07:19 -0800)]
Merge pull request #2196 from lcdservices/CRM-13954
CRM-13954 processGreetings contact object query condition
Kurund Jalmi [Thu, 12 Dec 2013 15:17:52 +0000 (07:17 -0800)]
Merge pull request #2205 from pratik-joshi/CRM-13926
CRM-13926 : fix
Kurund Jalmi [Thu, 12 Dec 2013 15:11:45 +0000 (07:11 -0800)]
Merge pull request #2191 from monishdeb/CRM-13710
CRM-13710 fix - Required prices sets still required even when not active
Pratik Joshi [Thu, 12 Dec 2013 10:13:05 +0000 (15:43 +0530)]
CRM-13907
Jaap Jansma [Thu, 12 Dec 2013 08:55:48 +0000 (09:55 +0100)]
Fixed indentation
Pratik Joshi [Thu, 12 Dec 2013 06:06:29 +0000 (11:36 +0530)]
CRM-13926 : FIX
monishdeb [Fri, 8 Nov 2013 13:18:50 +0000 (18:48 +0530)]
CRM-13711 fix - Price-set validation break in noAmount and noLabel case for non Text type price field
http://issues.civicrm.org/jira/browse/CRM-13711
dlobo [Thu, 12 Dec 2013 03:14:47 +0000 (19:14 -0800)]
Merge pull request #2194 from eileenmcnaughton/CRM-13948
CRM-13948 Hook alter mail params needs more info (id)
dlobo [Thu, 12 Dec 2013 03:13:37 +0000 (19:13 -0800)]
Merge pull request #2198 from jmcclelland/undefined-index-import
CRM-13957 - import - undefined index when mapping fields
dlobo [Thu, 12 Dec 2013 03:12:27 +0000 (19:12 -0800)]
Merge pull request #2201 from jmcclelland/import-empty-custom-boolean
CRM-13960 - import - ensure empty fields don't throw validation errors
Jamie McClelland [Wed, 11 Dec 2013 21:46:43 +0000 (16:46 -0500)]
CRM-13960 - import - ensure empty fields don't throw validation errors
----------------------------------------
* CRM-13960: importing an empty custom data value for bolean type results in validation error
http://issues.civicrm.org/jira/browse/CRM-13960
Jamie McClelland [Wed, 11 Dec 2013 21:40:26 +0000 (16:40 -0500)]
CRM-13957 - import - avoid non-object error
----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
http://issues.civicrm.org/jira/browse/CRM-13957
colemanw [Wed, 11 Dec 2013 21:32:08 +0000 (13:32 -0800)]
Merge pull request #2200 from colemanw/CRM-13497
CRM-13497 - Update CodeGen to handle xml mods
Coleman Watts [Wed, 11 Dec 2013 21:30:37 +0000 (13:30 -0800)]
CRM-13497 - Additional xml updates
Coleman Watts [Wed, 11 Dec 2013 21:25:44 +0000 (13:25 -0800)]
CRM-13497 - Update CodeGen to handle xml mods
colemanw [Wed, 11 Dec 2013 21:27:17 +0000 (13:27 -0800)]
Merge pull request #1765 from lynndanzig/master
CRM-13497 - Add html type to schema xml
Jamie McClelland [Wed, 11 Dec 2013 18:32:44 +0000 (13:32 -0500)]
CRM-13957 - import - undefined index when mapping fields
----------------------------------------
* CRM-13957: 2nd page of Import script reports undefined index
http://issues.civicrm.org/jira/browse/CRM-13957
colemanw [Wed, 11 Dec 2013 18:29:15 +0000 (10:29 -0800)]
Merge pull request #2195 from clandmeter/master
CRM-13859 - set database connection to UTF-8
Kurund Jalmi [Wed, 11 Dec 2013 17:20:00 +0000 (09:20 -0800)]
Merge pull request #2192 from monishdeb/CRM-13756
CRM-13756 fix - Create Profile - do not check 'Standalone Form or Directory' by default
Brian Shaughnessy [Wed, 11 Dec 2013 15:42:04 +0000 (10:42 -0500)]
CRM-13954 processGreetings contact object query condition
Carlo Landmeter [Wed, 11 Dec 2013 11:09:27 +0000 (11:09 +0000)]
CRM-13859 - set database connection to UTF-8
Eileen [Wed, 11 Dec 2013 08:32:12 +0000 (08:32 +0000)]
CRM-13948
Hook alter mail params needs more info (id)
monishdeb [Wed, 11 Dec 2013 07:06:14 +0000 (12:36 +0530)]
CRM-13734 fix - Some basic case activities are not reserved
http://issues.civicrm.org/jira/browse/CRM-13734
monishdeb [Wed, 11 Dec 2013 06:32:22 +0000 (12:02 +0530)]
CRM-13756 fix - Create Profile - do not check 'Standalone Form or Directory' by default
http://issues.civicrm.org/jira/browse/CRM-13756
monishdeb [Wed, 11 Dec 2013 06:00:56 +0000 (11:30 +0530)]
CRM-13710 fix - Required prices sets still required even when not active
http://issues.civicrm.org/jira/browse/CRM-13710
Dave Greenberg [Wed, 11 Dec 2013 01:05:19 +0000 (17:05 -0800)]
Merge pull request #2190 from totten/master-add-these
CRM_Report_Form - Use consistent capitalization (title-case)
Tim Otten [Wed, 11 Dec 2013 00:59:20 +0000 (16:59 -0800)]
CRM_Report_Form - Use consistent capitalization (title-case)
Kurund Jalmi [Wed, 11 Dec 2013 00:14:02 +0000 (16:14 -0800)]
Merge pull request #2187 from tttp/CRM-13949-current-employer
CRM-13949 take into account the current_employer pseudo field in api.contact.get
Kurund Jalmi [Wed, 11 Dec 2013 00:13:31 +0000 (16:13 -0800)]
Merge pull request #2124 from adamwight/cg
CodeGen improvements
dlobo [Tue, 10 Dec 2013 21:45:47 +0000 (13:45 -0800)]
Merge pull request #2188 from kirkatcaat/4.4
Participant BAO can accept role IDs in an array
dlobo [Tue, 10 Dec 2013 21:45:23 +0000 (13:45 -0800)]
Merge pull request #2189 from rocxa/patch-1
Update CheckoutAJAX.php
Alex [Tue, 10 Dec 2013 17:28:46 +0000 (17:28 +0000)]
Update CheckoutAJAX.php
Fix for Fatal Error: Cannot pass parameter 1 by reference line 16 of modules/civicrm/CRM/Event/Cart/Page/CheckoutAJAX.php
Kurund Jalmi [Tue, 10 Dec 2013 16:06:42 +0000 (08:06 -0800)]
Merge pull request #2184 from eileenmcnaughton/typo
fix typo
Kurund Jalmi [Tue, 10 Dec 2013 16:02:49 +0000 (08:02 -0800)]
Merge pull request #2174 from jmcclelland/release-all-survey-respondents
Release all survey respondents
Kirk Jackson [Tue, 10 Dec 2013 12:43:17 +0000 (12:43 +0000)]
Allow Participant roles to be specified as an array
Xavier Dutoit [Tue, 10 Dec 2013 12:38:37 +0000 (13:38 +0100)]
take into account the current_employer pseudo field
Jaap Jansma [Tue, 10 Dec 2013 11:43:48 +0000 (12:43 +0100)]
fixed CRM-13946 set default database connection to UTF-8
Eileen [Tue, 10 Dec 2013 11:06:19 +0000 (00:06 +1300)]
fix typo
colemanw [Tue, 10 Dec 2013 04:45:10 +0000 (20:45 -0800)]
Merge pull request #2183 from colemanw/master
CRM-13933 - Fix chainSelect to work in other contexts
Coleman Watts [Tue, 10 Dec 2013 04:43:59 +0000 (20:43 -0800)]
CRM-13933 - Fix chainSelect to work in other contexts
colemanw [Tue, 10 Dec 2013 04:38:12 +0000 (20:38 -0800)]
Merge pull request #2182 from totten/master-optionvalue-cancelaction
CRM_Admin_Form_OptionValue - Set cancel behavior using cancelAction instead of JS
Tim Otten [Tue, 10 Dec 2013 03:02:53 +0000 (19:02 -0800)]
CRM_Admin_Form_OptionValue - Set cancel behavior using cancelAction instead of JS
Coleman told me to do it.
Coleman Watts [Tue, 10 Dec 2013 02:18:41 +0000 (18:18 -0800)]
Comment fix
Dave Greenberg [Tue, 10 Dec 2013 01:32:20 +0000 (17:32 -0800)]
Merge pull request #2181 from davecivicrm/CRM-13919a
CRM-13919 - Improved form rule to handle add mode differently.
Dave Greenberg [Tue, 10 Dec 2013 01:30:35 +0000 (17:30 -0800)]
CRM-13919 - Improved form rule to handle add mode differently.
----------------------------------------
* CRM-13919: Fatal error when user accidentally uses duplicate transaction # while recording a contrib.
http://issues.civicrm.org/jira/browse/CRM-13919
colemanw [Tue, 10 Dec 2013 01:09:24 +0000 (17:09 -0800)]
Merge pull request #2180 from colemanw/master
CRM-13933 Remove simple search
Dave Greenberg [Tue, 10 Dec 2013 01:07:23 +0000 (17:07 -0800)]
Merge pull request #2036 from agh1/no-amounts-member-priceset
CRM-13800 Prevent people from enabling contribution amounts when there's a membership price set
Kurund Jalmi [Tue, 10 Dec 2013 01:02:14 +0000 (17:02 -0800)]
Merge pull request #2179 from eileenmcnaughton/html-fixup
html error - checked declared twice
kurund [Tue, 10 Dec 2013 01:00:57 +0000 (17:00 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-12-09-17-00-10
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
Coleman Watts [Tue, 10 Dec 2013 00:59:18 +0000 (16:59 -0800)]
CRM-13933 Remove simple search
Eileen [Mon, 9 Dec 2013 23:40:47 +0000 (12:40 +1300)]
html error - checked declared twice
colemanw [Mon, 9 Dec 2013 05:46:20 +0000 (21:46 -0800)]
Merge pull request #2178 from colemanw/master
CRM-13935 - jQuery.files.tpl - remove reference to mousewheel
Coleman Watts [Mon, 9 Dec 2013 05:44:21 +0000 (21:44 -0800)]
CRM-13935 - jQuery.files.tpl - remove reference to mousewheel
colemanw [Mon, 9 Dec 2013 02:37:25 +0000 (18:37 -0800)]
Merge pull request #2177 from colemanw/master
CRM-13929 - jQuery.files.tpl - update reference to timeentry
Coleman Watts [Mon, 9 Dec 2013 02:24:57 +0000 (18:24 -0800)]
CRM-13929 - jQuery.files.tpl - update reference to timeentry
colemanw [Mon, 9 Dec 2013 02:14:43 +0000 (18:14 -0800)]
Merge pull request #2176 from colemanw/master
CRM-13933 - Refactor out jquery.chainedSelects
Coleman Watts [Sun, 8 Dec 2013 06:45:57 +0000 (22:45 -0800)]
CRM-13933 - Refactor out jquery.chainedSelects
colemanw [Sun, 8 Dec 2013 06:33:26 +0000 (22:33 -0800)]
Merge pull request #2175 from colemanw/4.4
UFGroup.php - Code cleanup
Coleman Watts [Sun, 8 Dec 2013 06:32:03 +0000 (22:32 -0800)]
UFGroup.php - Code cleanup
Jamie McClelland [Fri, 6 Dec 2013 21:24:48 +0000 (16:24 -0500)]
CRM-13922 - Campaign - avoid undefined index error when releasing respondents
----------------------------------------
* CRM-13922: release respondent search doesn't allow you to find contacts reserved to a different interviewer
http://issues.civicrm.org/jira/browse/CRM-13922
Jamie McClelland [Fri, 6 Dec 2013 21:04:01 +0000 (16:04 -0500)]
CRM-13922 - Campaign - release respondents assigned to any interviewer
----------------------------------------
* CRM-13922: release respondent search doesn't allow you to find contacts reserved to a different interviewer
http://issues.civicrm.org/jira/browse/CRM-13922
Eileen [Fri, 6 Dec 2013 00:32:00 +0000 (13:32 +1300)]
Add tests for report_template getrows & getstatistics
Eileen [Fri, 6 Dec 2013 00:10:16 +0000 (13:10 +1300)]
enotice fix on report to pass tests
Eileen [Thu, 5 Dec 2013 04:36:41 +0000 (17:36 +1300)]
Add ReportTemplate.getrows api, changes to form class are adding getters & setters & also adding a function
(open to renaming suggestions) for reports that want to override beginProcess to set some variables once ->_params has been run - since beginPostProcess is very 'formy'
don't set qfkey if not in controller mode
rename beginPostProcessNoController to beginPostProcessCommon which better reflects preProcessCommon, fix e-notices exposed by test
add statistics api
CiviCRM [Thu, 5 Dec 2013 21:41:43 +0000 (13:41 -0800)]
Update version to 4.4.4
Coleman Watts [Thu, 5 Dec 2013 18:55:45 +0000 (10:55 -0800)]
Minor tpl message fix
Kurund Jalmi [Thu, 5 Dec 2013 18:20:18 +0000 (10:20 -0800)]
Merge pull request #2157 from kurund/CRM-13896
remove redundant usercontext, which messes activity form, CRM-13896
colemanw [Thu, 5 Dec 2013 18:13:08 +0000 (10:13 -0800)]
Merge pull request #2169 from davecivicrm/CRM-13890testFix
CRM-13890 - Test fixes (unit tests were coded against the buggy behavior...
Dave Greenberg [Thu, 5 Dec 2013 18:11:17 +0000 (10:11 -0800)]
CRM-13890 - Test fixes (unit tests were coded against the buggy behavior where real status was not included in output).
----------------------------------------
* CRM-13890: Participant status is not being passed to message template for online event registration
http://issues.civicrm.org/jira/browse/CRM-13890
Kurund Jalmi [Thu, 5 Dec 2013 17:56:10 +0000 (09:56 -0800)]
Merge pull request #2168 from monishdeb/CRM-13833
CRM-13833, Soft Credit Type implementation for Contribution
projects / civicrm-core.git / log