civicrm-core.git
8 years agosql/GenerateReportData.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
sql/GenerateReportData.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agosql/GenerateData.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
sql/GenerateData.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoCivi/Core/SettingsBag.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
Civi/Core/SettingsBag.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoCRM/Utils/Mail/Incoming.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
CRM/Utils/Mail/Incoming.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoCRM/Core/BAO/File.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
CRM/Core/BAO/File.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoCRM/Core/BAO/CustomGroup.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
CRM/Core/BAO/CustomGroup.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoCRM/Core/BAO/CustomField.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
CRM/Core/BAO/CustomField.php - Change 12-hour `Ymdhis` to 24-hour `YmdHis`

8 years agoMerge pull request #8338 from JKingsnorth/CRM-18526
colemanw [Thu, 19 May 2016 20:30:31 +0000 (16:30 -0400)]
Merge pull request #8338 from JKingsnorth/CRM-18526

CRM-18526: Fix upgrade code for foreign keys from CRM-18345

8 years agoMerge pull request #8251 from eileenmcnaughton/merge_tests
Eileen McNaughton [Thu, 19 May 2016 20:11:44 +0000 (08:11 +1200)]
Merge pull request #8251 from eileenmcnaughton/merge_tests

Dedupe fixes CRM-18442, CRM-18539,  CRM-18480

8 years agoMerge pull request #8410 from mollux/CRM-18589
colemanw [Thu, 19 May 2016 19:57:37 +0000 (15:57 -0400)]
Merge pull request #8410 from mollux/CRM-18589

CRM-18589 Drastically reduce memory usage during tests.

8 years agoDrasticly reduce memory usage during tests.
Mattias Michaux [Thu, 19 May 2016 14:50:59 +0000 (16:50 +0200)]
Drasticly reduce memory usage during tests.

8 years agoMerge pull request #8406 from eileenmcnaughton/batch_trxn_id
Monish Deb [Thu, 19 May 2016 12:13:29 +0000 (17:43 +0530)]
Merge pull request #8406 from eileenmcnaughton/batch_trxn_id

CRM-17123 - Include Transaction ID in membership bulk entry profile

8 years agoMerge pull request #8284 from eileenmcnaughton/postal_code
Monish Deb [Thu, 19 May 2016 11:56:43 +0000 (17:26 +0530)]
Merge pull request #8284 from eileenmcnaughton/postal_code

CRM-17118 extend civicrm_address postal_code to accept full data stri…

8 years agoCRM-17123 - Include Transaction ID in membership bulk entry profile
eileen [Thu, 19 May 2016 05:11:06 +0000 (17:11 +1200)]
CRM-17123 - Include Transaction ID in membership bulk entry profile

8 years agoCRM-17123: add unit test
deb.monish [Thu, 19 May 2016 10:56:01 +0000 (16:26 +0530)]
CRM-17123: add unit test

8 years agoMerge pull request #8145 from nielosz/master
Yashodha Chaku [Thu, 19 May 2016 10:42:58 +0000 (16:12 +0530)]
Merge pull request #8145 from nielosz/master

To check mails for a valid html part strip tags when comparing

8 years agoMerge pull request #8222 from eileenmcnaughton/CRM-18465
Monish Deb [Thu, 19 May 2016 09:28:42 +0000 (14:58 +0530)]
Merge pull request #8222 from eileenmcnaughton/CRM-18465

CRM-18465: fully resolve contributions before resolving tokens

8 years agoMerge pull request #8405 from eileenmcnaughton/custom_data-regress
Eileen McNaughton [Thu, 19 May 2016 05:30:41 +0000 (17:30 +1200)]
Merge pull request #8405 from eileenmcnaughton/custom_data-regress

CRM-18504 fix validation error when contact subtype is disabled

8 years agoMerge pull request #8189 from kenwest/CRM-18448
Eileen McNaughton [Thu, 19 May 2016 04:17:17 +0000 (16:17 +1200)]
Merge pull request #8189 from kenwest/CRM-18448

CRM-18448 Update recurring contribution - fix Financial Type required error

8 years agoMerge pull request #8190 from kenwest/CRM-18449
Eileen McNaughton [Thu, 19 May 2016 04:00:44 +0000 (16:00 +1200)]
Merge pull request #8190 from kenwest/CRM-18449

