Andrew Hunt [Tue, 11 Jun 2013 22:27:03 +0000 (18:27 -0400)]
add contrib fields to event participant report
Coleman Watts [Tue, 11 Jun 2013 21:50:47 +0000 (14:50 -0700)]
Develop 'context' param in BAO and api CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
deepak-srivastava [Tue, 11 Jun 2013 12:41:23 +0000 (05:41 -0700)]
Merge pull request #992 from deepak-srivastava/hr
CRM-12288
Deepak Srivastava [Tue, 11 Jun 2013 12:37:16 +0000 (18:07 +0530)]
CRM-12288
----------------------------------------
* CRM-12288: Improvements to SMS interactions when using mass SMS and Clickatell
http://issues.civicrm.org/jira/browse/CRM-12288
colemanw [Tue, 11 Jun 2013 01:00:55 +0000 (18:00 -0700)]
Merge pull request #814 from eileenmcnaughton/CRM-12642
CRM-12642 add time to membership receive_date fields, move date_time han...
colemanw [Tue, 11 Jun 2013 01:00:28 +0000 (18:00 -0700)]
Merge pull request #990 from eileenmcnaughton/CRM-12715
Crm 12715 fix custom date rendering for is_multiple custom groups
eileen [Thu, 30 May 2013 05:19:59 +0000 (17:19 +1200)]
CRM-12715 refactor CRM_Core_BAO_CustomGroup::getTree to generate acceptable queries for multi-record sets
eileen [Thu, 30 May 2013 05:06:56 +0000 (17:06 +1200)]
CRM-12715 e-notice observed on merge page
Coleman Watts [Mon, 10 Jun 2013 23:42:43 +0000 (16:42 -0700)]
Fix custom group test
Coleman Watts [Mon, 10 Jun 2013 23:06:23 +0000 (16:06 -0700)]
Fix mistake in GenCode
Coleman Watts [Mon, 10 Jun 2013 22:04:00 +0000 (15:04 -0700)]
Fix billing_mode field handling CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
colemanw [Mon, 10 Jun 2013 21:43:11 +0000 (14:43 -0700)]
Merge pull request #988 from eileenmcnaughton/apitests
use apisuccess & failure to clarify errors
eileen [Mon, 10 Jun 2013 21:18:11 +0000 (09:18 +1200)]
use apisuccess & failure to clarify errors
Coleman Watts [Mon, 10 Jun 2013 19:32:21 +0000 (12:32 -0700)]
Fix cache flushing
Kurund Jalmi [Mon, 10 Jun 2013 11:44:15 +0000 (04:44 -0700)]
Merge pull request #983 from eileenmcnaughton/apitests
Apitests tidy ups
eileen [Mon, 10 Jun 2013 10:57:58 +0000 (22:57 +1200)]
add test that pinpoints caching problem
Kurund Jalmi [Mon, 10 Jun 2013 08:57:46 +0000 (01:57 -0700)]
Merge pull request #980 from colemanw/soap
Clean up soap CRM-12343
eileen [Mon, 10 Jun 2013 08:25:38 +0000 (20:25 +1200)]
test tidy up, use apiSuccess & fail assertions, add assertion to highlight cause of failure
eileen [Mon, 10 Jun 2013 07:59:43 +0000 (19:59 +1200)]
tidy up paymentProcessor test to use apiSuccess & failure assertions. remove failure test which is in syntaxconformance
Kurund Jalmi [Mon, 10 Jun 2013 07:09:15 +0000 (00:09 -0700)]
Merge pull request #981 from colemanw/creditCard
Spiff up credit card icons CRM-12515
Kurund Jalmi [Mon, 10 Jun 2013 07:08:09 +0000 (00:08 -0700)]
Merge pull request #982 from eileenmcnaughton/apitests
cleanup activity tests, examples, api
eileen [Mon, 10 Jun 2013 05:55:40 +0000 (17:55 +1200)]
cleanup activity tests, examples, api
fix includes removing 'activity_status_id' from _spec & adding testing that api alias mechanism works without that, removing pointless tests, using assertAPIFailure & assertAPISuccess and removing trailing spaces from generated tests (now the template no longer has them, API test class passes after this although it does not address prob when class is run as part of suite
Coleman Watts [Sat, 8 Jun 2013 20:23:07 +0000 (13:23 -0700)]
Spiff up credit card icons CRM-12515
----------------------------------------
* CRM-12515: Visual selection of "credit card type" on contribute/event forms
http://issues.civicrm.org/jira/browse/CRM-12515
Coleman Watts [Sat, 8 Jun 2013 06:37:43 +0000 (23:37 -0700)]
Clean up soap CRM-12343
----------------------------------------
* CRM-12343: Remove Soap code
http://issues.civicrm.org/jira/browse/CRM-12343
Coleman Watts [Sat, 8 Jun 2013 03:02:50 +0000 (20:02 -0700)]
Fix custom option tests
dlobo [Sat, 8 Jun 2013 00:09:56 +0000 (17:09 -0700)]
Merge pull request #974 from GiantRobot/CRM-12775
CRM-12775. Don't fail for theme stuff when not themeing.
Coleman Watts [Fri, 7 Jun 2013 23:18:11 +0000 (16:18 -0700)]
Fix caching problem with tests
Coleman Watts [Fri, 7 Jun 2013 21:47:34 +0000 (14:47 -0700)]
More fixes for API option matching and validation CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Fri, 7 Jun 2013 20:58:16 +0000 (13:58 -0700)]
Fix API option matching and validation CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Fri, 7 Jun 2013 18:05:54 +0000 (11:05 -0700)]
Update API option matching and validation CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Yashodha Chaku [Fri, 7 Jun 2013 14:00:46 +0000 (07:00 -0700)]
Merge pull request #911 from agh1/membership-dash-counts-new
Membership dash counts fixed but no good search
Kurund Jalmi [Fri, 7 Jun 2013 04:51:41 +0000 (21:51 -0700)]
Merge pull request #975 from ravishnair/test-fix
-- CRM test fix
Ravish Nair [Fri, 7 Jun 2013 04:42:57 +0000 (10:12 +0530)]
-- CRM test fix
Chris Burgess [Fri, 7 Jun 2013 02:14:54 +0000 (14:14 +1200)]
Issue CRM-12775. If we are in CLI, do not fail for lack of ability to insert to HTML HEAD.
dlobo [Thu, 6 Jun 2013 21:59:30 +0000 (14:59 -0700)]
Merge pull request #973 from eileenmcnaughton/master
CRM-12773 api - handle null value for a custom field gracefully
dlobo [Thu, 6 Jun 2013 21:58:42 +0000 (14:58 -0700)]
Merge pull request #966 from eileenmcnaughton/enotice
make ufgroup api tests & api enotice complian
eileen [Thu, 6 Jun 2013 20:55:20 +0000 (08:55 +1200)]
CRM-12773 handle null custom fields without fatal
deepak-srivastava [Thu, 6 Jun 2013 15:07:36 +0000 (08:07 -0700)]
Merge pull request #972 from deepak-srivastava/hr
CRM-12490, section header fixes
Deepak Srivastava [Thu, 6 Jun 2013 13:42:19 +0000 (19:12 +0530)]
CRM-12490, section header fixes
----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
http://issues.civicrm.org/jira/browse/CRM-12490
pratik-joshi [Thu, 6 Jun 2013 13:31:20 +0000 (06:31 -0700)]
Merge pull request #961 from dpradeep/CRM-10983-commit
-- fixed for CRM-10983, prevent the generation of duplicate custom data.
Kurund Jalmi [Thu, 6 Jun 2013 11:07:34 +0000 (04:07 -0700)]
Merge pull request #971 from eileenmcnaughton/master
fix another test regression
eileen [Thu, 6 Jun 2013 10:11:54 +0000 (22:11 +1200)]
default to is_active on custom field api
eileen [Thu, 6 Jun 2013 10:10:58 +0000 (22:10 +1200)]
fix test regression related to name clash not tested action
Kurund Jalmi [Thu, 6 Jun 2013 09:14:47 +0000 (02:14 -0700)]
Merge pull request #970 from eileenmcnaughton/apitweaks
custom field api should default to 'is_active' = 1
eileen [Thu, 6 Jun 2013 08:36:15 +0000 (20:36 +1200)]
custom field api should default to 'is_active' = 1
Kurund Jalmi [Thu, 6 Jun 2013 07:07:49 +0000 (00:07 -0700)]
Merge pull request #969 from eileenmcnaughton/master
CRM-12768 - custom api tweak on field spec
eileen [Thu, 6 Jun 2013 06:27:31 +0000 (18:27 +1200)]
CRM-12768 custom_file api -default type to 'String' for clarity & enotice
Kurund Jalmi [Thu, 6 Jun 2013 05:50:09 +0000 (22:50 -0700)]
Merge pull request #968 from eileenmcnaughton/master
CRM-12768 caused locblock test to fail
eileen [Thu, 6 Jun 2013 05:29:12 +0000 (17:29 +1200)]
locblock test fix broken as it was 'taking advantage of' inconsistency in return param
Yashodha Chaku [Thu, 6 Jun 2013 05:05:00 +0000 (22:05 -0700)]
Merge pull request #967 from ravishnair/CRM-12682
-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id
Ravish Nair [Thu, 6 Jun 2013 04:43:59 +0000 (10:13 +0530)]
-- CRM-12697 cleaned up the usage of removed civicrm_activity column source_contact_id
Yashodha Chaku [Thu, 6 Jun 2013 04:20:10 +0000 (21:20 -0700)]
Merge pull request #958 from pratik-joshi/CRM-10164
CRM-10164
eileen [Thu, 6 Jun 2013 04:09:34 +0000 (16:09 +1200)]
make ufgroup api tests & api enotice complian
Kurund Jalmi [Thu, 6 Jun 2013 03:51:36 +0000 (20:51 -0700)]
Merge pull request #965 from eileenmcnaughton/CRM-12768
Crm 12768 fix custom field option group handling
eileen [Thu, 6 Jun 2013 03:35:42 +0000 (15:35 +1200)]
update examples
eileen [Thu, 6 Jun 2013 03:35:24 +0000 (15:35 +1200)]
CRM-12768 fix side-problem where handling of 'return' param inconsistent
eileen [Thu, 6 Jun 2013 03:34:00 +0000 (15:34 +1200)]
CRM-12768 fix & document api option group creation on custom_field.create'
Kurund Jalmi [Thu, 6 Jun 2013 03:32:57 +0000 (20:32 -0700)]
Merge pull request #959 from yashodha/4.4
CRM-12689
eileen [Thu, 6 Jun 2013 02:55:11 +0000 (14:55 +1200)]
clean trailing spaces from tests folder in prep
Pratik Joshi [Wed, 5 Jun 2013 14:09:24 +0000 (19:39 +0530)]
CRM-10164 : more clean up
deepak-srivastava [Wed, 5 Jun 2013 13:08:11 +0000 (06:08 -0700)]
Merge pull request #962 from deepak-srivastava/hr
CRM-12490, towards issues raised by dgg
Deepak Srivastava [Wed, 5 Jun 2013 12:58:30 +0000 (18:28 +0530)]
CRM-12490, towards issues raised by dgg
----------------------------------------
* CRM-12490: Add Soft Credit data to the Contribution Detail Report
http://issues.civicrm.org/jira/browse/CRM-12490
yashodha [Wed, 5 Jun 2013 12:46:18 +0000 (18:16 +0530)]
CRM-12689
dpradeep [Wed, 5 Jun 2013 12:32:15 +0000 (18:02 +0530)]
-- fixed for CRM-10983, prevent the generation of duplicate custom data.
yashodha [Wed, 5 Jun 2013 12:26:48 +0000 (17:56 +0530)]
CRM-12689
Pratik Joshi [Wed, 5 Jun 2013 10:15:45 +0000 (15:45 +0530)]
CRM-10164
Kurund Jalmi [Wed, 5 Jun 2013 06:10:24 +0000 (11:40 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23
Conflicts:
CRM/Case/Form/Activity.php
CRM/Contact/Form/Search/Custom/ContribSYBNT.php
CRM/Contact/Form/Search/Custom/ContributionAggregate.php
CRM/Contact/Form/Search/Custom/EventAggregate.php
CRM/Contact/Form/Search/Custom/PriceSet.php
CRM/Contact/Form/Search/Custom/TagContributions.php
CRM/Core/BAO/ConfigSetting.php
CRM/Financial/BAO/FinancialType.php
CRM/Report/Form.php
CRM/Report/Form/Campaign/SurveyDetails.php
CRM/Report/Form/Contribute/Summary.php
sql/civicrm_generated.mysql
templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
tools/drupal/modules/civicrm_giftaid/GiftAid/Report/Form/Contribute/GiftAid.php
Tim Otten [Tue, 4 Jun 2013 23:32:59 +0000 (16:32 -0700)]
Merge pull request #957 from colemanw/getQuick
Escape sql in contact.getquick api
Coleman Watts [Tue, 4 Jun 2013 22:34:36 +0000 (15:34 -0700)]
Move all escaping from Ajax callback to api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 19:42:35 +0000 (12:42 -0700)]
Remove escaping from ajax callback, it is now handled by api CRM-12765
Coleman Watts [Tue, 4 Jun 2013 18:13:43 +0000 (11:13 -0700)]
Escape sql in contact.getquick api CRM-12765
Kurund Jalmi [Tue, 4 Jun 2013 16:40:28 +0000 (09:40 -0700)]
Merge pull request #956 from kurund/fix-gendata
fixed incorrect report instance id's in sample dashlets
Kurund Jalmi [Tue, 4 Jun 2013 16:16:00 +0000 (09:16 -0700)]
Merge pull request #955 from totten/master-mktest-dbload
mk-drupal-test-site - Pass through DBLOAD option
deepak-srivastava [Tue, 4 Jun 2013 15:44:30 +0000 (08:44 -0700)]
Merge pull request #954 from deepak-srivastava/4.3
php 5.4 notice fixes
Tim Otten [Tue, 4 Jun 2013 15:40:21 +0000 (11:40 -0400)]
mk-drupal-test-site - Pass through DBLOAD option
Kurund Jalmi [Tue, 4 Jun 2013 15:39:13 +0000 (21:09 +0530)]
fixed incorrect report instance id's in sample dashlets
Deepak Srivastava [Tue, 4 Jun 2013 15:39:10 +0000 (21:09 +0530)]
php 5.4 notice fixes
Kurund Jalmi [Tue, 4 Jun 2013 15:03:41 +0000 (08:03 -0700)]
Merge pull request #953 from pratik-joshi/event-income-summary-report-charts-no-display
fix for bar chart and pie chart not displaying for event income summary ...
Pratik Joshi [Tue, 4 Jun 2013 14:56:19 +0000 (20:26 +0530)]
fix for bar chart and pie chart not displaying for event income summary report
Kurund Jalmi [Tue, 4 Jun 2013 13:10:29 +0000 (06:10 -0700)]
Merge pull request #951 from ravishnair/CRM-12741webtest
-- CRM-12741 webtest
deepak-srivastava [Tue, 4 Jun 2013 12:52:19 +0000 (05:52 -0700)]
Merge pull request #952 from deepak-srivastava/hr
CRM-12623, improvements w.r.t custom table joins and notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 12:49:57 +0000 (18:19 +0530)]
CRM-12623, improvements w.r.t custom table joins and notice fixes
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
Ravish Nair [Tue, 4 Jun 2013 07:22:37 +0000 (12:52 +0530)]
-- CRM-12741 webtest
deepak-srivastava [Tue, 4 Jun 2013 07:17:10 +0000 (00:17 -0700)]
Merge pull request #950 from deepak-srivastava/hr
php 5.4, notice fixes
Deepak Srivastava [Tue, 4 Jun 2013 07:08:52 +0000 (12:38 +0530)]
notice fixes
Tim Otten [Tue, 4 Jun 2013 02:21:38 +0000 (19:21 -0700)]
Merge pull request #949 from totten/gencode-version
GenCode:
Tim Otten [Tue, 4 Jun 2013 01:42:50 +0000 (01:42 +0000)]
GenCode:
* Remove shell_exec dependency.
* In the web footer, report the same version number used everywhere else
Coleman Watts [Mon, 3 Jun 2013 23:30:43 +0000 (16:30 -0700)]
Remove project task from tests CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Mon, 3 Jun 2013 23:08:10 +0000 (16:08 -0700)]
Fix creating test objects CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Mon, 3 Jun 2013 22:40:29 +0000 (15:40 -0700)]
Fix and extend custom field options test CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
dlobo [Mon, 3 Jun 2013 20:48:58 +0000 (13:48 -0700)]
Merge pull request #947 from dlobo/FormattingFixes
misc fixes while testing ofc and wkhtml
Donald A. Lobo [Mon, 3 Jun 2013 20:47:06 +0000 (13:47 -0700)]
misc fixes while testing ofc and wkhtml
colemanw [Mon, 3 Jun 2013 19:38:34 +0000 (12:38 -0700)]
Merge pull request #946 from dlobo/CRM-12750
CRM-12755
dlobo [Mon, 3 Jun 2013 18:02:32 +0000 (11:02 -0700)]
Merge pull request #944 from pratik-joshi/CRM-12747
CRM-12747 : component access permission defining way for end developer
dlobo [Mon, 3 Jun 2013 17:57:26 +0000 (10:57 -0700)]
Merge pull request #945 from totten/4.3-indent
Fix indentation
Donald A. Lobo [Mon, 3 Jun 2013 16:10:42 +0000 (09:10 -0700)]
CRM-12750
----------------------------------------
* CRM-12750: upgrade smarty to 2.6.27
http://issues.civicrm.org/jira/browse/CRM-12750
Tim Otten [Mon, 3 Jun 2013 15:20:21 +0000 (11:20 -0400)]
Fix indentation
Pratik Joshi [Mon, 3 Jun 2013 14:54:19 +0000 (20:24 +0530)]
CRM-12747 : component access permission defining way for end developer
Kurund Jalmi [Mon, 3 Jun 2013 14:28:00 +0000 (07:28 -0700)]
Merge pull request #943 from kurund/CRM-12752
CRM-12752, check ids instead of label for showing notification checkbox below participant status
Kurund Jalmi [Mon, 3 Jun 2013 13:05:19 +0000 (18:35 +0530)]
CRM-12752, check ids instead of label for showing notification checkbox, also code cleanup
projects / civicrm-core.git / log