Eileen McNaughton [Sun, 12 Jul 2015 07:24:46 +0000 (19:24 +1200)]
minor refactors toward getting membership_recur test to pass
Eileen McNaughton [Thu, 2 Jul 2015 06:28:29 +0000 (18:28 +1200)]
CRM-16402 towards standardising instantiation of payment processor
Conflicts:
tests/phpunit/api/v3/ContributionPageTest.php
Eileen McNaughton [Sun, 12 Jul 2015 06:44:15 +0000 (18:44 +1200)]
CRM-16808 make functions called by paypal express more generic
Eileen McNaughton [Sun, 12 Jul 2015 05:35:56 +0000 (17:35 +1200)]
CRM-16808 standards on doPreApproval rather than doExpressCheckout
Eileen McNaughton [Sun, 12 Jul 2015 05:26:24 +0000 (17:26 +1200)]
CRM-16808 standardisation of paypal express
Coleman Watts [Sat, 11 Jul 2015 21:54:22 +0000 (17:54 -0400)]
Fix case of 'self'
colemanw [Sat, 11 Jul 2015 16:49:28 +0000 (12:49 -0400)]
Merge pull request #6196 from eileenmcnaughton/master
remove redundant IF & rename contributionType to financialType
Eileen McNaughton [Tue, 7 Jul 2015 12:19:12 +0000 (00:19 +1200)]
remove redundant IF & rename contributionType to financialType
colemanw [Fri, 10 Jul 2015 18:52:00 +0000 (14:52 -0400)]
Merge pull request #6194 from colemanw/CRM-16795
CRM-16795 - Remove redundant css
Coleman Watts [Fri, 10 Jul 2015 18:48:31 +0000 (14:48 -0400)]
CRM-16795 - Remove redundant css
The adminmenuwrap was already dealt with in
469d8da
----------------------------------------
* CRM-16795: Popups obscured by wordpress admin bar
https://issues.civicrm.org/jira/browse/CRM-16795
Monish Deb [Fri, 10 Jul 2015 18:36:54 +0000 (00:06 +0530)]
Merge pull request #6190 from rohankatkar/Webtest_Master
Webtest Fix-Master
colemanw [Fri, 10 Jul 2015 18:27:03 +0000 (14:27 -0400)]
Merge pull request #6191 from colemanw/CRM-16444
CRM-16444 - Add CKEditor Toolbar Configurator
Coleman Watts [Fri, 10 Jul 2015 14:33:03 +0000 (10:33 -0400)]
CRM-16444 - Add CKEditor Toolbar Configurator
colemanw [Fri, 10 Jul 2015 15:26:18 +0000 (11:26 -0400)]
Merge pull request #6188 from JKingsnorth/patch-1
Add StackExchange link, tidy up
colemanw [Fri, 10 Jul 2015 14:31:27 +0000 (10:31 -0400)]
Merge pull request #6170 from colemanw/CRM-16354
CRM-16354 - Add missing Textarea option to schema
Web Access [Fri, 10 Jul 2015 13:16:29 +0000 (18:46 +0530)]
Webtest Fix-Master
John Kingsnorth [Fri, 10 Jul 2015 12:51:59 +0000 (13:51 +0100)]
Add StackExchange link, tidy up
Eileen McNaughton [Fri, 10 Jul 2015 11:39:38 +0000 (23:39 +1200)]
Merge pull request #6185 from eileenmcnaughton/master
CRM-16737 4.7 version, only payment_status_id accepted as return para…
Kurund Jalmi [Fri, 10 Jul 2015 10:42:37 +0000 (16:12 +0530)]
Merge pull request #5680 from elinw/restauthenticationjoomla
Allow access to user permissions using the REST API in Joomla. #CRM-162...
Eileen McNaughton [Fri, 10 Jul 2015 08:49:12 +0000 (20:49 +1200)]
CRM-16829 move form functions to form
Eileen McNaughton [Fri, 10 Jul 2015 08:25:39 +0000 (20:25 +1200)]
CRM-16737 4.7 version, only payment_status_id accepted as return parameter from payment processor
Eileen McNaughton [Fri, 10 Jul 2015 08:04:26 +0000 (20:04 +1200)]
Merge pull request #6184 from eileenmcnaughton/master
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
Eileen McNaughton [Fri, 10 Jul 2015 05:04:02 +0000 (17:04 +1200)]
merge fix
Eileen McNaughton [Fri, 10 Jul 2015 04:59:42 +0000 (16:59 +1200)]
Merge branch '4.6' of https://github.com/civicrm/civicrm-core
Conflicts:
CRM/Contribute/Form/Contribution.php
CRM/Member/BAO/Membership.php
CRM/Member/Form.php
CRM/Member/Form/MembershipRenewal.php
tests/phpunit/api/v3/ContributionPageTest.php
Eileen McNaughton [Tue, 7 Jul 2015 12:11:12 +0000 (00:11 +1200)]
slight enhancement to test
Conflicts:
tests/phpunit/CRM/Contribute/Form/ContributionTest.php
Eileen McNaughton [Fri, 10 Jul 2015 02:14:35 +0000 (14:14 +1200)]
Merge pull request #6150 from eileenmcnaughton/CRM-16803
CRM-16803 fix non-creating on recurring contributio record on members…
Eileen McNaughton [Thu, 9 Jul 2015 21:26:59 +0000 (09:26 +1200)]
CRM-16803 QA fixes
Yashodha Chaku [Thu, 9 Jul 2015 14:03:37 +0000 (19:33 +0530)]
Merge pull request #6160 from eileenmcnaughton/CRM-16737
CRM-16737 support either payment_status_id OR contribution_status_id
colemanw [Thu, 9 Jul 2015 02:42:02 +0000 (22:42 -0400)]
Delete accidentally added file
Coleman Watts [Wed, 8 Jul 2015 13:52:45 +0000 (09:52 -0400)]
CRM-16354 - Add missing Textarea option to schema
Dave Greenberg [Thu, 9 Jul 2015 00:22:50 +0000 (17:22 -0700)]
Merge pull request #6121 from jitendrapurohit/CRM-16776
CRM-16776 - Event-related profiles can be created & edited with either 'administe…
Dave Greenberg [Wed, 8 Jul 2015 21:42:50 +0000 (14:42 -0700)]
Merge pull request #6172 from colemanw/CRM-16811
CRM-16811 - Support markup fields in popup profile editor
Eileen McNaughton [Wed, 8 Jul 2015 20:47:14 +0000 (08:47 +1200)]
Merge pull request #6168 from eileenmcnaughton/payment_token
API payment_token test re-order setup to allow rollback to work
Eileen McNaughton [Wed, 8 Jul 2015 20:28:47 +0000 (08:28 +1200)]
Merge pull request #6059 from johanv/CRM-16701-saved_search_api
PR for CRM-16701: Saved Search API
colemanw [Wed, 8 Jul 2015 19:12:54 +0000 (15:12 -0400)]
Merge pull request #5654 from yourcelf/master
CRM-16294: Support map loading under https
colemanw [Wed, 8 Jul 2015 18:14:38 +0000 (14:14 -0400)]
Merge pull request #6127 from colemanw/CRM-16426
CRM-16426 - Remove support for minified files without the full version
Coleman Watts [Wed, 8 Jul 2015 17:52:13 +0000 (13:52 -0400)]
CRM-16811 - Support markup fields in popup profile editor
Coleman Watts [Wed, 8 Jul 2015 17:44:06 +0000 (13:44 -0400)]
Profile editor - Sort/drag usability fix
Yashodha Chaku [Wed, 8 Jul 2015 15:52:43 +0000 (21:22 +0530)]
Merge pull request #6169 from yashodha/webtest-skip
skipping webtests that are working locally and not on Jenkins
Yashodha Chaku [Wed, 8 Jul 2015 15:46:33 +0000 (21:16 +0530)]
Merge pull request #6171 from sudhabisht/CRMTestFixmaster
Webtest Fix
Sudha Bisht [Wed, 8 Jul 2015 14:26:30 +0000 (19:56 +0530)]
Format Fix
Monish Deb [Wed, 8 Jul 2015 14:23:23 +0000 (19:53 +0530)]
Merge pull request #6163 from josephlacey/datatables-update
CRM-16742: Fixing Activity Dashlet bug related to DataTables migration
Sudha Bisht [Wed, 8 Jul 2015 14:05:51 +0000 (19:35 +0530)]
Webtest Fix
Monish Deb [Wed, 8 Jul 2015 12:47:41 +0000 (18:17 +0530)]
Merge pull request #6114 from seamuslee001/civi_permission
Deal with ACL'ed users not getting is_deleted = 0 added on
Kurund Jalmi [Wed, 8 Jul 2015 11:33:07 +0000 (17:03 +0530)]
Merge pull request #5614 from JKingsnorth/CRM-16270
CRM-16270: Add 'Use - Edit Mode' action for profiles
Kurund Jalmi [Wed, 8 Jul 2015 11:30:18 +0000 (17:00 +0530)]
Merge pull request #5605 from sfe-ev/fix-upgrade-option_value
Upgrade: Fix `value` for added `option_value` entries in various places
Kurund Jalmi [Wed, 8 Jul 2015 11:01:36 +0000 (16:31 +0530)]
Merge pull request #6043 from AronNovak/rest-array
CRM_Utils_REST: better datastructure support, constant list for instance
Kurund Jalmi [Wed, 8 Jul 2015 11:00:04 +0000 (16:30 +0530)]
Merge pull request #6045 from AronNovak/CMSUser
CRM_Core_BAO_CMSUser - do not set time limit for PHP CLI environment
Yashodha Chaku [Wed, 8 Jul 2015 10:09:53 +0000 (15:39 +0530)]
Merge pull request #6158 from monishdeb/46test
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP s…
yashodha [Wed, 8 Jul 2015 09:15:59 +0000 (14:45 +0530)]
skipping webtests that are working locally and not on Jenkins
Eileen McNaughton [Wed, 8 Jul 2015 09:14:27 +0000 (21:14 +1200)]
Merge pull request #6167 from eileenmcnaughton/master
Fix e-notice & add tests around where e-notice was
eileenmcnaughton [Wed, 8 Jul 2015 09:14:07 +0000 (09:14 +0000)]
API payment_token test re-order setup to allow rollback to work
jitendrapurohit [Wed, 8 Jul 2015 09:09:49 +0000 (14:39 +0530)]
check for manage event profile permission on preview
eileenmcnaughton [Wed, 8 Jul 2015 08:39:58 +0000 (08:39 +0000)]
test fix, reflect changed BAO function in test, note this function is also
tested through form submit functions - e.g CRM_Member_Form_MembershipTest
eileenmcnaughton [Wed, 8 Jul 2015 07:48:51 +0000 (07:48 +0000)]
Fix e-notice & add tests around where e-notice was
Eileen McNaughton [Wed, 8 Jul 2015 03:05:33 +0000 (15:05 +1200)]
Merge pull request #6165 from eileenmcnaughton/test
fix misnaming on new test class
Eileen McNaughton [Wed, 8 Jul 2015 03:04:57 +0000 (15:04 +1200)]
fix misnaming on new test class
eileenmcnaughton [Wed, 8 Jul 2015 02:55:54 +0000 (02:55 +0000)]
CRM-16737 further fix as test showed now quite right
colemanw [Tue, 7 Jul 2015 18:56:52 +0000 (14:56 -0400)]
Merge pull request #6164 from colemanw/CRM-16354
CRM-16354 Upgrade CKEditor to v4.5
Coleman Watts [Tue, 7 Jul 2015 18:54:30 +0000 (14:54 -0400)]
CRM-16354 Upgrade CKEditor to v4.5
Joseph Lacey [Tue, 7 Jul 2015 14:44:18 +0000 (10:44 -0400)]
CRM-16742: Fixing Activity Dashlet bug related to DataTables migration
----------------------------------------
* CRM-16742: dashlet error on dmaster
https://issues.civicrm.org/jira/browse/CRM-16742
Eileen McNaughton [Tue, 7 Jul 2015 12:23:05 +0000 (00:23 +1200)]
Merge pull request #6149 from eileenmcnaughton/master
CRM-16800 add unit test for membership renewal backoffice form
Eileen McNaughton [Tue, 7 Jul 2015 10:35:33 +0000 (22:35 +1200)]
CRM-16737 code coments
Eileen McNaughton [Tue, 7 Jul 2015 10:25:11 +0000 (22:25 +1200)]
CRM-16737, CRM-15296 support for payment_status_id as the new official way to
declare outcome of payment transaction
monishdeb [Tue, 7 Jul 2015 10:28:46 +0000 (15:58 +0530)]
minor fix
Eileen McNaughton [Tue, 7 Jul 2015 10:16:53 +0000 (22:16 +1200)]
CRM-16737 spport either payment_status_id OR contribution_status_id as processor return status
In 4.6 the idea is a payment processor can return payment_status_id or contribution_status_id to denote outcome of
payment, in 4.7 contribution_status_id is to be removed
monishdeb [Tue, 7 Jul 2015 07:07:12 +0000 (12:37 +0530)]
CRM-16804 fix - Contribution updated via api wrongfully deletes PCP soft contribution
https://issues.civicrm.org/jira/browse/CRM-16804
colemanw [Tue, 7 Jul 2015 00:57:25 +0000 (20:57 -0400)]
Merge pull request #6156 from colemanw/CRM-16645
CRM-16645 - Fix js scope issue affecting popup contribution edit forms
Coleman Watts [Tue, 7 Jul 2015 00:54:28 +0000 (20:54 -0400)]
CRM-16645 - Fix js scope issue affecting popup contribution edit forms
Monish Deb [Mon, 6 Jul 2015 19:33:44 +0000 (01:03 +0530)]
Merge pull request #6153 from monishdeb/46test
CRM test failures
Monish Deb [Mon, 6 Jul 2015 19:33:11 +0000 (01:03 +0530)]
Merge pull request #6154 from sudhabisht/mQA
CRM test fix
Monish Deb [Mon, 6 Jul 2015 19:32:23 +0000 (01:02 +0530)]
Merge pull request #6155 from rohankatkar/webtest_master
Webtests fix for master
Web Access [Mon, 6 Jul 2015 14:22:58 +0000 (19:52 +0530)]
Webtests fix for master
Sudha Bisht [Mon, 6 Jul 2015 14:04:36 +0000 (19:34 +0530)]
CRM test fix
monishdeb [Mon, 6 Jul 2015 11:15:34 +0000 (16:45 +0530)]
CRM test failures
Eileen McNaughton [Mon, 6 Jul 2015 10:42:08 +0000 (22:42 +1200)]
CRM-16803 fix non-creating on recurring contributio record on membership renewal
kurund [Mon, 6 Jul 2015 09:12:10 +0000 (14:42 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-06-14-41-49
jitendrapurohit [Mon, 6 Jul 2015 04:49:50 +0000 (10:19 +0530)]
warning fix
jitendrapurohit [Mon, 6 Jul 2015 04:35:24 +0000 (10:05 +0530)]
style fix
Eileen McNaughton [Mon, 6 Jul 2015 03:23:01 +0000 (15:23 +1200)]
phpcs fix
Eileen McNaughton [Mon, 6 Jul 2015 03:21:07 +0000 (15:21 +1200)]
CRM-16800 towards fixing recurring error,
I am trying to figure out what part of this function membership form needs to share as the form has 2 paths
depending on recurring or otherwise. Ideally the create membership function would be used in both cases & recurring
which is a small part of the shared function, could be handled separately
Eileen McNaughton [Mon, 6 Jul 2015 01:43:58 +0000 (13:43 +1200)]
remove unused variables
Eileen McNaughton [Mon, 6 Jul 2015 01:35:17 +0000 (13:35 +1200)]
Merge pull request #6146 from KarinG/patch-8
Edit <title> to avoid clash with other field
Eileen McNaughton [Mon, 6 Jul 2015 01:33:27 +0000 (13:33 +1200)]
phpcs fixes
Eileen McNaughton [Mon, 6 Jul 2015 01:27:01 +0000 (13:27 +1200)]
CRM-16800 add unit test for membership renewal backoffice form
Eileen McNaughton [Mon, 6 Jul 2015 01:24:46 +0000 (13:24 +1200)]
Merge pull request #6148 from eileenmcnaughton/master
CRM-16800 4.7 regression fix + unit test on correct line items for back office member…
Eileen McNaughton [Mon, 6 Jul 2015 00:50:37 +0000 (12:50 +1200)]
CRM-16800 4.7 regression on correct line items for back office membership by credit card
Karin Gerritsen [Sun, 5 Jul 2015 22:01:13 +0000 (16:01 -0600)]
Edit <title> to avoid clash with other field
Both processor_id and payment_processor_id have <title>Payment Processor</title>. This causes issues with imports into the recurring series table (using Eileen's CSV importer) - as the field mapping is stored by title and will always select the first match - even if you previously selected 'the second Payment Processor' <title>. Renaming the <title> for processor_id to Processor ID. Leaving the payment_processor_id <title> as is: Payment Processor
Eileen McNaughton [Sun, 5 Jul 2015 21:17:56 +0000 (09:17 +1200)]
Merge pull request #6144 from eileenmcnaughton/master
Rationalise if statement
colemanw [Sun, 5 Jul 2015 15:58:09 +0000 (11:58 -0400)]
Merge pull request #6140 from colemanw/CRM-16643
CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'
Eileen McNaughton [Sun, 5 Jul 2015 14:07:55 +0000 (02:07 +1200)]
Rationalise if statement
Eileen McNaughton [Sun, 5 Jul 2015 13:08:49 +0000 (01:08 +1200)]
Merge pull request #6143 from eileenmcnaughton/CRM-16788
CRM-16788 add test to check recurring created
Eileen McNaughton [Sun, 5 Jul 2015 12:36:30 +0000 (00:36 +1200)]
phpcs
Eileen McNaughton [Sun, 5 Jul 2015 12:20:21 +0000 (00:20 +1200)]
CRM-16788 phpcs
Eileen McNaughton [Sun, 5 Jul 2015 11:21:10 +0000 (23:21 +1200)]
CRM-16788 formatting fixes
Eileen McNaughton [Sun, 5 Jul 2015 11:09:45 +0000 (23:09 +1200)]
CRM-16788 add test to check recurring created
(This does appear to be working - but on renewal form not so much, this form is adding the test to prepare to fix the other form)
Eileen McNaughton [Sun, 5 Jul 2015 10:49:33 +0000 (22:49 +1200)]
Merge pull request #6142 from eileenmcnaughton/CRM-16799
CRM-16799 Contribution.get api - support 'is_test'
eileenmcnaughton [Sun, 5 Jul 2015 08:16:48 +0000 (08:16 +0000)]
CRM-16799 Contribution.get api - support 'is_test'
It would probably be more correct to accept is_test & make contribution_test an alias of that for backwards compatibility, but this
is the quick version which at least supports the 'right' param
Coleman Watts [Sat, 4 Jul 2015 02:22:49 +0000 (22:22 -0400)]
CRM-16643 - Deprecate 'setvalue' api action & switch editable default to 'create'
Coleman Watts [Sat, 4 Jul 2015 02:00:22 +0000 (22:00 -0400)]
Merge branch '4.6' into master
projects / civicrm-core.git / log