CRM-18449 prevent fatal error on Update recurring contribution

8 years agoCRM-18539: Permit criteria for batch merging (other than group)
eileen [Tue, 17 May 2016 20:56:28 +0000 (08:56 +1200)]
CRM-18539: Permit criteria for batch merging (other than group)

8 years agoCRM-18842 Dedupe query: remove OR join in favour of more performant UNION
eileen [Wed, 27 Apr 2016 05:20:43 +0000 (17:20 +1200)]
CRM-18842 Dedupe query: remove OR join in favour of more performant UNION

Unions are much faster than OR joins. This change took the length of the query to get the dedupes on a large database from
'as long as it took for the server to fall over' to less than one second on a small group of contacts

This query is only affecting one path - ie Individuals - at the moment as I can only extend that as fast as I can write tests.

8 years agoCRM-18480 fix batch merge job to cope with new inability to re-merge deleted contacts
eileen [Wed, 18 May 2016 00:06:15 +0000 (12:06 +1200)]
CRM-18480 fix batch merge job to cope with new inability to re-merge deleted contacts

Also, I changed the fatal to an exception - low level functions should throw exceptions, it's up to the form to catch & render those

8 years agoMerge pull request #8404 from eileenmcnaughton/recur_test
Eileen McNaughton [Thu, 19 May 2016 01:21:34 +0000 (13:21 +1200)]
Merge pull request #8404 from eileenmcnaughton/recur_test

Fix mis-failing test assertion

8 years agoCRM-18465 add test to check correct setting of token variables.
eileen [Thu, 19 May 2016 00:24:52 +0000 (12:24 +1200)]
CRM-18465 add test to check correct setting of token variables.

8 years agoCRM-18504 fix validation error when contact subtype is disabled
eileen [Wed, 18 May 2016 23:02:39 +0000 (11:02 +1200)]
CRM-18504 fix validation error when contact subtype is disabled

8 years agoMerge pull request #8122 from JKingsnorth/CRM-18339
Eileen McNaughton [Wed, 18 May 2016 22:14:45 +0000 (10:14 +1200)]
Merge pull request #8122 from JKingsnorth/CRM-18339

CRM-18397: Don't add empty billing name to non-existent billing address

8 years agoFix mis-failing test assertion
eileen [Wed, 18 May 2016 21:54:45 +0000 (09:54 +1200)]
Fix mis-failing test assertion

8 years agoMerge pull request #8385 from eileenmcnaughton/no_dupe_email
Eileen McNaughton [Wed, 18 May 2016 21:39:51 +0000 (09:39 +1200)]
Merge pull request #8385 from eileenmcnaughton/no_dupe_email

CRM-18546 Duplicate email addresses created when merging in 4.7

8 years agoMerge pull request #8396 from JMAConsulting/CRM-18406
Monish Deb [Wed, 18 May 2016 15:53:06 +0000 (21:23 +0530)]
Merge pull request #8396 from JMAConsulting/CRM-18406

CRM-18406 Added unit test for activity create/update when contributio…

8 years agoMerge pull request #8399 from monishdeb/CRM-18406
Monish Deb [Wed, 18 May 2016 15:02:51 +0000 (20:32 +0530)]
Merge pull request #8399 from monishdeb/CRM-18406

CRM-18406: minor fix

8 years agoCRM-18406: minor fix
deb.monish [Wed, 18 May 2016 14:32:47 +0000 (20:02 +0530)]
CRM-18406: minor fix

8 years agoMerge pull request #8384 from rohankatkar/CRM_18406
Monish Deb [Wed, 18 May 2016 12:41:04 +0000 (18:11 +0530)]
Merge pull request #8384 from rohankatkar/CRM_18406

CRM-18406: When a contribution is edited it doesn't update the activity to match

8 years agoCRM-18526: Move upgrade code to 4.7.8
JKingsnorth [Wed, 18 May 2016 12:04:54 +0000 (13:04 +0100)]
CRM-18526: Move upgrade code to 4.7.8

8 years agoMerge pull request #8286 from eileenmcnaughton/report_ui
Eileen McNaughton [Wed, 18 May 2016 09:48:40 +0000 (21:48 +1200)]
Merge pull request #8286 from eileenmcnaughton/report_ui

CRM-18492 Creating a report from 'all reports' put the creator's name…

