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
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
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
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
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
eileen [Thu, 19 May 2016 00:24:52 +0000 (12:24 +1200)]
CRM-18465 add test to check correct setting of token variables.
eileen [Wed, 18 May 2016 23:02:39 +0000 (11:02 +1200)]
CRM-18504 fix validation error when contact subtype is disabled
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
eileen [Wed, 18 May 2016 21:54:45 +0000 (09:54 +1200)]
Fix mis-failing test assertion
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
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…
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
deb.monish [Wed, 18 May 2016 14:32:47 +0000 (20:02 +0530)]
CRM-18406: minor fix
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
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…
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
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…
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
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…
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
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…
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
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
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
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
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
JKingsnorth [Tue, 17 May 2016 15:31:16 +0000 (03:31 +1200)]
CRM-18504: Fix error in validating sub type by entity
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…
deb.monish [Tue, 17 May 2016 16:19:15 +0000 (21:49 +0530)]
extended pay later unit test
Ken West [Mon, 25 Apr 2016 11:21:55 +0000 (21:21 +1000)]
CRM-18467 Set amount to appear on pay-later receipt
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.
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
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
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.
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
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
Eileen McNaughton [Tue, 17 May 2016 13:42:55 +0000 (01:42 +1200)]
fix enotice
deb.monish [Tue, 17 May 2016 13:34:54 +0000 (19:04 +0530)]
minor fix
eileenmcnaugton [Sun, 17 Apr 2016 15:52:59 +0000 (03:52 +1200)]
CRM-18428 pay later being inappropriately assigned from the contribution page
Mathieu Lutfy [Thu, 31 Mar 2016 03:26:17 +0000 (23:26 -0400)]
CRM-18277 : add test & fix for the contact.source field.
JKingsnorth [Tue, 17 May 2016 12:20:30 +0000 (13:20 +0100)]
NFC Move comments
JKingsnorth [Tue, 17 May 2016 12:17:02 +0000 (13:17 +0100)]
CRM-18397: Remove unnecessary check and add comments for future changes
eileen [Thu, 12 May 2016 23:47:26 +0000 (11:47 +1200)]
CRM-18546 Duplicate email addresses created when merging in 4.7
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
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
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
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
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)
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.
Eileen McNaughton [Tue, 17 May 2016 08:22:59 +0000 (20:22 +1200)]
Update comments
deb.monish [Tue, 17 May 2016 07:25:55 +0000 (12:55 +0530)]
load bootstrap only for Joomla
deb.monish [Fri, 29 Apr 2016 12:23:03 +0000 (17:53 +0530)]
CRM-18483: Paypal payments - Pending (Incomplete Transaction)
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.
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.
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)
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
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
Eileen McNaughton [Mon, 16 May 2016 23:21:06 +0000 (11:21 +1200)]
missing comma
eileen [Mon, 16 May 2016 22:59:03 +0000 (10:59 +1200)]
CRM-18517 add test for aggressive mode batch merge
Change-Id: I198577b3073239b298a47ca6f649f6a6c92dcb13
eileen [Mon, 16 May 2016 22:35:46 +0000 (10:35 +1200)]
CRM-18517 get conflicts dependent on mode
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
eileen [Fri, 13 May 2016 04:20:22 +0000 (16:20 +1200)]
CodeClean - stop mangling orderBy into WHERE
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
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
eileen [Wed, 27 Apr 2016 04:10:15 +0000 (16:10 +1200)]
Add tests for getDuplicatePairs 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
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"
Tim Otten [Mon, 16 May 2016 21:58:18 +0000 (14:58 -0700)]
Revert "Adding jasmine testing across domains"
Elliott Eggleston [Tue, 19 Apr 2016 19:14:48 +0000 (12:14 -0700)]
CRM-18564 (NFC) Add comments, underscore in key
Mattias Michaux [Mon, 16 May 2016 19:49:43 +0000 (21:49 +0200)]
Disabled other obsolete output.
Mattias Michaux [Mon, 16 May 2016 19:46:34 +0000 (21:46 +0200)]
Removed obsolete test output.
Mattias Michaux [Mon, 16 May 2016 19:42:37 +0000 (21:42 +0200)]
Fix test failure on MariaDB due to default sorting.
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.
Mattias Michaux [Mon, 16 May 2016 19:11:29 +0000 (21:11 +0200)]
Fix missing documentation for new API entities.
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
deb.monish [Mon, 16 May 2016 13:45:00 +0000 (19:15 +0530)]
minor fix
eileen [Mon, 9 May 2016 04:34:47 +0000 (14:34 +1000)]
CRM-18519 Add 'standard' contact report fields to contribution detail report
Saurabh Batra [Mon, 16 May 2016 07:20:23 +0000 (12:50 +0530)]
CRM-18537
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
Monish Deb [Mon, 16 May 2016 06:02:57 +0000 (11:32 +0530)]
Merge pull request #8358 from monishdeb/CRM-18426
CRM-18426: added unit test and fixed notices
colemanw [Sat, 14 May 2016 20:21:33 +0000 (16:21 -0400)]
Merge pull request #8302 from colemanw/CRM-18306
CRM-18306 - Fix datepicker in batch update profiles
colemanw [Sat, 14 May 2016 20:16:06 +0000 (16:16 -0400)]
Merge pull request #5903 from scardinius/master
Adding jasmine testing across domains
colemanw [Sat, 14 May 2016 18:08:42 +0000 (14:08 -0400)]
Merge pull request #7991 from fuzionnz/CRM-16898
CRM-16898. Remove debugging in html5lib.
colemanw [Sat, 14 May 2016 17:58:42 +0000 (13:58 -0400)]
Merge pull request #8173 from eileenmcnaughton/master
Fix for test suite leakage issue, ornery test
colemanw [Sat, 14 May 2016 17:49:57 +0000 (13:49 -0400)]
Merge pull request #8329 from mlutfy/master-crm17997
CRM-17997: Fix Sybunt year totals.
eileen [Fri, 13 May 2016 17:42:31 +0000 (05:42 +1200)]
CRM-18176 payjunction error on events
Monish Deb [Fri, 13 May 2016 10:19:29 +0000 (15:49 +0530)]
Merge pull request #8362 from monishdeb/CRM-18488
CRM-18488: minor change
deb.monish [Fri, 13 May 2016 10:14:30 +0000 (15:44 +0530)]
CRM-18488: minor change
Eileen McNaughton [Fri, 13 May 2016 10:13:14 +0000 (22:13 +1200)]
Merge pull request #8249 from eileenmcnaughton/merge_code
Remove duplication of definition of cacheKeyString
Monish Deb [Fri, 13 May 2016 09:49:42 +0000 (15:19 +0530)]
Merge pull request #8277 from eileenmcnaughton/pledge_report
CRM-18488 add installments to pledged by not paid report
Eileen McNaughton [Fri, 13 May 2016 09:04:04 +0000 (21:04 +1200)]
Merge pull request #8250 from eileenmcnaughton/tests
Test clean up. Standardise delete contact calls.
Yashodha Chaku [Fri, 13 May 2016 08:43:51 +0000 (14:13 +0530)]
Merge pull request #8118 from scardinius/crm-18108
CRM-18108 Fix choosing A/B testing as final
Monish Deb [Fri, 13 May 2016 06:16:19 +0000 (11:46 +0530)]
Merge pull request #8361 from monishdeb/CRM-18490
CRM-18490: test leakage fix
deb.monish [Fri, 13 May 2016 05:12:04 +0000 (10:42 +0530)]
CRM-18490: test leakage fix
deb.monish [Thu, 12 May 2016 16:24:32 +0000 (21:54 +0530)]
CRM-18426: added unit test and fixed notices
Eileen McNaughton [Fri, 13 May 2016 02:58:30 +0000 (14:58 +1200)]
Merge pull request #8359 from eileenmcnaughton/ornery_test
Remove ornery test marker.
eileen [Fri, 13 May 2016 02:01:26 +0000 (14:01 +1200)]
Remove ornery test marker.
The test is now fixed & should pass in CI
Eileen McNaughton [Fri, 13 May 2016 01:16:46 +0000 (13:16 +1200)]
Merge pull request #8192 from JKingsnorth/CRM-18338
CRM-18338: Fixes for CRM_Dedupe_MergerTest
Eileen McNaughton [Thu, 12 May 2016 20:20:36 +0000 (08:20 +1200)]
Merge pull request #8348 from eileenmcnaughton/no_require
CRM-18536 Remove require_onces no longer required
Monish Deb [Thu, 12 May 2016 12:53:48 +0000 (18:23 +0530)]
Merge pull request #8158 from eileenmcnaughton/CRM-18426
CRM-18426 pay later receipts not going out
projects / civicrm-core.git / log