Commits · c8aa607b8439fc6b80737eee97fceacf69760c91 · Development / Core

01 Aug, 2013 20 commits
- CRM-12108 refactore PayPalProIPN.php so that it can be called outside of a webtest & can be tested · c8aa607b
  eileen authored Jul 30, 2013
  
  c8aa607b
- CRM-12108 tests on refactored PayPalProIPN, if CRM-12972 is fixed try catch... · a86d27fc
  eileen authored Jul 30, 2013
```
CRM-12108 tests on refactored PayPalProIPN, if CRM-12972 is fixed try catch can be removed & can update to check mail is sent
```
  a86d27fc
- CRM-12108 noticed api.contribution_recur.start_date needs to be set or have a... · 28658972
  eileen authored Jul 30, 2013
```
CRM-12108 noticed api.contribution_recur.start_date needs to be set or have a default - am defaulting to now
```
  28658972
- CRM-12108 noticed api.contribution_recur.frequency_interval needs to be mandatory · 35ed6e9c
  eileen authored Jul 30, 2013
  
  35ed6e9c
- CRM-12108 noticed type on 'skipDefault' was wrong · 0900b21e
  eileen authored Jul 30, 2013
  
  0900b21e
- CRM-12108 minor improvement - simplify ipn.php by putting logic in the · d5346e1b
  Eileen authored Jul 28, 2013
```
relevant classes (no logic behind the split)
```
  d5346e1b
- Merge pull request #1300 from eileenmcnaughton/CRM-13142 · 763b8d6f
  colemanw authored Aug 01, 2013
```
CRM-13142 limited tidy up to extract js from tpl using new standards
```
  763b8d6f
- Merge pull request #1290 from pratik-joshi/CRM_12639-fix · e7830dbe
  Kurund Jalmi authored Aug 01, 2013
```
Crm 12639 fix 
```
  e7830dbe
- Merge pull request #1284 from yashodha/4.4.CRM-13092 · 1ae083f0
  Kurund Jalmi authored Aug 01, 2013
```
CRM-13092
```
  1ae083f0
- Merge pull request #1303 from yashodha/CRM-13147 · b6a3b8a5
  Kurund Jalmi authored Aug 01, 2013
```
fixed query for CRM-13147
```
  b6a3b8a5
- Merge pull request #1304 from aadityawalawalkar/CRM-12439 · 8e08ba72
  pratik.joshi authored Aug 01, 2013
```
Crm 12439
```
  8e08ba72
- CRM-12439 - indentation changes · d8bffe29
  Aaditya Walawalkar authored Aug 01, 2013
```
----------------------------------------
* CRM-12439: Add description field for Profiles and expose the created_id field
  http://issues.civicrm.org/jira/browse/CRM-12439
* CRM-12439-org:
  http://issues.civicrm.org/jira/browse/CRM-12439-org
* CRM-12995-1:
  http://issues.civicrm.org/jira/browse/CRM-12995-1
* CRM-12995-2:
  http://issues.civicrm.org/jira/browse/CRM-12995-2
```
  d8bffe29
- CRM-12439 fix with webtest - Added description textarea and exposed created_id... · bcbde5ca
  Aaditya Walawalkar authored Aug 01, 2013
```
CRM-12439 fix with webtest - Added description textarea and exposed created_id and description fields in profile listing page

----------------------------------------
* CRM-12439: Add description field for Profiles and expose the created_id field
  http://issues.civicrm.org/jira/browse/CRM-12439
* CRM-12439-org:
  http://issues.civicrm.org/jira/browse/CRM-12439-org
* CRM-12995-1:
  http://issues.civicrm.org/jira/browse/CRM-12995-1
* CRM-12995-2:
  http://issues.civicrm.org/jira/browse/CRM-12995-2
```
  bcbde5ca
- fixed query for CRM-13147 · e96f025a
  yashodha authored Aug 01, 2013
  
  e96f025a
- Merge pull request #1301 from monishdeb/CRM-13029 · a3b1472d
  Kurund Jalmi authored Aug 01, 2013
```
CRM-13029 fix
```
  a3b1472d
- CRM-13029 fix · 85bdc94e
  monishdeb authored Aug 01, 2013
```
----------------------------------------
* CRM-13029: search builder: unable to search activity details
  http://issues.civicrm.org/jira/browse/CRM-13029
```
  85bdc94e