8 years agoMerge pull request #8157 from eileenmcnaughton/CRM-18424
Monish Deb [Wed, 18 May 2016 08:53:34 +0000 (14:23 +0530)]
Merge pull request #8157 from eileenmcnaughton/CRM-18424

CRM-18424 better amount label for repeat transactions

8 years agoMerge pull request #8394 from yashodha/CRM-18046
Yashodha Chaku [Wed, 18 May 2016 08:43:07 +0000 (14:13 +0530)]
Merge pull request #8394 from yashodha/CRM-18046

CRM-18046: Search link in AB Testing report erroneously requires view…

8 years agoCRM-18406 Added unit test for activity create/update when contribution is created...
Edsel [Wed, 18 May 2016 07:29:32 +0000 (12:59 +0530)]
CRM-18406 Added unit test for activity create/update when contribution is created/updated

----------------------------------------
* CRM-18406: When a contribution is edited it doesn't update the activity to match
  https://issues.civicrm.org/jira/browse/CRM-18406

8 years agoMerge pull request #8159 from eileenmcnaughton/CRM-18428
Monish Deb [Wed, 18 May 2016 07:24:32 +0000 (12:54 +0530)]
Merge pull request #8159 from eileenmcnaughton/CRM-18428

CRM-18428 pay later being inappropriately assigned from the contribut…

8 years agoCRM-18046: Search link in AB Testing report erroneously requires view all contacts...
yashodha [Wed, 18 May 2016 07:06:03 +0000 (12:36 +0530)]
CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission

----------------------------------------
* CRM-18046: Search link in AB Testing report erroneously requires view all contacts permission
  https://issues.civicrm.org/jira/browse/CRM-18046

8 years agoMerge pull request #8170 from eileenmcnaughton/activity
Eileen McNaughton [Wed, 18 May 2016 06:30:55 +0000 (18:30 +1200)]
Merge pull request #8170 from eileenmcnaughton/activity

CRM-18409 fix inability to view activity if source contact id is dele…

8 years agoCRM-18492 Creating a report from 'all reports' put the creator's name into the title
eileen [Tue, 3 May 2016 06:55:23 +0000 (18:55 +1200)]
CRM-18492 Creating a report from 'all reports' put the creator's name into the title

8 years agoCRM-17118 extend civicrm_address postal_code to accept full data strings from paypal...
eileen [Tue, 3 May 2016 03:13:02 +0000 (15:13 +1200)]
CRM-17118 extend civicrm_address postal_code to accept full data strings from paypal etc.

8 years agoMerge pull request #8386 from monishdeb/CRM-18405
Eileen McNaughton [Wed, 18 May 2016 05:13:13 +0000 (17:13 +1200)]
Merge pull request #8386 from monishdeb/CRM-18405

CRM-18405: When creating a contribution in the back-end, total amount  is incorrect

8 years agoCRM-18409 fix inability to view activity if source contact id is deleted.
eileen [Tue, 19 Apr 2016 02:46:33 +0000 (14:46 +1200)]
CRM-18409 fix inability to view activity if source contact id is deleted.

This fix adds the ability to access activities through the api with the same permission checks as in the BAO if 'id' is passed in (and contact_id is not for 'supporting legacy stuff reasons').

Note that the api functionality is a good thing, but it is actually being added primarily for the purposes of being able to add a test fix for the change

8 years agoMerge pull request #8391 from monishdeb/CRM-18467
Eileen McNaughton [Wed, 18 May 2016 00:10:51 +0000 (12:10 +1200)]
Merge pull request #8391 from monishdeb/CRM-18467

CRM-18467: Set amount to appear on pay-later receipt

8 years agoMerge pull request #8389 from eileenmcnaughton/regression
Eileen McNaughton [Wed, 18 May 2016 00:10:22 +0000 (12:10 +1200)]
Merge pull request #8389 from eileenmcnaughton/regression

CRM-18504: Fix error in validating sub type by entity

8 years agoCRM-18504: Fix error in validating sub type by entity
JKingsnorth [Tue, 17 May 2016 15:31:16 +0000 (03:31 +1200)]
CRM-18504: Fix error in validating sub type by entity

8 years agoMerge pull request #8390 from davejenx/CRM-18567-master
Eileen McNaughton [Tue, 17 May 2016 20:06:17 +0000 (08:06 +1200)]
Merge pull request #8390 from davejenx/CRM-18567-master

