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
Yashodha Chaku [Thu, 12 May 2016 09:19:46 +0000 (14:49 +0530)]
Merge pull request #8356 from yashodha/4.7.CRM-15202
CRM-15202
yashodha [Thu, 12 May 2016 08:11:10 +0000 (13:41 +0530)]
CRM-15202: mailing summary report should have option to filter by groups included
----------------------------------------
* CRM-15202: mailing summary report should have option to filter by groups included
https://issues.civicrm.org/jira/browse/CRM-15202
yashodha [Thu, 12 May 2016 08:04:30 +0000 (13:34 +0530)]
Merge branch 'CRM-15202' of https://github.com/jmcclelland/civicrm-core into 4.7.CRM-15202
eileen [Wed, 27 Apr 2016 20:33:51 +0000 (08:33 +1200)]
More thorough cleanup on BAO_ContributionTest class.
Use a teardown function for cleanup, remove all require onces, remove unrequired $ids params
JKingsnorth [Wed, 11 May 2016 14:52:40 +0000 (15:52 +0100)]
Merge - Improve JS comment blocks
Yashodha Chaku [Wed, 11 May 2016 11:35:48 +0000 (17:05 +0530)]
Merge pull request #8125 from totten/master-civimail-perm
CRM-18400 - CRM_Mailing_Info - Restore workflow permissions
Monish Deb [Wed, 11 May 2016 08:31:21 +0000 (14:01 +0530)]
Merge pull request #8300 from monishdeb/CRM-18070
CRM-18070: Packaged eWAY classes not loaded for Event registration
twomice [Thu, 5 May 2016 09:07:28 +0000 (14:37 +0530)]
CRM-18070: Packaged eWAY classes not loaded for Event registration
Monish Deb [Wed, 11 May 2016 06:08:04 +0000 (11:38 +0530)]
Merge pull request #8334 from jitendrapurohit/CRM-18501
CRM-18501 - Mailing labels doesn't work for address type 'main'
eileen [Sat, 7 May 2016 23:36:12 +0000 (09:36 +1000)]
CRM-18536 Remove require_onces no longer required
Tim hacked class loader for this
colemanw [Tue, 10 May 2016 16:20:59 +0000 (12:20 -0400)]
Merge pull request #8313 from colemanw/CRM-18452
CRM-18452 - Fix navigation menu item permission search box
Monish Deb [Tue, 10 May 2016 14:59:01 +0000 (20:29 +0530)]
Merge pull request #8341 from rohankatkar/Webtests-master
CRM-18454: Webtests Fix
Web Access [Tue, 10 May 2016 13:08:55 +0000 (18:38 +0530)]
CRM-18454: Webtests Fix
Monish Deb [Tue, 10 May 2016 11:15:19 +0000 (16:45 +0530)]
Merge pull request #8323 from jitendrapurohit/CRM-18437
CRM-18437 -- No expand icons in manage groups screen
Monish Deb [Tue, 10 May 2016 09:26:13 +0000 (14:56 +0530)]
Merge pull request #8337 from jitendrapurohit/CRM-18474-minor
check for empty params too - CRM-18474
jitendrapurohit [Tue, 10 May 2016 08:56:45 +0000 (14:26 +0530)]
add empty() check for CRM-18474
jitendrapurohit [Tue, 10 May 2016 06:30:00 +0000 (12:00 +0530)]
CRM-18501 - Mailing labels doesn't work for address type 'main'
Yashodha Chaku [Tue, 10 May 2016 06:21:15 +0000 (11:51 +0530)]
Merge pull request #8325 from rajbdilip/CRM-17967
Allow contact image file name length during upload up to 255 characters long
Yashodha Chaku [Tue, 10 May 2016 05:05:48 +0000 (10:35 +0530)]
Merge pull request #8330 from mlutfy/master-crm18518-3
CRM-18518: More ts() fixes.
Mathieu Lutfy [Mon, 9 May 2016 21:37:29 +0000 (17:37 -0400)]
CRM-18518: More ts() fixes.
Mathieu Lutfy [Mon, 9 May 2016 21:23:02 +0000 (17:23 -0400)]
CRM-17997: Fix Sybunt year totals.
Dilip Raj Baral [Mon, 9 May 2016 14:31:22 +0000 (20:01 +0530)]
Update image_URL column size to 512
Rounded to nearest 2^n
Dilip Raj Baral [Mon, 9 May 2016 13:59:44 +0000 (19:29 +0530)]
Update image_URL column size to 512
Monish Deb [Mon, 9 May 2016 13:14:16 +0000 (18:44 +0530)]
Merge pull request #8324 from jitendrapurohit/CRM-18520
CRM-18520 - Wrong message after "unhold email" task on Contact Search.
Monish Deb [Mon, 9 May 2016 13:12:49 +0000 (18:42 +0530)]
Merge pull request #8306 from monishdeb/CRM-18490
CRM-18490: API does not return Address ID via API
Monish Deb [Mon, 9 May 2016 12:42:50 +0000 (18:12 +0530)]
Merge pull request #8305 from jitendrapurohit/CRM-18239
CRM-18239 - 'CiviCRM: view my contact' permission results in user bei…
jitendrapurohit [Mon, 9 May 2016 09:14:32 +0000 (14:44 +0530)]
CRM-18520 - replace row_count() with affectedRows()
minor fix
deb.monish [Fri, 6 May 2016 14:39:29 +0000 (20:09 +0530)]
CRM-18490: API does not return Address ID via API
Dilip Raj Baral [Mon, 9 May 2016 11:29:03 +0000 (16:59 +0530)]
Allow conact image file name length during upload up to 255 characters long
https://issues.civicrm.org/jira/browse/CRM-17967
Currently Add/Edit New Contact page restricts the length of the image file
to 60 characters.
jitendrapurohit [Mon, 9 May 2016 08:23:52 +0000 (13:53 +0530)]
CRM-18437 -- No expand icons in manage groups screen
minor fix
Monish Deb [Mon, 9 May 2016 10:03:33 +0000 (15:33 +0530)]
Merge pull request #8304 from jitendrapurohit/CRM-18474
CRM-18474 - Escape unicode characters to avoid json syntax errors
jitendrapurohit [Fri, 6 May 2016 10:52:58 +0000 (16:22 +0530)]
CRM-18474 - Escape unicode characters to avoid json syntax errors
replace by line break
colemanw [Mon, 9 May 2016 00:36:58 +0000 (20:36 -0400)]
Merge pull request #8320 from mlutfy/master-crm18518
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:07:36 +0000 (18:07 -0400)]
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 22:03:56 +0000 (18:03 -0400)]
CRM-18518: ts() string fixes.
Mathieu Lutfy [Sun, 8 May 2016 21:30:35 +0000 (17:30 -0400)]
CRM-18518: ts() string fixes.
Coleman Watts [Sat, 7 May 2016 22:27:45 +0000 (18:27 -0400)]
CRM-18452 - Fix navigation menu item permission search box
Monish Deb [Fri, 6 May 2016 19:03:32 +0000 (00:33 +0530)]
Merge pull request #8308 from laryn/patch-8
Simple spelling fix
Laryn - CEDC.org [Fri, 6 May 2016 18:27:17 +0000 (13:27 -0500)]
Simple spelling fix
jitendrapurohit [Fri, 6 May 2016 11:15:36 +0000 (16:45 +0530)]
CRM-18239 - 'CiviCRM: view my contact' permission results in user being able to edit themselves in CiviCRM
Yashodha Chaku [Fri, 6 May 2016 10:58:21 +0000 (16:28 +0530)]
Merge pull request #8166 from otetard/CRM-18432
CRM-18432: In CiviMail’s updateEmailResetDate(), exec the main query.
Tim Otten [Thu, 5 May 2016 23:42:23 +0000 (16:42 -0700)]
Merge pull request #8105 from herbdool/master
Added getUFLocale, setUFLocale methods to Backdrop class
Coleman Watts [Thu, 5 May 2016 20:34:28 +0000 (16:34 -0400)]
CRM-18306 - Fix datepicker in batch update profiles
Yashodha Chaku [Thu, 5 May 2016 09:09:17 +0000 (14:39 +0530)]
Merge pull request #8294 from yashodha/CRM-18154
CRM-18154: Profile custom field option: 'Include in multi-record list…
yashodha [Thu, 5 May 2016 07:44:35 +0000 (13:14 +0530)]
CRM-18154: change checkbox to advcheckbox to ensure unsetting works fine
----------------------------------------
* CRM-18154: Profile custom field option: "Include in multi-record listing" un-ticked, but still persists
https://issues.civicrm.org/jira/browse/CRM-18154
projects / civicrm-core.git / log