- CRM-13142 if only one membership organization exists then prefill it (unless... · 53cfc93c
  eileen authored Aug 01, 2013
```
CRM-13142 if only one membership organization exists then prefill it (unless membership field is optional), add -select- to types as the default
```
  53cfc93c
- Merge pull request #1298 from davecivicrm/CRM-13141 · 03578845
  Tim Otten authored Jul 31, 2013
```
CRM-13141 restructured code to handle empty 200 result from public exten...
```
  03578845
- Corrected issue in patch noted by Tim on PR. · 70619090
  Dave Greenberg authored Jul 31, 2013
  
  70619090
- Merge pull request #1299 from totten/master-rest-empty-json · 1f3ceb1f
  Tim Otten authored Jul 31, 2013
```
CRM-13139 - CRM_Utils_REST - Accept empty JSON objects ("{}")
```
  1f3ceb1f
31 Jul, 2013 20 commits

CRM-13139 - CRM_Utils_REST - Accept empty JSON objects ("{}") · 4e4acd95

totten authored Jul 31, 2013

Note: When the "json" parameter includes malformed JSON (eg "{") or an empty
string (""), the behavior is unchanged. This only affects a well-formed empty-obect.

----------------------------------------
* CRM-13139: REST API: json_decode() fails for empty input
  http://issues.civicrm.org/jira/browse/CRM-13139

4e4acd95

CRM-13142 limited tidy up to extract js from tpl using new standards (I have... · aefb0b79

eileen authored Aug 01, 2013

CRM-13142 limited tidy up to extract js from tpl using new standards (I have completely tidied up & jslinted it  into a new file but discarded after a tidy up was merged in from 4.3

aefb0b79

CRM-13141 restructured code to handle empty 200 result from public extensions directory. · 7aa1b99d

Dave Greenberg authored Jul 31, 2013

----------------------------------------
* CRM-13141: Manage Extensions throws an erroneous fatal error - Failed Fetching List - when there are no extensions available for a particular install version
  http://issues.civicrm.org/jira/browse/CRM-13141

7aa1b99d

Merge pull request #1293 from kurund/CRM-13130 · cf65f3b7
Dave Greenberg authored Jul 31, 2013
```
CRM-13130, fixed notices and using Avery 5395 as default for layout form...
```
cf65f3b7
Merge pull request #1296 from dlobo/CRM-13090 · 39346275
lobo authored Jul 31, 2013
```
fix patch for CRM-13090
```
39346275

fix patch for CRM-13090 · 968c2c5f

lobo authored Jul 31, 2013

----------------------------------------
* CRM-13090: New Petition/Survey form validation - enforce unique constraint on ActivityType-Campaign-Title
  http://issues.civicrm.org/jira/browse/CRM-13090

968c2c5f

Merge pull request #1295 from totten/master-isprimary-tables · f8081da7
Tim Otten authored Jul 31, 2013
```
CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions
```
f8081da7

CRM-13075 - CRM_Core_BAO_Block - Allow handlePrimary() with entities from extensions · a6c6fe56

totten authored Jul 31, 2013

----------------------------------------
* CRM-13075: Mark is_primary for HRJob records
  http://issues.civicrm.org/jira/browse/CRM-13075

a6c6fe56

Merge pull request #1217 from samuelsov/CRM-10606 · 79687983
Dave Greenberg authored Jul 31, 2013
```
CRM-10606 Remove specific code for upgrade from 2.0 to 2.1
```
79687983

CRM-13130, fixed notices and using Avery 5395 as default for layout format · 8e9fd9e4

Kurund Jalmi authored Aug 01, 2013

----------------------------------------
* CRM-13130: New Label Format entries do not store the 'name' property in values colum, and produce blank name badges
  http://issues.civicrm.org/jira/browse/CRM-13130

8e9fd9e4

Merge pull request #1291 from monishdeb/CRM-8813 · 0b740dc1
Kurund Jalmi authored Jul 31, 2013
```
CRM-8813 Message Template fix
```
0b740dc1

CRM-8813 Message Template fix · d3c81b6b

monishdeb authored Jul 31, 2013

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

d3c81b6b

CRM-12639 : improvement as per... · 09aefef4

pratik.joshi authored Jul 31, 2013

CRM-12639 : improvement as per https://github.com/civicrm/civicrm-core/pull/1272#issuecomment-21735152 comment , but couldn't find a way to retreive pseudo constants labels for email_greeting, postal_greeting, addressee, state_province_abbreavation , so left the condition statements as it is.

09aefef4

CRM_12639_fix : sending a clean PR after... · d9ab802d

pratik.joshi authored Jul 30, 2013

CRM_12639_fix : sending a clean PR after https://github.com/civicrm/civicrm-core/pull/1272 produced merge conflict

d9ab802d

Merge pull request #1289 from monishdeb/CRM-8813 · 3482a61f
Kurund Jalmi authored Jul 31, 2013
```
CRM-8813 fix
```
3482a61f

CRM-8813 fix · 86ef747f

monishdeb authored Jul 31, 2013

----------------------------------------
* CRM-8813: Fix token insert cursor placement issue in Plain Text message body on IE 8
  http://issues.civicrm.org/jira/browse/CRM-8813

86ef747f

Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-31-15-53-16 · cdeb4bdf

Kurund Jalmi authored Jul 31, 2013

Conflicts:
	CRM/Contact/Form/Task/Batch.php
	CRM/Contribute/Form/Task/Batch.php
	CRM/Event/Form/ManageEvent/Fee.php
	CRM/Price/BAO/LineItem.php
	CRM/Utils/System/Base.php
	templates/CRM/Batch/Form/Entry.tpl

cdeb4bdf

Merge pull request #1287 from pratik-joshi/CRM-13035-fix · ffd86f78
Kurund Jalmi authored Jul 31, 2013
```
CRM-13035-fix : initiating CRM_Contribute_BAO_Contribution instead of CRM_Contribute_DAO_Contribution
```
ffd86f78
Merge pull request #1286 from monishdeb/CRM-12270 · a6b4a926
Kurund Jalmi authored Jul 31, 2013
```
CRM-12270 fix
```
a6b4a926
Merge pull request #1288 from monishdeb/CRM-12186 · 98e76b99
Kurund Jalmi authored Jul 31, 2013
```
CRM-12186 fix
```
98e76b99