CRM-18567 - stristr was called with arguments in wrong order, causing…

8 years agoextended pay later unit test
deb.monish [Tue, 17 May 2016 16:19:15 +0000 (21:49 +0530)]
extended pay later unit test

8 years agoCRM-18467 Set amount to appear on pay-later receipt
Ken West [Mon, 25 Apr 2016 11:21:55 +0000 (21:21 +1000)]
CRM-18467 Set amount to appear on pay-later receipt

8 years agoCRM-18567 - stristr was called with arguments in wrong order, causing $subTypes not...
Dave Jenkins [Tue, 17 May 2016 15:48:54 +0000 (16:48 +0100)]
CRM-18567 - stristr was called with arguments in wrong order, causing $subTypes not to be exploded correctly when comma-separated.

8 years agoAdd extra info for the test that showed a fail.
eileen [Wed, 11 May 2016 05:01:53 +0000 (17:01 +1200)]
Add extra info for the test that showed a fail.

THis is kinda unrelated but if we can make it easier to make sense of or go away .. yay

8 years agoCRM-18405: When creating a contribution in the back-end, total amount is incorrect
deb.monish [Tue, 17 May 2016 12:52:59 +0000 (18:22 +0530)]
CRM-18405: When creating a contribution in the back-end, total amount is incorrect

8 years agoMerge pull request #8387 from eileenmcnaughton/bgm
Eileen McNaughton [Tue, 17 May 2016 14:25:59 +0000 (02:25 +1200)]
Merge pull request #8387 from eileenmcnaughton/bgm

CRM-18277 : add test & fix for the contact.source field.

8 years agoMerge pull request #8140 from jitendrapurohit/CRM-18384
Monish Deb [Tue, 17 May 2016 14:16:28 +0000 (19:46 +0530)]
Merge pull request #8140 from jitendrapurohit/CRM-18384

CRM-18384 - decode incorrect keys in $_REQUEST, $_GET when & is present in url

8 years agoCRM-18424 fix recur checkbox issue found in QA.
eileen [Tue, 17 May 2016 13:53:16 +0000 (01:53 +1200)]
CRM-18424 fix recur checkbox issue found in QA.

On digging into it I found the showHideAutoRenew function was robust enough to be called in both a hide & a show situation.

So, yay, further minor simplification

8 years agofix enotice
Eileen McNaughton [Tue, 17 May 2016 13:42:55 +0000 (01:42 +1200)]
fix enotice

8 years agominor fix
deb.monish [Tue, 17 May 2016 13:34:54 +0000 (19:04 +0530)]
minor fix

8 years agoCRM-18428 pay later being inappropriately assigned from the contribution page
eileenmcnaugton [Sun, 17 Apr 2016 15:52:59 +0000 (03:52 +1200)]
CRM-18428 pay later being inappropriately assigned from the contribution page

8 years agoCRM-18277 : add test & fix for the contact.source field.
Mathieu Lutfy [Thu, 31 Mar 2016 03:26:17 +0000 (23:26 -0400)]
CRM-18277 : add test & fix for the contact.source field.

8 years agoNFC Move comments
JKingsnorth [Tue, 17 May 2016 12:20:30 +0000 (13:20 +0100)]
NFC Move comments

8 years agoCRM-18397: Remove unnecessary check and add comments for future changes
JKingsnorth [Tue, 17 May 2016 12:17:02 +0000 (13:17 +0100)]
CRM-18397: Remove unnecessary check and add comments for future changes

8 years agoCRM-18546 Duplicate email addresses created when merging in 4.7
eileen [Thu, 12 May 2016 23:47:26 +0000 (11:47 +1200)]
CRM-18546 Duplicate email addresses created when merging in 4.7

8 years agoTest tidy-ups. Bring set up functions more in line with other tests
eileen [Wed, 27 Apr 2016 03:51:41 +0000 (15:51 +1200)]
Test tidy-ups. Bring set up functions more in line with other tests

8 years agoCRM-18406: When a contribution is edited it doesn't update the activity to match
Web Access [Tue, 17 May 2016 11:32:48 +0000 (17:02 +0530)]
CRM-18406: When a contribution is edited it doesn't update the activity to match

CRM-18406: Warning Fix

