Effy Elden [Sat, 21 May 2016 09:12:25 +0000 (05:12 -0400)]
CRM-18523 - Search Builder - Fix searching on Membership ID
----------------------------------------
* CRM-18523: Search Builder fails for Membership ID
https://issues.civicrm.org/jira/browse/CRM-18523
Tim Otten [Sat, 21 May 2016 04:18:30 +0000 (21:18 -0700)]
Merge pull request #8419 from totten/master-dompdf
CRM-16898 - Restore TreeBuilder. Replace debug call.
Tim Otten [Sat, 21 May 2016 03:58:26 +0000 (20:58 -0700)]
CRM-16898 - Replace debug code in html5lib
Tim Otten [Sat, 21 May 2016 03:49:51 +0000 (20:49 -0700)]
Revert "CRM-16898. Remove debugging in html5lib."
This reverts commit
693cb3279584278ccbb3eaa1394999c7a69d7bf6.
Tim Otten [Sat, 21 May 2016 03:25:52 +0000 (20:25 -0700)]
Merge pull request #8298 from colemanw/CRM-18286
CRM-18286 - Use localStorage to remember datatable page length
Tim Otten [Sat, 21 May 2016 02:47:41 +0000 (19:47 -0700)]
Merge pull request #7825 from torrance/editable-button-fix-master
Ensure editable buttons don't sit underneath other page elements.
Tim Otten [Sat, 21 May 2016 02:16:32 +0000 (19:16 -0700)]
Merge pull request #8370 from eileenmcnaughton/groups
CRM-16642 group refresh code
Eileen McNaughton [Sat, 21 May 2016 01:52:24 +0000 (13:52 +1200)]
Merge pull request #8417 from seamuslee001/CRM-18504-47
CRM-18504 Add test for custom group that extends multiple subtype
Tim Otten [Sat, 21 May 2016 00:58:55 +0000 (17:58 -0700)]
Update sql/civicrm_generated.mysql
Tim Otten [Sat, 21 May 2016 00:40:56 +0000 (17:40 -0700)]
CRM-16642 - Simplify list of smart-group options
Using an option-group takes a lot of work. Also, it wasn't handling
consistently labels+descriptions (upgrade-vs-new install), and it isn't
really supported in the metadata for Setting API. And fundamentally this
list is not really editable by users.
Monish Deb [Fri, 20 May 2016 14:57:13 +0000 (20:27 +0530)]
Merge pull request #8415 from monishdeb/CRM-18159
CRM-18159: Mailings does not have an ACL restriction in place
Monish Deb [Fri, 20 May 2016 14:55:19 +0000 (20:25 +0530)]
Merge pull request #7587 from totten/master-jobproc-2m
CRM-17629 - JobProcessMailingTest - Test w/mailerBatchLimit & 2x mailings
Monish Deb [Fri, 20 May 2016 13:49:20 +0000 (19:19 +0530)]
Merge pull request #8416 from monishdeb/CRM-18322
CRM-18322: notice fix on participant search
Seamus Lee [Fri, 20 May 2016 11:31:12 +0000 (11:31 +0000)]
Convert test to having multiple custom groups separated by VALUE_SEPARATOR
Seamus Lee [Fri, 20 May 2016 11:15:55 +0000 (11:15 +0000)]
Fix undefined veriable
deb.monish [Fri, 20 May 2016 09:57:00 +0000 (15:27 +0530)]
additional fixes
Jaap Jansma [Thu, 12 May 2016 18:23:29 +0000 (20:23 +0200)]
CRM-18159 fixed styles issues and moved buildAcl to CRM_ACL_BAO_ACL
Jaap Jansma [Fri, 15 Apr 2016 13:01:36 +0000 (15:01 +0200)]
Fixed CRM-18159: master branch and sending test mail to group did not include an acl yet.
Seamus Lee [Fri, 20 May 2016 10:40:22 +0000 (10:40 +0000)]
Attempt to add test for custom group that extends multiple subtype
deb.monish [Fri, 20 May 2016 10:39:46 +0000 (16:09 +0530)]
CRM-18322: notice fix on participant search
Monish Deb [Fri, 20 May 2016 06:21:57 +0000 (11:51 +0530)]
Merge pull request #8366 from kenwest/CRM-18528-b
CRM-18528 Manage Groups search ignores filters
Yashodha Chaku [Fri, 20 May 2016 05:18:01 +0000 (10:48 +0530)]
Merge pull request #8349 from rajbdilip/CRM-18324
CRM-18324 - Fix tax divison by zero error on Event Dashboard
eileenmcnaugton [Fri, 20 May 2016 04:37:34 +0000 (16:37 +1200)]
CRM-18568 remove flawed tests.
After fixing the api to create option groups as enabled parts of this
test started to fail as it became clear they were only appearing to pass
(somewhat intermittantly) due to them bypassing checks due to the set up
issue. This commit disables those parts for now. State province & country
are
subject to a caching bug & LIKE on pseudoconstants has issues described
in CRM-18568
\1a
Eileen McNaughton [Fri, 20 May 2016 04:12:03 +0000 (16:12 +1200)]
Merge pull request #8413 from totten/master-ymdhis
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`
Tim Otten [Fri, 20 May 2016 00:54:32 +0000 (17:54 -0700)]
sql/GenerateData.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`
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`
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`
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`
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`
Tim Otten [Fri, 20 May 2016 00:48:28 +0000 (17:48 -0700)]
CRM-16642 - Compute timestamps using 24-hour clock
`Ymdhis` is silly here. Use `YmdHis`. This was causing test results to
vary based on they were run.
Tim Otten [Thu, 19 May 2016 23:09:23 +0000 (16:09 -0700)]
CRM-16642 - Rename `refreshCache` to `flushCache`
The old name is misleading about the outcome -- it does not end up producing
a 'fresh' cache. It produces an empty cache.
eileen [Tue, 17 May 2016 04:26:03 +0000 (16:26 +1200)]
CRM-16642 add further tests
Change-Id: I0804620359bf594d100ffcf74c638b94b012c584
eileen [Tue, 17 May 2016 03:56:16 +0000 (15:56 +1200)]
tidy up constant ref
Change-Id: Ie05c915f9a1841a6faf5654965399b5ed0bf62b6
eileen [Tue, 17 May 2016 01:05:23 +0000 (13:05 +1200)]
Add tests for Ensure OptionGroup exists fn & fix optionValueExists to accept ID
The option_group_id field accepts name or id so use that.
eileen [Mon, 16 May 2016 23:42:55 +0000 (11:42 +1200)]
CRM-18516 clarify that cache_date & refresh_date can be NULL (ie. when they have not been build).
Arguably refresh_date should be set to 'now' at this point but this doesn't change anything and that logic might be teased out more when we turn out eyes to the rebuild scripts
eileenmcnaugton [Mon, 16 May 2016 06:16:23 +0000 (18:16 +1200)]
Fix install portion of new option Group
eileenmcnaugton [Mon, 16 May 2016 04:54:55 +0000 (16:54 +1200)]
First caching test:
Change-Id: I2bc8de77ff063605b64042a2ed4dc6d5175e6f5d
eileenmcnaugton [Mon, 16 May 2016 03:51:05 +0000 (15:51 +1200)]
Preliminary tidy up on test class
eileenmcnaugton [Mon, 16 May 2016 02:06:56 +0000 (14:06 +1200)]
CRM-18516 add job for clearing of caches, separated from the rebuild job
eileenmcnaugton [Mon, 16 May 2016 01:44:58 +0000 (13:44 +1200)]
CRM-16642 Switch to opportunisticCacheRefresh calls.
There is one call left to the function called 'remove' which needs a little more consideration
eileenmcnaugton [Mon, 16 May 2016 01:25:03 +0000 (13:25 +1200)]
CRM-16642 add setting & functions for opportunistic vs deterministic cache clearing
eileenmcnaugton [Sun, 15 May 2016 23:18:27 +0000 (11:18 +1200)]
CRM-18142 fix use of uninidexed TIMESTAMPDIFF function
This removes function comparisons in favour of direct comparisons on cache date functions
eileen [Sat, 7 May 2016 23:18:10 +0000 (09:18 +1000)]
CRM-18516 Convert the date fields relating to group caching & acl caching timestamp
eileenmcnaugton [Sun, 15 May 2016 22:05:53 +0000 (10:05 +1200)]
Comment fixes & formatting
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
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
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.
Mattias Michaux [Thu, 19 May 2016 14:50:59 +0000 (16:50 +0200)]
Drasticly reduce memory usage during tests.
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
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…
eileen [Thu, 19 May 2016 05:11:06 +0000 (17:11 +1200)]
CRM-17123 - Include Transaction ID in membership bulk entry profile
deb.monish [Thu, 19 May 2016 10:56:01 +0000 (16:26 +0530)]
CRM-17123: add unit test
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
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 [Tue, 17 May 2016 20:56:28 +0000 (08:56 +1200)]
CRM-18539: Permit criteria for batch merging (other than group)
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.
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
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
JKingsnorth [Wed, 18 May 2016 12:04:54 +0000 (13:04 +0100)]
CRM-18526: Move upgrade code to 4.7.8
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 [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.
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.