Seamus Lee [Tue, 9 May 2017 21:54:29 +0000 (07:54 +1000)]
Add test of retriving multiple extensions and fix test for Jenkins
Seamus Lee [Tue, 9 May 2017 10:13:20 +0000 (20:13 +1000)]
Updates following review by Eileen including using get_options_from_params and adding an isset test to the ['key']
Seamus Lee [Tue, 9 May 2017 09:58:59 +0000 (19:58 +1000)]
CRM-20532 Fix issue where cannot get information on a single extension with extension.get api and ensure that Fields specified in return key are supported
colemanw [Tue, 9 May 2017 00:08:24 +0000 (20:08 -0400)]
Merge pull request #10318 from seamuslee001/CRM-20537
CRM-20537 Make the case_id, contact_id index on civicrm_case_contact …
Seamus Lee [Mon, 8 May 2017 21:42:34 +0000 (07:42 +1000)]
CRM-20537 Make the case_id, contact_id index on civicrm_case_contact unique following check with Coleman
Eileen McNaughton [Mon, 8 May 2017 20:25:05 +0000 (08:25 +1200)]
Merge pull request #10317 from jitendrapurohit/CRM-15984
Fix CRM-15984: "Add campaign field on Email activity form"
Jitendra Purohit [Mon, 8 May 2017 11:54:04 +0000 (17:24 +0530)]
minor fix
Allen Shaw [Wed, 25 Jan 2017 18:13:27 +0000 (12:13 -0600)]
Fix CRM-15984: "Add campaign field on Email activity form"
Eileen McNaughton [Sat, 6 May 2017 20:32:12 +0000 (08:32 +1200)]
Merge pull request #10313 from JMAConsulting/CRM-20530
CRM-20530: bookkeeping report at fails at credit card name filter
deb.monish [Sat, 6 May 2017 18:30:16 +0000 (00:00 +0530)]
CRM-20530: bookkeeping report at fails at credit card name filter
Eileen McNaughton [Sat, 6 May 2017 08:29:32 +0000 (20:29 +1200)]
Merge pull request #10307 from lcdservices/CRM-20526
CRM-20526 include currency in contrib recent items list
Eileen McNaughton [Sat, 6 May 2017 08:26:02 +0000 (20:26 +1200)]
Merge pull request #10311 from JMAConsulting/CRM-20530
CRM-20530: Bookkeeping transaction report fails at acct credit filter
Eileen McNaughton [Sat, 6 May 2017 08:25:39 +0000 (20:25 +1200)]
Merge pull request #10309 from totten/master-cv
APIExplorer - Add cv and hyperlinks
Eileen McNaughton [Sat, 6 May 2017 08:24:02 +0000 (20:24 +1200)]
Merge pull request #10312 from seamuslee001/template_upgrade_stable
NFC Add in function to check if Foreign key is there to make upgrade …
Eileen McNaughton [Sat, 6 May 2017 08:21:45 +0000 (20:21 +1200)]
Merge pull request #10310 from JMAConsulting/CRM-20527
CRM-20527: batch data entry does not retain currency
Seamus Lee [Sat, 6 May 2017 06:50:18 +0000 (16:50 +1000)]
Add in Upgrade helper function and change style as per comments from Eileen
Seamus Lee [Sat, 6 May 2017 03:02:35 +0000 (13:02 +1000)]
NFC Add in function to check if Foreign key is there to make upgrade more stable
deb.monish [Sat, 6 May 2017 02:28:31 +0000 (07:58 +0530)]
CRM-20530: Bookkeeping transaction report fails at acct credit filter
deb.monish [Sat, 6 May 2017 02:01:38 +0000 (07:31 +0530)]
CRM-20527: batch data entry does not retain currency
Tim Otten [Fri, 5 May 2017 21:20:06 +0000 (16:20 -0500)]
APIExplorer - Hyperlinks for CLI tools
Tim Otten [Fri, 5 May 2017 20:59:15 +0000 (15:59 -0500)]
APIExplorer - Display cv
Brian Shaughnessy [Fri, 5 May 2017 02:09:09 +0000 (22:09 -0400)]
CRM-20526 include currency in contrib recent items list
Tim Otten [Thu, 4 May 2017 21:41:46 +0000 (16:41 -0500)]
Merge pull request #10300 from civicrm/4.7.19-rc
Merge forward (4.7.19-rc => master)
Monish Deb [Thu, 4 May 2017 12:13:37 +0000 (17:43 +0530)]
Merge pull request #10295 from eileenmcnaughton/tpl
Towards CRM-20037 edit template to be more flexible.
eileen [Wed, 3 May 2017 11:17:48 +0000 (23:17 +1200)]
Towards CRM-20037 edit template to be more flexible.
This commit changes the way the Selector.tpl is structured to be 'driven' by the array,
meaning that if people alter the order, or the array, their changes are more easily reflected in the tpl.
I've kind of ignored the soft credit fields but this does set a direction for setting them in
and not having special handling in the tpl - ie. replace {if }
with columnHeader wrangling
Tim Otten [Thu, 4 May 2017 06:44:15 +0000 (01:44 -0500)]
distmaker/utils/repo-report.php - Fix style. Add Joomla and D8.
Monish Deb [Thu, 4 May 2017 05:35:53 +0000 (11:05 +0530)]
Merge pull request #10294 from eileenmcnaughton/recur
CRM-20513 Fix recur status update & et next recur date based on payme…
colemanw [Thu, 4 May 2017 05:15:24 +0000 (01:15 -0400)]
Merge pull request #10264 from jitendrapurohit/CRM-20171
CRM-20171: Use loadXML() instead of load() for reading xml files.
colemanw [Thu, 4 May 2017 04:56:03 +0000 (00:56 -0400)]
Merge pull request #10152 from agh1/crm-20419
CRM-20419 jQuery.isEmptyObject misused
Eileen McNaughton [Wed, 3 May 2017 17:57:26 +0000 (05:57 +1200)]
Merge pull request #10296 from JMAConsulting/CRM-20515
CRM-20515: otice errors on dmaster for add petition
Monish Deb [Wed, 3 May 2017 15:38:33 +0000 (21:08 +0530)]
Merge pull request #10192 from jitendrapurohit/CRM-20452
CRM-20452: Fatal Error on saving Organisation Info when geocoding is …
deb.monish [Wed, 3 May 2017 15:28:15 +0000 (20:58 +0530)]
CRM-20515: otice errors on dmaster for add petition
Jitendra Purohit [Tue, 2 May 2017 12:39:34 +0000 (18:09 +0530)]
replace load with loadXML()
eileen [Tue, 27 Sep 2016 02:37:36 +0000 (15:37 +1300)]
CRM-20513 Fix recur status update & et next recur date based on payment date not current date.
The code to set a recurring sequence to Completed when all contributions received turned out
to be flawed. This fixes that.
This commit extends the test on how dates are being extended. I didn't replicate the problem
I was expecting to see but it makes sense that recurring transactions could be imported on
a different day to the current one and that date is the important one
Eileen McNaughton [Wed, 3 May 2017 06:05:07 +0000 (18:05 +1200)]
Merge pull request #10293 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Wed, 3 May 2017 05:56:44 +0000 (17:56 +1200)]
Merge pull request #10245 from agh1/4.7.19-releasenotes
4.7.19 release notes
Andrew Hunt [Wed, 3 May 2017 05:18:38 +0000 (01:18 -0400)]
4.7.19 release notes: oops bullet point!
Andrew Hunt [Wed, 3 May 2017 05:15:29 +0000 (01:15 -0400)]
4.7.19 release notes: updated contributors
Andrew Hunt [Wed, 3 May 2017 04:44:44 +0000 (00:44 -0400)]
4.7.19 release notes: finished issues
Eileen McNaughton [Wed, 3 May 2017 02:14:48 +0000 (14:14 +1200)]
Merge pull request #10292 from eileenmcnaughton/dep
Up the deprecation on old hook
Eileen McNaughton [Wed, 3 May 2017 02:11:56 +0000 (14:11 +1200)]
Merge pull request #10012 from agh1/crm-20297
CRM-20297 Display contribution having line items with no price set
eileen [Wed, 3 May 2017 01:26:04 +0000 (13:26 +1200)]
Up the deprecation on old hook
Eileen McNaughton [Tue, 2 May 2017 21:27:33 +0000 (09:27 +1200)]
Merge pull request #10269 from eileenmcnaughton/uffield
CRM-20474 update UFField form to use api.
Tim Otten [Tue, 2 May 2017 05:40:22 +0000 (22:40 -0700)]
Merge pull request #10290 from civicrm/4.7.19-rc
Merge forward (4.7.19-rc => master)
Tim Otten [Tue, 2 May 2017 04:26:12 +0000 (21:26 -0700)]
Merge pull request #10289 from totten/4.7.19-newmailing
CRM-20316 - Fix "New Mailing" regression. `subject` should not be required.
Tim Otten [Tue, 2 May 2017 03:12:32 +0000 (20:12 -0700)]
CRM-20316 - Fix "New Mailing" regression. Update tests.
`testWithoutParam_create()` asserts that *generally* you need to provide
some params to create a record. This was true for Mailings in <=4.7.18
because `create_id` was required. The main goal of
a98504a72 was to make
`created_id` optional, which actually meant that *no data* would be
required (making `testWithoutParam_create()` non-applicable/inaccurate.
(This was obscured at the time because
a98504a72 simultaneously made
`subject` mandatory, but that led to the regression in "New Mailing". Since
neither `created_id` nor `subject` is required... there's nothing left to
be required. The correct behavior is to skip `testWithoutParam_create()`
for mailings.)
Tim Otten [Tue, 2 May 2017 02:01:41 +0000 (19:01 -0700)]
CRM-20316 - Fix "New Mailing" regression. `subject` should not be required.
When you navigate to "New Mailing" (`civicrm/a/#/mailing/new`) in the UI, it
crashes on a white-screen. Inspecting the console shows that the call to
`Mailing.create` is failing because `subject` is missing. But at this point
we're only creating a *draft* mailing -- so you don't have or need a
fully-formed mailing yet.
Andrew Hunt [Tue, 25 Apr 2017 19:55:54 +0000 (15:55 -0400)]
4.7.19 release notes: formatting and links from main list
Andrew Hunt [Tue, 2 May 2017 01:07:24 +0000 (21:07 -0400)]
4.7.19 release notes: updated from script
Eileen McNaughton [Tue, 2 May 2017 00:44:01 +0000 (12:44 +1200)]
Merge pull request #10285 from JMAConsulting/IIDA-108-2
CRM-20392: remove cruft code and added unit test
colemanw [Mon, 1 May 2017 16:36:01 +0000 (12:36 -0400)]
Merge pull request #10281 from agh1/crm-20478
Fixes to activity display in case timeline
Andrew Hunt [Mon, 1 May 2017 15:19:05 +0000 (11:19 -0400)]
CRM-20478 Case type: test missing activity types for lookup
Pradeep Nayak [Sat, 29 Apr 2017 09:28:39 +0000 (14:58 +0530)]
CRM-20392: remove cruft code and add unit test
Eileen McNaughton [Sun, 30 Apr 2017 21:14:20 +0000 (09:14 +1200)]
Merge pull request #10287 from eileenmcnaughton/master
comment possible breakage from CRM-16460
eileen [Sun, 30 Apr 2017 01:20:16 +0000 (13:20 +1200)]
comment possible breakage from CRM-16460
I only saw this breakage in a test, but speculate that config-dependent it would affect people.
Have added comments to help anyone who actually does hit it
Eileen McNaughton [Sun, 30 Apr 2017 01:17:57 +0000 (13:17 +1200)]
Merge pull request #10286 from eileenmcnaughton/master
Fix test cleanup to turn tax & invoicing off after the test.
eileen [Sun, 30 Apr 2017 00:31:32 +0000 (12:31 +1200)]
Fix test cleanup to turn tax & invoicing off after the test.
Also one typo fix (QAd from another patch)
Eileen McNaughton [Sat, 29 Apr 2017 23:00:57 +0000 (11:00 +1200)]
Merge pull request #10283 from eileenmcnaughton/master
Merge 4.7.19-rc to master
Eileen McNaughton [Sat, 29 Apr 2017 03:17:00 +0000 (15:17 +1200)]
Merge pull request #10271 from eileenmcnaughton/tidy
CRM-20392 (IIDA-108), Fixed submit Credit Card transaction for partia…
eileen [Sat, 29 Apr 2017 02:40:52 +0000 (14:40 +1200)]
Merge branch '4.7.19-rc' of https://github.com/civicrm/civicrm-core
eileen [Sat, 29 Apr 2017 02:40:36 +0000 (14:40 +1200)]
Merge commit '
fd6277c70f95fac'
Eileen McNaughton [Sat, 29 Apr 2017 02:37:34 +0000 (14:37 +1200)]
Merge pull request #10282 from eileenmcnaughton/4.7.19-rc
Fix spelling.
eileen [Sat, 29 Apr 2017 02:37:00 +0000 (14:37 +1200)]
Fix spelling.
I need a commit after the commit-to-be-skipped to fix the merge, so this is it
Eileen McNaughton [Sat, 29 Apr 2017 02:31:16 +0000 (14:31 +1200)]
Merge pull request #10280 from eileenmcnaughton/4.7.19-rc
CRM-20481 temporarily switch back while we assess / fix performance.
Eileen McNaughton [Sat, 29 Apr 2017 02:30:39 +0000 (14:30 +1200)]
Merge pull request #10273 from eileenmcnaughton/activity
CRM-19821 set activity_status_id to 'export'
deb.monish [Sat, 29 Apr 2017 02:23:32 +0000 (14:23 +1200)]
CRM-20392 (IIDA-108), Fixed submit Credit Card transaction for partially paid contribution
Andrew Hunt [Sat, 29 Apr 2017 02:10:18 +0000 (22:10 -0400)]
CRM-20478 Case type: translate newest & oldest
Andrew Hunt [Sat, 29 Apr 2017 01:46:47 +0000 (21:46 -0400)]
CRM-20478 Case type: timeline displayed activity type and status names
rather than labels
eileen [Fri, 28 Apr 2017 22:25:31 +0000 (10:25 +1200)]
CRM-20481 temporarily switch back while we assess / fix performance.
We have been seeing performance issues with the use of the api for the dashboard. This is a back-out so
we can figure that out before re-adding. Note this should not be merged to master as there are
commits that 'add up to this' in master. There has been some git mistake this round :-(
I'll figure out how to exclude
Tim Otten [Fri, 28 Apr 2017 22:04:04 +0000 (15:04 -0700)]
Merge branch '4.7.19-rc-new' into master-new
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments
colemanw [Fri, 28 Apr 2017 16:06:19 +0000 (12:06 -0400)]
Merge pull request #10278 from JMAConsulting/CRM-20498
CRM-20498, removed code from run() since its been invoked in parent f…
Andrew Hunt [Fri, 28 Apr 2017 14:51:03 +0000 (10:51 -0400)]
CRM-20478 Case type timeline: restore list of activity types
Pradeep Nayak [Fri, 28 Apr 2017 14:29:34 +0000 (19:59 +0530)]
CRM-20498, removed code from run() since its been invoked in parent function
----------------------------------------
* CRM-20498: buildform hook invoked twice
https://issues.civicrm.org/jira/browse/CRM-20498
Saurabh Batra [Thu, 27 Apr 2017 23:34:06 +0000 (11:34 +1200)]
CRM-20474 update UFField form to use api.
This removes the UFField::Add function, only called from the form & create. Create it still pretty jumbled, but all
in one place now
Jitendra Purohit [Thu, 27 Apr 2017 11:10:42 +0000 (16:40 +0530)]
CRM-20171: avoid warning while loading external entity
Eileen McNaughton [Fri, 28 Apr 2017 04:07:48 +0000 (16:07 +1200)]
Merge pull request #10275 from eileenmcnaughton/4.7.19-rc
4.7.19 rc
eileen [Fri, 28 Apr 2017 03:10:21 +0000 (15:10 +1200)]
CRM-19821 set activity_status_id to 'export'
Export is a kind of weird & wonderful setting that is undocumented. It affects
whether fields are available by default in export & search, sometimes.
Generally I would say all 'user facing fields' should be set to export or somewhere
or other we will wind up hacking around it. I recently removed a lot
of code for payment_instrument_id that was just compensating for this var being
false rather than true.
eileen [Fri, 28 Apr 2017 01:27:36 +0000 (13:27 +1200)]
CRM-20493 Payment instrument id is incorrectly a required field for online additional payments
Eileen McNaughton [Fri, 28 Apr 2017 00:17:45 +0000 (12:17 +1200)]
Merge pull request #10236 from eileenmcnaughton/uffield
CRM-20474 Refactor UFField api to be standardised
Eileen McNaughton [Thu, 27 Apr 2017 23:24:56 +0000 (11:24 +1200)]
Merge pull request #10268 from eileenmcnaughton/master
Fix merge conflict
eileen [Thu, 27 Apr 2017 23:24:15 +0000 (11:24 +1200)]
Fix merge conflict
Saurabh Batra [Thu, 27 Apr 2017 22:41:10 +0000 (10:41 +1200)]
Towards CRM-20474 Refactor UFField api to be standardised - move functionality to BAO::create
Saurabh Batra [Thu, 27 Apr 2017 22:34:10 +0000 (10:34 +1200)]
Minor tidy ups.
Fix comments. Remove unused function. The function has a mismatch between input & parameter so can never work
Eileen McNaughton [Thu, 27 Apr 2017 22:24:08 +0000 (10:24 +1200)]
Merge pull request #10266 from civicrm/4.7.19-rc
4.7.19 rc
Eileen McNaughton [Thu, 27 Apr 2017 22:23:59 +0000 (10:23 +1200)]
Merge branch 'master' into 4.7.19-rc
Eileen McNaughton [Thu, 27 Apr 2017 22:10:42 +0000 (10:10 +1200)]
Merge pull request #10261 from eileenmcnaughton/activitybackout
CRM-20481 temporarily switch back while we assess / fix performance i…
eileen [Thu, 27 Apr 2017 08:53:17 +0000 (20:53 +1200)]
CRM-20481 temporarily switch back while we assess / fix performance
Eileen McNaughton [Thu, 27 Apr 2017 20:57:47 +0000 (08:57 +1200)]
Merge pull request #10263 from eileenmcnaughton/case
Remove unused var. emailActivityTypeIDs is retrieved twice, statusTit…
Eileen McNaughton [Thu, 27 Apr 2017 20:49:37 +0000 (08:49 +1200)]
Merge pull request #10259 from eileenmcnaughton/caserc
CRM-20424 remove call to deprecated function.
Monish Deb [Thu, 27 Apr 2017 11:50:04 +0000 (17:20 +0530)]
Merge pull request #10235 from eileenmcnaughton/follow_on
CRM-20276 update line item financial amount when updating line item.
deb.monish [Thu, 27 Apr 2017 11:42:11 +0000 (17:12 +0530)]
minor change
eileen [Thu, 27 Apr 2017 10:27:52 +0000 (22:27 +1200)]
Remove unused var. emailActivityTypeIDs is retrieved twice, statusTitle never used
eileen [Wed, 26 Apr 2017 23:37:45 +0000 (11:37 +1200)]
CRM-20424 remove call to deprecated function.
This is the one covering the UI with errors. The fact it did not cause any test fails means it is
not covered by unit tests :-(.
As long as the Open Case link is still present for CiviCase users this is working
eileen [Wed, 15 Mar 2017 10:52:13 +0000 (23:52 +1300)]
CRM-20276 update line item financial amount when updating line item.
We don't have to leave the e-notice in, but I suspect that line is never called & it would be good
to figure that out rather than leave it 'in case', hence the enotice
Eileen McNaughton [Thu, 27 Apr 2017 00:13:00 +0000 (12:13 +1200)]
Merge pull request #10257 from JMAConsulting/CRM-20308
CRM-20308: Document the new behaivour under help icon
Eileen McNaughton [Wed, 26 Apr 2017 21:15:19 +0000 (09:15 +1200)]
Merge pull request #10124 from adixon/CRM-20396
CRM-20396 Corrected payment_processor in contrib params
deb.monish [Wed, 26 Apr 2017 18:14:42 +0000 (23:44 +0530)]
added unit test
adixon [Thu, 6 Apr 2017 21:41:45 +0000 (17:41 -0400)]
CRM-20396 Corrected payment_processor in contrib params
deb.monish [Wed, 26 Apr 2017 14:14:33 +0000 (19:44 +0530)]
CRM-20308: Document the new behaivour under help icon