8 years agoMerge pull request #8365 from saurabhbatra96/CRM-18537
Eileen McNaughton [Tue, 17 May 2016 11:09:40 +0000 (23:09 +1200)]
Merge pull request #8365 from saurabhbatra96/CRM-18537

CRM-18537 Correction of State list for Brazil

8 years agoMerge pull request #8360 from eileenmcnaughton/prev_next
Eileen McNaughton [Tue, 17 May 2016 10:42:40 +0000 (22:42 +1200)]
Merge pull request #8360 from eileenmcnaughton/prev_next

CRM-18517 fix merge code loop

8 years agoMerge pull request #8270 from monishdeb/CRM-18483
Monish Deb [Tue, 17 May 2016 09:00:04 +0000 (14:30 +0530)]
Merge pull request #8270 from monishdeb/CRM-18483

CRM-18483: Paypal payments - Pending (Incomplete Transaction)

8 years agoMerge pull request #8374 from mollux/CRM-18563_documentation
Eileen McNaughton [Tue, 17 May 2016 08:25:41 +0000 (20:25 +1200)]
Merge pull request #8374 from mollux/CRM-18563_documentation

CRM-18563 Fix missing documentation for new API entities.

8 years agoUpdate comments
Eileen McNaughton [Tue, 17 May 2016 08:22:59 +0000 (20:22 +1200)]
Update comments

8 years agoload bootstrap only for Joomla
deb.monish [Tue, 17 May 2016 07:25:55 +0000 (12:55 +0530)]
load bootstrap only for Joomla

8 years agoCRM-18483: Paypal payments - Pending (Incomplete Transaction)
deb.monish [Fri, 29 Apr 2016 12:23:03 +0000 (17:53 +0530)]
CRM-18483: Paypal payments - Pending (Incomplete Transaction)

8 years agoMerge pull request #8375 from mollux/CRM-18563_example_exception_inconsistent
Eileen McNaughton [Tue, 17 May 2016 03:57:42 +0000 (15:57 +1200)]
Merge pull request #8375 from mollux/CRM-18563_example_exception_inconsistent

CRM-18563 Generate the same structure for API success and API failures in the API examples.

8 years agoMerge pull request #8377 from mollux/CRM-18563_mariadb
Eileen McNaughton [Tue, 17 May 2016 01:31:04 +0000 (13:31 +1200)]
Merge pull request #8377 from mollux/CRM-18563_mariadb

CRM-18563 Fix test failure on MariaDB due to default sorting.

8 years agoMerge pull request #8378 from mollux/CRM-18563_test_output
Eileen McNaughton [Tue, 17 May 2016 00:53:32 +0000 (12:53 +1200)]
Merge pull request #8378 from mollux/CRM-18563_test_output

CRM18563 : Remove/disable obsolete test output. (NFC)

8 years agoMerge pull request #8299 from totten/master-reltype
Eileen McNaughton [Tue, 17 May 2016 00:44:52 +0000 (12:44 +1200)]
Merge pull request #8299 from totten/master-reltype

civicrm/admin/reltype - Fix warning

8 years agoMerge pull request #8381 from eileenmcnaughton/tidy
Eileen McNaughton [Tue, 17 May 2016 00:28:43 +0000 (12:28 +1200)]
Merge pull request #8381 from eileenmcnaughton/tidy

CRM-18564 (NFC) Add comments, underscore in key

8 years agomissing comma
Eileen McNaughton [Mon, 16 May 2016 23:21:06 +0000 (11:21 +1200)]
missing comma

8 years agoCRM-18517 add test for aggressive mode batch merge
eileen [Mon, 16 May 2016 22:59:03 +0000 (10:59 +1200)]
CRM-18517 add test for aggressive mode batch merge

Change-Id: I198577b3073239b298a47ca6f649f6a6c92dcb13

8 years agoCRM-18517 get conflicts dependent on mode
eileen [Mon, 16 May 2016 22:35:46 +0000 (10:35 +1200)]
CRM-18517 get conflicts dependent on mode

8 years agoCRM-18517 add merge test for when conflict encountered
eileen [Fri, 13 May 2016 04:26:23 +0000 (16:26 +1200)]
CRM-18517 add merge test for when conflict encountered

This test relies on the code loop being fixed

