colemanw [Thu, 16 Jul 2015 14:06:02 +0000 (10:06 -0400)]
Merge pull request #6232 from sudhabisht/WebtestFix1
Import and CKEditor webtest failure fix
Sudha Bisht [Thu, 16 Jul 2015 14:00:48 +0000 (19:30 +0530)]
Ckeditor and Import webtest related fix
Eileen McNaughton [Thu, 16 Jul 2015 05:16:18 +0000 (17:16 +1200)]
Merge pull request #6223 from eileenmcnaughton/CRM-16851
CRM-16851 fix product options in api
Eileen McNaughton [Thu, 16 Jul 2015 03:50:57 +0000 (15:50 +1200)]
Merge pull request #6225 from davecivicrm/CRM-16841
CRM-16841 - allow use of Dummy processor in LIVE mode.
Eileen McNaughton [Thu, 16 Jul 2015 02:14:44 +0000 (14:14 +1200)]
CRM-16851 enforce array type
Dave Greenberg [Wed, 15 Jul 2015 23:21:37 +0000 (16:21 -0700)]
Merge pull request #6186 from JKingsnorth/CRM-16826
CRM-16826: Fix updating addresses via Profiles
Dave Greenberg [Wed, 15 Jul 2015 23:06:31 +0000 (16:06 -0700)]
CRM-16841 - allow use of Dummy processor in LIVE mode.
----------------------------------------
* CRM-16841: Dummy processor can be used for 'live' transaction mode
https://issues.civicrm.org/jira/browse/CRM-16841
Dave Greenberg [Wed, 15 Jul 2015 19:25:00 +0000 (12:25 -0700)]
Merge pull request #6224 from davecivicrm/updateGenerated.mysql
New copy of civicrm_generated.mysql.
Dave Greenberg [Wed, 15 Jul 2015 19:26:04 +0000 (12:26 -0700)]
New copy of civicrm_generated.mysql.
Dave Greenberg [Wed, 15 Jul 2015 16:32:42 +0000 (09:32 -0700)]
Merge pull request #6221 from jitendrapurohit/CRM-16715
minor fix for median calculation CRM-16714 & CRM-16715
Eileen McNaughton [Wed, 15 Jul 2015 14:38:04 +0000 (02:38 +1200)]
Merge pull request #6204 from eileenmcnaughton/tests
test fix membership form completion
jitendrapurohit [Wed, 15 Jul 2015 10:02:15 +0000 (15:32 +0530)]
minor fix for median calculation CRM-16714 & CRM-16715
colemanw [Tue, 14 Jul 2015 20:04:33 +0000 (16:04 -0400)]
Merge pull request #6212 from colemanw/CRM-16354
WYSIWYG upgrades
Coleman Watts [Mon, 13 Jul 2015 16:16:02 +0000 (12:16 -0400)]
CRM-16354 - Improve wysiwyg upgrade & add message to user
Eileen McNaughton [Mon, 13 Jul 2015 23:33:17 +0000 (11:33 +1200)]
Merge pull request #6207 from eileenmcnaughton/master
remove obsolete require once
eileenmcnaughton [Mon, 13 Jul 2015 23:32:24 +0000 (23:32 +0000)]
remove obsolete require once
Dave Greenberg [Mon, 13 Jul 2015 22:37:21 +0000 (15:37 -0700)]
Merge pull request #6131 from JKingsnorth/CRM-16784
CRM-16784: Don't allow 'editing' a Profile with no ID set
Coleman Watts [Mon, 13 Jul 2015 16:15:34 +0000 (12:15 -0400)]
CRM-16354 - Update editor_id setting to be human readable
Monish Deb [Mon, 13 Jul 2015 14:09:04 +0000 (19:39 +0530)]
Merge pull request #6203 from eileenmcnaughton/master
test fixes
Eileen McNaughton [Mon, 13 Jul 2015 10:42:26 +0000 (22:42 +1200)]
test fix membership form completion
eileenmcnaughton [Mon, 13 Jul 2015 08:57:31 +0000 (08:57 +0000)]
test fixes
eileenmcnaughton [Mon, 13 Jul 2015 08:54:06 +0000 (08:54 +0000)]
test-fixes, make use of is_test more consistent
Eileen McNaughton [Mon, 13 Jul 2015 08:53:26 +0000 (20:53 +1200)]
Merge pull request #6201 from eileenmcnaughton/master
test fix
Kurund Jalmi [Mon, 13 Jul 2015 07:04:10 +0000 (12:34 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-13-12-30-17
Conflicts:
CRM/Contact/BAO/Query.php
eileenmcnaughton [Mon, 13 Jul 2015 06:34:18 +0000 (06:34 +0000)]
test fix
eileenmcnaughton [Mon, 13 Jul 2015 06:33:27 +0000 (06:33 +0000)]
test fix
eileenmcnaughton [Mon, 13 Jul 2015 06:14:44 +0000 (06:14 +0000)]
test fix
eileenmcnaughton [Mon, 13 Jul 2015 05:49:03 +0000 (05:49 +0000)]
test fix, remove old param & fix comments
eileenmcnaughton [Mon, 13 Jul 2015 05:12:40 +0000 (05:12 +0000)]
test fix
Eileen McNaughton [Mon, 13 Jul 2015 04:52:56 +0000 (16:52 +1200)]
Merge pull request #6200 from eileenmcnaughton/CRM-16454
CRM-16454 towards allowing offsite backoffice processors
Eileen McNaughton [Sun, 12 Jul 2015 23:29:26 +0000 (11:29 +1200)]
phpcs fix
Eileen McNaughton [Sun, 12 Jul 2015 23:25:23 +0000 (11:25 +1200)]
test fix
Eileen McNaughton [Sun, 12 Jul 2015 23:07:29 +0000 (11:07 +1200)]
phpcs & test fixes
Coleman Watts [Sun, 12 Jul 2015 20:07:21 +0000 (16:07 -0400)]
Remove stray debug statement
Eileen McNaughton [Sun, 12 Jul 2015 15:00:24 +0000 (03:00 +1200)]
test fixes
Eileen McNaughton [Sun, 12 Jul 2015 13:33:22 +0000 (01:33 +1200)]
Merge pull request #6199 from eileenmcnaughton/CRM-16808
CRM-16808 standardisation of paypal express
Eileen McNaughton [Sun, 12 Jul 2015 13:06:50 +0000 (01:06 +1200)]
enotice fix
Eileen McNaughton [Sun, 12 Jul 2015 12:57:57 +0000 (00:57 +1200)]
CRM-16454 move status message to postProcess function in preparation for unit testing submit mailing
Eileen McNaughton [Sun, 12 Jul 2015 12:45:40 +0000 (00:45 +1200)]
CRM-16454 towards allowing offsite backoffice processors, lock in current renewal form with tests
Eileen McNaughton [Sun, 12 Jul 2015 11:08:57 +0000 (23:08 +1200)]
CRM-16402 remove deprecated PaymentSingleton
Eileen McNaughton [Sun, 12 Jul 2015 10:32:30 +0000 (22:32 +1200)]
regression on membership renewal - change type box showing when not needed
Eileen McNaughton [Sun, 12 Jul 2015 10:32:01 +0000 (22:32 +1200)]
phpcs fix & remove unused param
Eileen McNaughton [Sun, 12 Jul 2015 10:07:54 +0000 (22:07 +1200)]
test fix - standardise on using ->_params as parameters
Eileen McNaughton [Sun, 12 Jul 2015 10:03:34 +0000 (22:03 +1200)]
fixing membership renewal, make line items more transparent
Eileen McNaughton [Sun, 12 Jul 2015 10:01:59 +0000 (22:01 +1200)]
minor tidy up
Eileen McNaughton [Sun, 12 Jul 2015 09:44:15 +0000 (21:44 +1200)]
remove debug
Eileen McNaughton [Sun, 12 Jul 2015 07:34:44 +0000 (19:34 +1200)]
fix function signature & remove unused code
Eileen McNaughton [Sun, 12 Jul 2015 07:31:02 +0000 (19:31 +1200)]
phpcs fixes
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 19:06:04 +0000 (15:06 -0400)]
Merge pull request #6195 from colemanw/Fix
Fix contact sub-type profile field to use select2
Coleman Watts [Fri, 10 Jul 2015 19:05:34 +0000 (15:05 -0400)]
Fix contact sub-type profile field to use select2
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
Dave Greenberg [Fri, 10 Jul 2015 15:36:31 +0000 (08:36 -0700)]
Merge pull request #6183 from lsmithgo/patch-1
Update Joomla.php
colemanw [Fri, 10 Jul 2015 15:30:41 +0000 (11:30 -0400)]
Merge pull request #6192 from colemanw/CRM-16825
CRM-16825 - Respect quicksearch result count setting
Coleman Watts [Fri, 10 Jul 2015 15:28:14 +0000 (11:28 -0400)]
CRM-16825 - Respect quicksearch result count setting
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
Dave Greenberg [Fri, 10 Jul 2015 14:42:10 +0000 (07:42 -0700)]
Merge pull request #6141 from monishdeb/4.6
CRM-16483 fix - Fix search builder to accept all operators with conta… …
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
Monish Deb [Fri, 10 Jul 2015 12:18:47 +0000 (17:48 +0530)]
Merge pull request #6133 from jitendrapurohit/CRM-16796
CRM-16796 - Add ACL support for profile related api's
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…
JKingsnorth [Fri, 10 Jul 2015 10:44:07 +0000 (11:44 +0100)]
CRM-16826: Fix updating addresses via Profiles
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
jitendrapurohit [Tue, 7 Jul 2015 11:44:42 +0000 (17:14 +0530)]
warning fixes
jitendrapurohit [Tue, 7 Jul 2015 09:51:48 +0000 (15:21 +0530)]
webtest for CRM-16796 and CRM-16776
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
jitendrapurohit [Tue, 7 Jul 2015 09:49:06 +0000 (15:19 +0530)]
api test for CRM-16796
jitendrapurohit [Mon, 6 Jul 2015 04:33:31 +0000 (10:03 +0530)]
style fix
jitendrapurohit [Fri, 3 Jul 2015 13:34:20 +0000 (19:04 +0530)]
CRM-16796 - Add ACL support for profile related api's
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…
lsmithgo [Thu, 9 Jul 2015 22:43:38 +0000 (23:43 +0100)]
Update Joomla.php
One word fix to CRM-16827 for redirection to login page and back during event registration
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
monishdeb [Thu, 9 Jul 2015 11:46:47 +0000 (17:16 +0530)]
minor fix
monishdeb [Wed, 8 Jul 2015 09:21:36 +0000 (14:51 +0530)]
add smartGroup title in select clause
monishdeb [Sat, 4 Jul 2015 14:51:50 +0000 (20:21 +0530)]
reverted chcanges
monishdeb [Sat, 4 Jul 2015 14:30:02 +0000 (20:00 +0530)]
api failure fixes
monishdeb [Fri, 3 Jul 2015 14:19:26 +0000 (19:49 +0530)]
formatting fix
monishdeb [Fri, 3 Jul 2015 14:02:38 +0000 (19:32 +0530)]
CRM-16483 fix - Fix search builder to accept all operators with contact groups
https://issues.civicrm.org/jira/browse/CRM-16483
Conflicts:
CRM/Contact/BAO/Query.php
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
projects / civicrm-core.git / log