Coleman Watts [Thu, 8 Oct 2015 01:38:41 +0000 (21:38 -0400)]
CRM-16725 - Remove global download behavior from popups
It was problematic to have the button change run globally.
Now it's just in the spot that needs it.
If other spots need something similar it would be good to find a way to reuse the code.
Coleman Watts [Tue, 6 Oct 2015 00:56:34 +0000 (20:56 -0400)]
CRM-16725 - Change preview button label/icon
Dave Greenberg [Sat, 3 Oct 2015 20:09:15 +0000 (16:09 -0400)]
CRM-16725 - Add Preview PDF button to PDF Letter task so users can review PDF without creating activity.
----------------------------------------
* CRM-16725:
https://issues.civicrm.org/jira/browse/CRM-16725
Coleman Watts [Wed, 7 Oct 2015 18:51:50 +0000 (14:51 -0400)]
Merge branch 4.6 into master
Conflicts:
sql/civicrm_generated.mysql
xml/version.xml
colemanw [Wed, 7 Oct 2015 18:49:25 +0000 (14:49 -0400)]
Merge pull request #6910 from colemanw/pdf
Fix template checkboxes in Print PDF form
Coleman Watts [Wed, 7 Oct 2015 18:41:55 +0000 (14:41 -0400)]
Fix template checkboxes in Print PDF form
Dave Greenberg [Wed, 7 Oct 2015 17:19:51 +0000 (10:19 -0700)]
Merge pull request #6866 from eileenmcnaughton/CRM-17318
CRM-17318 add getPaymentDescript to Core_Payment class …
CiviCRM [Wed, 7 Oct 2015 12:58:14 +0000 (05:58 -0700)]
Update version to 4.6.10
Kurund Jalmi [Wed, 7 Oct 2015 11:27:15 +0000 (12:27 +0100)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-10-07-14-23-03
Conflicts:
CRM/Contribute/BAO/Contribution.php
CRM/Core/Payment/BaseIPN.php
CRM/Extension/Manager/Payment.php
CRM/Upgrade/Incremental/sql/4.6.6.mysql.tpl
README.txt
sql/civicrm_generated.mysql
templates/CRM/common/success.tpl
tests/phpunit/CRM/Contact/Import/Parser/ContactTest.php
Monish Deb [Wed, 7 Oct 2015 09:21:45 +0000 (14:51 +0530)]
Merge pull request #6908 from jitendrapurohit/CRM-17348
CRM-17348 - add Advcheckbox in addfield()
Yashodha Chaku [Wed, 7 Oct 2015 08:17:04 +0000 (13:47 +0530)]
Merge pull request #6869 from seamuslee001/CRM-17309_master
CRM-17309 Classify no MX record bounce pattern as a DNS Bounce
jitendrapurohit [Wed, 7 Oct 2015 07:29:43 +0000 (12:59 +0530)]
fix for enable/disable relationship
jitendrapurohit [Wed, 7 Oct 2015 07:18:22 +0000 (12:48 +0530)]
minor fix
jitendrapurohit [Wed, 7 Oct 2015 06:51:30 +0000 (12:21 +0530)]
CRM-17348 - add Advcheckbox in addfield()
colemanw [Wed, 7 Oct 2015 01:35:29 +0000 (21:35 -0400)]
Merge pull request #6549 from pradpnayak/CRM-16620
--CRM-16620, replaced 'nothing' to NULL
colemanw [Wed, 7 Oct 2015 01:03:28 +0000 (21:03 -0400)]
Merge pull request #6533 from BorislavZlatanov/patch-1
Skip loop iteration if 'element_name' field is not set
colemanw [Wed, 7 Oct 2015 00:46:15 +0000 (20:46 -0400)]
Merge pull request #6882 from eileenmcnaughton/CRM-17334
CRM-17334 ensure installments is passed to membership rocessing if set
colemanw [Wed, 7 Oct 2015 00:41:08 +0000 (20:41 -0400)]
Merge pull request #6902 from colemanw/CRM-13823
CRM-13823 - Add php version check
colemanw [Wed, 7 Oct 2015 00:38:32 +0000 (20:38 -0400)]
Merge pull request #6835 from seamuslee001/CRM-17075
CRM-17075 fix searching on membership type as entity reference in adv…
colemanw [Wed, 7 Oct 2015 00:36:34 +0000 (20:36 -0400)]
Merge pull request #6897 from jitendrapurohit/CRMtestfixes
4.6 - CRM Test Fixes
Dave Greenberg [Wed, 7 Oct 2015 00:36:25 +0000 (17:36 -0700)]
Merge pull request #6887 from davecivicrm/CRM-14898
CRM-14898 - Modify action links on membership selector to make it eas…
colemanw [Wed, 7 Oct 2015 00:35:11 +0000 (20:35 -0400)]
Merge pull request #6899 from colemanw/crmDatepicker
crmDatepicker fixes and documentation
colemanw [Wed, 7 Oct 2015 00:05:16 +0000 (20:05 -0400)]
Merge pull request #6875 from colemanw/CRM-17323
CRM-17323 - Add sid token to registration/membership links
Dave Greenberg [Wed, 7 Oct 2015 00:01:23 +0000 (17:01 -0700)]
CRM-14898 - Webtest fixes for action link change.
----------------------------------------
* CRM-14898: Take "Renew" out of More or make it more prominent somehow
https://issues.civicrm.org/jira/browse/CRM-14898
Dave Greenberg [Tue, 6 Oct 2015 23:58:55 +0000 (16:58 -0700)]
Merge pull request #6431 from JMAConsulting/CRM-16526
Crm 16526
colemanw [Tue, 6 Oct 2015 21:26:46 +0000 (17:26 -0400)]
Merge pull request #6853 from eileenmcnaughton/CRM-17256-46
CRM-17256 populate created_id on report creation
Dave Greenberg [Tue, 6 Oct 2015 19:15:19 +0000 (12:15 -0700)]
Merge pull request #6904 from davecivicrm/CRM-17344
CRM-17344 - Fix footer button markup in Manage Reports Template.
Dave Greenberg [Tue, 6 Oct 2015 19:14:14 +0000 (12:14 -0700)]
CRM-17344 - Fix footer button markup in Manage Reports Template.
----------------------------------------
* CRM-17344: buttons without text on Manage Reports page
https://issues.civicrm.org/jira/browse/CRM-17344
Dave Greenberg [Tue, 6 Oct 2015 19:02:19 +0000 (12:02 -0700)]
Merge pull request #6889 from davecivicrm/CRM-17175
CRM-17175 - Support passing of custom field value in force mode to Ac…
Dave Greenberg [Tue, 6 Oct 2015 18:59:40 +0000 (11:59 -0700)]
Merge pull request #6891 from davecivicrm/CRM-17340
CRM-17340 - Fix handling of Amount label for back-office quick config…
Dave Greenberg [Tue, 6 Oct 2015 18:55:44 +0000 (11:55 -0700)]
Merge pull request #6893 from seamuslee001/CRM-17341
CRM-17341 Include Hold date in the display of Emails on contact records to show…
colemanw [Tue, 6 Oct 2015 18:55:40 +0000 (14:55 -0400)]
Merge pull request #6903 from colemanw/CRM-14748
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:46:07 +0000 (14:46 -0400)]
CRM-14748 - Clarify rest url in api explorer
Coleman Watts [Tue, 6 Oct 2015 18:42:01 +0000 (14:42 -0400)]
CRM-13823 - Add php version check
colemanw [Tue, 6 Oct 2015 18:34:12 +0000 (14:34 -0400)]
Merge pull request #6883 from eileenmcnaughton/CRM-17355
CRM-17335 toward eliminating use of leaky static
colemanw [Tue, 6 Oct 2015 18:26:05 +0000 (14:26 -0400)]
Merge pull request #6806 from colemanw/CRM-16980
CRM-16980 - Improve case role handing
Coleman Watts [Tue, 6 Oct 2015 16:42:00 +0000 (12:42 -0400)]
Update civicrm.org links to use https
Coleman Watts [Tue, 6 Oct 2015 13:44:45 +0000 (09:44 -0400)]
CRM-16907 - Preserve other links in the help menu
Coleman Watts [Tue, 6 Oct 2015 13:40:53 +0000 (09:40 -0400)]
crmDatepicker fixes and documentation
jitendrapurohit [Tue, 6 Oct 2015 10:19:41 +0000 (15:49 +0530)]
minor changes
jitendrapurohit [Tue, 6 Oct 2015 10:08:51 +0000 (15:38 +0530)]
4.6 - CRM Test Fixes
Kurund Jalmi [Tue, 6 Oct 2015 06:38:48 +0000 (12:08 +0530)]
Merge pull request #6890 from monishdeb/46merge
4.6.9 merge-forward
Seamus Lee [Tue, 6 Oct 2015 03:23:50 +0000 (03:23 +0000)]
Include Hold date in the display of Emails on contact records to show when the address was put on hold
Dave Greenberg [Mon, 5 Oct 2015 23:15:53 +0000 (16:15 -0700)]
Merge pull request #6880 from eileenmcnaughton/CRM-17329
CRM-17329 fix over-zealous setting of recurring and add unit test
Eileen McNaughton [Mon, 5 Oct 2015 22:56:21 +0000 (11:56 +1300)]
Merge pull request #6870 from eileenmcnaughton/CRM-17234
CRM-17324 Log upgrade steps
Dave Greenberg [Mon, 5 Oct 2015 22:03:14 +0000 (15:03 -0700)]
Merge pull request #6886 from jaapjansma/CRM-17338
Fixed #CRM-17338
Dave Greenberg [Mon, 5 Oct 2015 21:11:35 +0000 (14:11 -0700)]
CRM-17340 - Fix handling of Amount label for back-office quick config contributions.
----------------------------------------
* CRM-17340: Fix unexpected values stored in total_amount field for default price set
https://issues.civicrm.org/jira/browse/CRM-17340
Eileen McNaughton [Mon, 5 Oct 2015 20:56:46 +0000 (09:56 +1300)]
Merge pull request #6812 from eileenmcnaughton/CRM-17075
CRM-17075 further fix to using entity reference for membership_type_i…
Dave Greenberg [Mon, 5 Oct 2015 20:35:27 +0000 (13:35 -0700)]
CRM-17175 - Support passing of custom field value in force mode to Activity Search.
----------------------------------------
* CRM-17175: Enable search activity by custom fields in force mode
https://issues.civicrm.org/jira/browse/CRM-17175
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix
----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "
This reverts commit
1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query
eileen [Thu, 1 Oct 2015 23:56:47 +0000 (12:56 +1300)]
CRM-17326 add isset check to timezone retrieval
This addresses an e-notice
Change-Id: I82d3314bc2e28cca64ec9f4ed4d64477c50b7303
Adam Roses Wight [Thu, 1 Oct 2015 08:50:24 +0000 (01:50 -0700)]
CRM-17322 output upgrade as text
This adds the 'text' array to the output params. There is a patch in drush to
print this rather than the html. wp-cli could do with such a patch too but out-of-scope here
Change-Id: Ib8ea9a2e056e225904cb96b2d0de815148ad3f8b
Guanhuan Chen [Thu, 1 Oct 2015 12:18:15 +0000 (13:18 +0100)]
Add unit test for createCreditNoteId
Guanhuan Chen [Thu, 1 Oct 2015 12:17:39 +0000 (13:17 +0100)]
Add credit note id if a contribution is created with cancelled/refunded status
Guanhuan Chen [Thu, 1 Oct 2015 11:46:28 +0000 (12:46 +0100)]
Refactor redundant code with reusable function
Guanhuan Chen [Tue, 29 Sep 2015 16:54:27 +0000 (17:54 +0100)]
Generate a sequential credit note id when a contribution is cancelled or refunded
Guanhuan Chen [Tue, 29 Sep 2015 15:59:41 +0000 (16:59 +0100)]
Fix credit note sequence issue
eileenmcnaugton [Wed, 30 Sep 2015 10:19:50 +0000 (23:19 +1300)]
CRM-17311 wrap call to watchdog in function_exists
Coleman Watts [Tue, 29 Sep 2015 00:22:33 +0000 (20:22 -0400)]
Fix test failures
Coleman Watts [Sun, 27 Sep 2015 18:28:14 +0000 (14:28 -0400)]
Add unit tests for CRM_Utils_Type
Dave Greenberg [Mon, 5 Oct 2015 18:10:45 +0000 (11:10 -0700)]
Merge pull request #6781 from monishdeb/CRM-17067
CRM-17067 fix
Dave Greenberg [Mon, 5 Oct 2015 18:05:27 +0000 (11:05 -0700)]
Merge pull request #6871 from eileenmcnaughton/CRM-17326
CRM-17326 add isset check to timezone retrieval
Dave Greenberg [Mon, 5 Oct 2015 17:58:23 +0000 (10:58 -0700)]
CRM-17175 - Support passing of custom field value in force mode to Activity Search.
----------------------------------------
* CRM-17175: Enable search activity by custom fields in force mode
https://issues.civicrm.org/jira/browse/CRM-17175
Monish Deb [Mon, 5 Oct 2015 17:24:51 +0000 (22:54 +0530)]
Merge pull request #6884 from yashodha/CRM-17328
CRM-17328: Almost all sample dashlet reports are broken
Dave Greenberg [Mon, 5 Oct 2015 17:21:01 +0000 (10:21 -0700)]
Merge pull request #6843 from guanhuan/creditnote-id-sequence
Fix credit note sequence issue
Dave Greenberg [Mon, 5 Oct 2015 17:15:22 +0000 (10:15 -0700)]
Merge pull request #6876 from davecivicrm/CRM-17292
CRM-17292 - Fix default permissions on Contact Reports. Should be vie…
Jaap Jansma [Mon, 5 Oct 2015 14:04:39 +0000 (16:04 +0200)]
Fixed #CRM-17338
yashodha [Mon, 5 Oct 2015 08:35:17 +0000 (14:05 +0530)]
CRM-17328: Almost all sample dashlet reports are broken
----------------------------------------
* CRM-17328: Almost all 'sample' dashlet reports are broken
https://issues.civicrm.org/jira/browse/CRM-17328
eileenmcnaugton [Mon, 5 Oct 2015 04:55:40 +0000 (17:55 +1300)]
CRM-17335 toward eliminating use of leaky static
(note this is an ongoing thing - I'm not pro-actively tackling these ATM)
monishdeb [Mon, 5 Oct 2015 04:54:41 +0000 (10:24 +0530)]
Relationship count fix
eileenmcnaugton [Mon, 5 Oct 2015 04:28:13 +0000 (17:28 +1300)]
CRM-17334 ensure installments is passed to membership rocessing if set
(It could be set by a hook)
eileenmcnaugton [Sun, 4 Oct 2015 08:28:45 +0000 (21:28 +1300)]
CRM-17329 fix over-zealous setting of recurring and add unit test
Tim Otten [Sat, 3 Oct 2015 21:03:27 +0000 (17:03 -0400)]
Merge pull request #6878 from totten/master-upgstg
CRM-17330 - Fix upgrade of `disable_core_css` setting
Dave Greenberg [Sat, 3 Oct 2015 18:38:45 +0000 (14:38 -0400)]
CRM-14898 - Modify action links on membership selector to make it easier to find Renew action.
----------------------------------------
* CRM-14898:
https://issues.civicrm.org/jira/browse/CRM-14898
Coleman Watts [Sat, 3 Oct 2015 17:53:22 +0000 (13:53 -0400)]
CRM-17323 - Store site id in settings
Tim Otten [Sat, 3 Oct 2015 14:36:07 +0000 (10:36 -0400)]
CRM-17330 - Fix upgrade of `disable_core_css` setting
Dave Greenberg [Sat, 3 Oct 2015 02:22:27 +0000 (22:22 -0400)]
CRM-17292 - Fix default permissions on Contact Reports. Should be view all contacts, NOT administer CiviCRM.
----------------------------------------
* CRM-17292: Contact Reports incorrectly requires 'administer reports' permission
https://issues.civicrm.org/jira/browse/CRM-17292
Coleman Watts [Sat, 3 Oct 2015 02:03:19 +0000 (22:03 -0400)]
Fix html escaping of external menu links
Dave Greenberg [Sat, 3 Oct 2015 02:02:55 +0000 (22:02 -0400)]
Merge pull request #6874 from PalanteJon/CRM-17241
CRM-17241 - modify template and PHP for membership renewal to support…
Seamus Lee [Sat, 3 Oct 2015 02:00:41 +0000 (02:00 +0000)]
Fix Syntax Error Found by Dave
Coleman Watts [Sat, 3 Oct 2015 01:29:27 +0000 (21:29 -0400)]
CRM-17323 - Add sid token to registration/membership links
Eileen McNaughton [Sat, 3 Oct 2015 00:56:22 +0000 (13:56 +1300)]
Merge pull request #6867 from saurabhbatra96/comment-fixes
Comment fixes for CRM/Mailing/ and CRM/Report/Page directories.
monishdeb [Mon, 21 Sep 2015 14:39:14 +0000 (20:09 +0530)]
Revert CRM-17067 fix
----------------------------------------
* CRM-17067: New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
monishdeb [Mon, 21 Sep 2015 14:17:36 +0000 (19:47 +0530)]
minor change
monishdeb [Mon, 21 Sep 2015 13:49:45 +0000 (19:19 +0530)]
Revert "revert CRM-16711 fix "
This reverts commit
1ca927cc816b21e779ebc0e9e5e2dd3bd275debd.
monishdeb [Wed, 26 Aug 2015 06:00:20 +0000 (11:30 +0530)]
format fixes
monishdeb [Wed, 26 Aug 2015 05:28:02 +0000 (10:58 +0530)]
CRM-17067 fix - New relationship permission enforcement has result to related membership not created via public pages
https://issues.civicrm.org/jira/browse/CRM-17067
Coleman Watts [Fri, 2 Oct 2015 20:04:15 +0000 (16:04 -0400)]
CRM-16907 - Fix navigation upgrade script
Jon goldberg [Fri, 2 Oct 2015 20:22:48 +0000 (16:22 -0400)]
CRM-17241 - modify template and PHP for membership renewal to support renewing multiple terms on credit card renewal
Saurabh Batra [Fri, 2 Oct 2015 15:56:55 +0000 (21:26 +0530)]
Fixed the errors Jenkins pointed out.
Guanhuan Chen [Fri, 2 Oct 2015 15:35:14 +0000 (16:35 +0100)]
Condense credit note number query
Saurabh Batra [Fri, 2 Oct 2015 07:11:21 +0000 (12:41 +0530)]
Comment fixes for CRM/Mailing directory.
Saurabh Batra [Thu, 1 Oct 2015 18:29:30 +0000 (23:59 +0530)]
comment fixes for Report/Page
Dave Greenberg [Fri, 2 Oct 2015 03:02:59 +0000 (23:02 -0400)]
Merge pull request #6597 from jitendrapurohit/CRM-12078
CRM-12078 -- Change Inherited Membership status to expired instead of…
projects / civicrm-core.git / log