8 years agoCodeClean - stop mangling orderBy into WHERE
eileen [Fri, 13 May 2016 04:20:22 +0000 (16:20 +1200)]
CodeClean - stop mangling orderBy into WHERE

8 years agoCRM-18517 remove code loop on batch merge process
eileen [Fri, 13 May 2016 04:17:05 +0000 (16:17 +1200)]
CRM-18517 remove code loop on batch merge process

By constantly reloading conflicts in batch mode we are also reloading conflicted entries. If we process this list until it is empty it will never be empty

8 years agoCRM-18497 add first very basic test to job.merge
eileen [Tue, 3 May 2016 23:57:12 +0000 (11:57 +1200)]
CRM-18497 add first very basic test to job.merge

The test doesn't check any functionality, just the fact it runs without error. More to come

8 years agoAdd tests for getDuplicatePairs function
eileen [Wed, 27 Apr 2016 04:10:15 +0000 (16:10 +1200)]
Add tests for getDuplicatePairs function

8 years agoCRM-18443 add unit test & refactor code into smaller function
eileen [Wed, 27 Apr 2016 01:02:16 +0000 (13:02 +1200)]
CRM-18443 add unit test & refactor code into smaller function

On starting to dig into the dedupe code I find that there are 2 different paths, one that is used by the batch merge
and one used in other cases. I'm hoping to rationalise that & add testing with the focus being on small refactors + added tests.

I'm less sure about adding an api as I work into the internals here....

Replact duplicate code with a function to calculate the cacheKey

This part of investigation / cleanup for CRM-18443

8 years agoMerge pull request #8383 from civicrm/revert-5903-master
Eileen McNaughton [Mon, 16 May 2016 22:52:55 +0000 (10:52 +1200)]
Merge pull request #8383 from civicrm/revert-5903-master

Revert "Adding jasmine testing across domains"

8 years agoRevert "Adding jasmine testing across domains"
Tim Otten [Mon, 16 May 2016 21:58:18 +0000 (14:58 -0700)]
Revert "Adding jasmine testing across domains"

8 years agoCRM-18564 (NFC) Add comments, underscore in key
Elliott Eggleston [Tue, 19 Apr 2016 19:14:48 +0000 (12:14 -0700)]
CRM-18564 (NFC) Add comments, underscore in key

8 years agoDisabled other obsolete output.
Mattias Michaux [Mon, 16 May 2016 19:49:43 +0000 (21:49 +0200)]
Disabled other obsolete output.

8 years agoRemoved obsolete test output.
Mattias Michaux [Mon, 16 May 2016 19:46:34 +0000 (21:46 +0200)]
Removed obsolete test output.

8 years agoFix test failure on MariaDB due to default sorting.
Mattias Michaux [Mon, 16 May 2016 19:42:37 +0000 (21:42 +0200)]
Fix test failure on MariaDB due to default sorting.

8 years agoGenerate the same structure for API success and API failures in the API examples.
Mattias Michaux [Mon, 16 May 2016 19:21:03 +0000 (21:21 +0200)]
Generate the same structure for API success and API failures in the API examples.

8 years agoFix missing documentation for new API entities.
Mattias Michaux [Mon, 16 May 2016 19:11:29 +0000 (21:11 +0200)]
Fix missing documentation for new API entities.

8 years agoMerge pull request #8372 from monishdeb/CRM-18519
Monish Deb [Mon, 16 May 2016 16:38:43 +0000 (22:08 +0530)]
Merge pull request #8372 from monishdeb/CRM-18519

CRM-18519: Add 'standard' contact report fields to contribution detail

8 years agominor fix
deb.monish [Mon, 16 May 2016 13:45:00 +0000 (19:15 +0530)]
minor fix

8 years agoCRM-18519 Add 'standard' contact report fields to contribution detail report
eileen [Mon, 9 May 2016 04:34:47 +0000 (14:34 +1000)]
CRM-18519 Add 'standard' contact report fields to contribution detail report

8 years agoCRM-18537
Saurabh Batra [Mon, 16 May 2016 07:20:23 +0000 (12:50 +0530)]
CRM-18537

8 years agoMerge pull request #8364 from eileenmcnaughton/pay_junction
Monish Deb [Mon, 16 May 2016 07:07:15 +0000 (12:37 +0530)]
Merge pull request #8364 from eileenmcnaughton/pay_junction

CRM-18176 payjunction error on events