Commits · 2fd5e617f32386f1dd0a81a9e21cf6553f1f5a3e · justinfreeman (Agileware) / Core

Jun 05, 2013

CRM-10164 : more clean up · 2fd5e617
pratik.joshi authored 11 years ago

2fd5e617
CRM-10164 · 96f7c53e
pratik.joshi authored 11 years ago

96f7c53e

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-06-05-06-52-23 · f8c36033

Kurund Jalmi authored 11 years ago

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

f8c36033

Jun 04, 2013
- Merge pull request #957 from colemanw/getQuick · 39975bea
  Tim Otten authored 11 years ago
  
  Escape sql in contact.getquick api
  39975bea
- Move all escaping from Ajax callback to api CRM-12765 · 133da98d
  colemanw authored 11 years ago
  
  133da98d
- Remove escaping from ajax callback, it is now handled by api CRM-12765 · dd64a29c
  colemanw authored 11 years ago
  
  dd64a29c
- Escape sql in contact.getquick api CRM-12765 · 1aba4d9a
  colemanw authored 11 years ago
  
  1aba4d9a
- Merge pull request #956 from kurund/fix-gendata · 40252892
  Kurund Jalmi authored 11 years ago
  
  fixed incorrect report instance id's in sample dashlets
  40252892
- Merge pull request #955 from totten/master-mktest-dbload · 24ea8a2b
  Kurund Jalmi authored 11 years ago
  
  mk-drupal-test-site - Pass through DBLOAD option
  24ea8a2b
- Merge pull request #954 from deepak-srivastava/4.3 · 58e52c41
  deepak-srivastava authored 11 years ago
  
  php 5.4 notice fixes
  58e52c41
- mk-drupal-test-site - Pass through DBLOAD option · 549e9267
  totten authored 11 years ago
  
  549e9267
- fixed incorrect report instance id's in sample dashlets · 623d79cb
  Kurund Jalmi authored 11 years ago
  
  623d79cb
- php 5.4 notice fixes · dbab3426
  Deepak Srivastava authored 11 years ago
  
  dbab3426
- Merge pull request #953 from pratik-joshi/event-income-summary-report-charts-no-display · 1ca80049
  Kurund Jalmi authored 11 years ago
  
  fix for bar chart and pie chart not displaying for event income summary ...
  1ca80049
- fix for bar chart and pie chart not displaying for event income summary report · 2437f726
  pratik.joshi authored 11 years ago
  
  2437f726
- Merge pull request #951 from ravishnair/CRM-12741webtest · 2c234fff
  Kurund Jalmi authored 11 years ago
  
  -- CRM-12741 webtest
  2c234fff
- Merge pull request #952 from deepak-srivastava/hr · e305ef05
  deepak-srivastava authored 11 years ago
  
  CRM-12623, improvements w.r.t custom table joins and notice fixes
  e305ef05
- CRM-12623, improvements w.r.t custom table joins and notice fixes · 7a8b61ab
  Deepak Srivastava authored 11 years ago
  
  ---------------------------------------- * CRM-12623: Create CiviHR Report Template http://issues.civicrm.org/jira/browse/CRM-12623
  7a8b61ab
- -- CRM-12741 webtest · 9669d0f3
  Ravish Nair authored 11 years ago
  
  9669d0f3
- Merge pull request #950 from deepak-srivastava/hr · 76bc3033
  deepak-srivastava authored 11 years ago
  
  php 5.4, notice fixes
  76bc3033
- notice fixes · 7f1ec901
  Deepak Srivastava authored 11 years ago
  
  7f1ec901
- Merge pull request #949 from totten/gencode-version · f5c90d14
  Tim Otten authored 11 years ago
  
  GenCode:
  f5c90d14
- GenCode: · f5037c30
  Tim Otten authored 11 years ago
  
  * Remove shell_exec dependency. * In the web footer, report the same version number used everywhere else
  f5037c30
Jun 03, 2013
- Remove project task from tests CRM-12464 · e97466a5
  colemanw authored 11 years ago
  
  ---------------------------------------- * CRM-12464: Add PseudoConstants to Schema Metadata http://issues.civicrm.org/jira/browse/CRM-12464
  e97466a5
- Fix creating test objects CRM-12464 · ab9aa379
  colemanw authored 11 years ago
  
  ---------------------------------------- * CRM-12464: Add PseudoConstants to Schema Metadata http://issues.civicrm.org/jira/browse/CRM-12464
  ab9aa379
- Fix and extend custom field options test CRM-12464 · deceed83
  colemanw authored 11 years ago
  
  ---------------------------------------- * CRM-12464: Add PseudoConstants to Schema Metadata http://issues.civicrm.org/jira/browse/CRM-12464
  deceed83
- Merge pull request #947 from dlobo/FormattingFixes · 4b2a0c67
  lobo authored 11 years ago
  
  misc fixes while testing ofc and wkhtml
  4b2a0c67
- misc fixes while testing ofc and wkhtml · 83abdecd
  lobo authored 11 years ago
  
  83abdecd
- Merge pull request #946 from dlobo/CRM-12750 · 032f804b
  colemanw authored 11 years ago
  
  CRM-12755
  032f804b
- Merge pull request #944 from pratik-joshi/CRM-12747 · 5f132338
  lobo authored 11 years ago
  
  CRM-12747 : component access permission defining way for end developer
  5f132338
- Merge pull request #945 from totten/4.3-indent · 17c16300
  lobo authored 11 years ago
  
  Fix indentation
  17c16300
- CRM-12750 · 31195a09
  lobo authored 11 years ago
  
  ---------------------------------------- * CRM-12750: upgrade smarty to 2.6.27 http://issues.civicrm.org/jira/browse/CRM-12750
  31195a09
- Fix indentation · 430ae6dd
  totten authored 11 years ago
  
  430ae6dd
- CRM-12747 : component access permission defining way for end developer · 4e54c348
  pratik.joshi authored 11 years ago
  
  4e54c348
- Merge pull request #943 from kurund/CRM-12752 · 50e36e92
  Kurund Jalmi authored 11 years ago
  
  CRM-12752, check ids instead of label for showing notification checkbox below participant status
  50e36e92
- CRM-12752, check ids instead of label for showing notification checkbox, also code cleanup · 453ed6d1
  Kurund Jalmi authored 11 years ago
  
  453ed6d1
- remove obsolete code · f55053ea
  Kurund Jalmi authored 11 years ago
  
  f55053ea
- Merge pull request #942 from deepak-srivastava/hr · a725aa6d
  deepak-srivastava authored 11 years ago
  
  CRM-12622, filters and more valid assertions
  a725aa6d
- CRM-12622, filters and more valid assertions · ec24e302
  Deepak Srivastava authored 11 years ago
  
  ---------------------------------------- * CRM-12622: Create example data files for CiviHR Report Template http://issues.civicrm.org/jira/browse/CRM-12622
  ec24e302
- Merge pull request #941 from kurund/CRM-12711 · 3b27de5e
  Kurund Jalmi authored 11 years ago
  
  removing code that popsup dialog on load in j2,j3 and wp
  3b27de5e