colemanw [Tue, 4 Aug 2015 20:16:19 +0000 (16:16 -0400)]
Merge pull request #6411 from colemanw/CRM-16444
CRM-16444 ckeditor-configurator.js cleanup
Coleman Watts [Tue, 4 Aug 2015 20:15:39 +0000 (16:15 -0400)]
CRM-16444 ckeditor-configurator.js cleanup
Eileen McNaughton [Tue, 4 Aug 2015 18:06:52 +0000 (06:06 +1200)]
Merge pull request #6404 from eileenmcnaughton/master
remove some unused variables
colemanw [Tue, 4 Aug 2015 13:37:15 +0000 (09:37 -0400)]
Merge pull request #6401 from colemanw/CRM-10836
CRM-10836 - Change 'Is Deceased' to 'Deceased'
Eileen McNaughton [Tue, 4 Aug 2015 10:29:17 +0000 (22:29 +1200)]
Merge pull request #6393 from eileenmcnaughton/CRM-16523
Crm 16523
eileenmcnaugton [Tue, 4 Aug 2015 06:27:55 +0000 (18:27 +1200)]
CRM-16523 ensure contact_id is loaded when creating a contribution
eileenmcnaugton [Tue, 4 Aug 2015 06:04:53 +0000 (18:04 +1200)]
CRM-16523 assume 'new' where membership is being updated from pending
eileenmcnaugton [Tue, 4 Aug 2015 05:35:52 +0000 (17:35 +1200)]
towards test fix, catch error higher up & declare fn protected
eileenmcnaugton [Tue, 4 Aug 2015 05:28:46 +0000 (17:28 +1200)]
CRM-16523 code comments & bypass IPN to call completeOrder
eileenmcnaugton [Tue, 4 Aug 2015 05:27:02 +0000 (17:27 +1200)]
CRM-16523 towards fixing test issues on this
eileenmcnaugton [Tue, 4 Aug 2015 04:38:05 +0000 (16:38 +1200)]
add titles to membeship_log for api conformance
eileenmcnaugton [Tue, 4 Aug 2015 01:24:31 +0000 (13:24 +1200)]
towards more standardised fn comments:
eileenmcnaugton [Mon, 3 Aug 2015 13:38:46 +0000 (01:38 +1200)]
CRM-16523 refactor completetransation to call hooks
eileenmcnaugton [Mon, 3 Aug 2015 13:06:03 +0000 (01:06 +1200)]
CRM-16523 towards calling hooks throughout completetransaction
Coleman Watts [Tue, 4 Aug 2015 01:36:42 +0000 (21:36 -0400)]
CRM-10836 - Change 'Is Deceased' to 'Deceased'
Tim Otten [Mon, 3 Aug 2015 23:00:44 +0000 (16:00 -0700)]
Merge remote-tracking branch 'origin/4.6' into 4.6-master-2015-08-03-16-00-35
colemanw [Mon, 3 Aug 2015 21:16:42 +0000 (17:16 -0400)]
Merge pull request #6396 from eileenmcnaughton/4.6
CRM-16927 rename changed-name-function in the test suite
eileenmcnaugton [Mon, 3 Aug 2015 21:12:43 +0000 (09:12 +1200)]
CRM-16927 rename changed-name-function in the test suite
Eileen McNaughton [Mon, 3 Aug 2015 21:01:51 +0000 (09:01 +1200)]
Merge pull request #6390 from eileenmcnaughton/CRM-16958
CRM-16958 ensure sort_name is set when display_name set
Eileen McNaughton [Mon, 3 Aug 2015 21:00:39 +0000 (09:00 +1200)]
Merge pull request #6391 from eileenmcnaughton/CRM-16926
CRM-16926 fix up patch for 4.7
colemanw [Mon, 3 Aug 2015 20:40:49 +0000 (16:40 -0400)]
Merge pull request #6386 from eileenmcnaughton/CRM-16955
CRM-16955 make payment form load billing defaults on processor change
Dave Greenberg [Mon, 3 Aug 2015 20:00:56 +0000 (13:00 -0700)]
Merge pull request #6389 from JKingsnorth/CRM-16957
CRM-16957: Allow changing selections even if none selected originally
eileenmcnaugton [Mon, 3 Aug 2015 02:25:05 +0000 (14:25 +1200)]
CRM-16955 make payment form load billing defaults on processor change
Eileen McNaughton [Mon, 3 Aug 2015 14:00:51 +0000 (02:00 +1200)]
Merge pull request #6385 from eileenmcnaughton/cleanup
Cody tidy up
Eileen McNaughton [Mon, 3 Aug 2015 13:33:05 +0000 (01:33 +1200)]
Merge pull request #6387 from eileenmcnaughton/CRM-16542
CRM-16542 re-fix paypal express form in a way that reflects our code …
eileenmcnaugton [Mon, 3 Aug 2015 12:39:08 +0000 (00:39 +1200)]
CRM-16926 fix up patch for 4.7
eileenmcnaughton [Mon, 3 Aug 2015 12:16:31 +0000 (12:16 +0000)]
CRM-16958 ensure sort_name is set when display_name set
JKingsnorth [Mon, 3 Aug 2015 10:24:42 +0000 (11:24 +0100)]
CRM-16957: Allow changing selections even if none selected originally
Kurund Jalmi [Mon, 3 Aug 2015 07:07:08 +0000 (12:37 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-08-03-11-26-36
Conflicts:
CRM/Core/BAO/CustomQuery.php
CRM/Core/Resources.php
sql/civicrm_generated.mysql
eileenmcnaugton [Mon, 3 Aug 2015 02:53:59 +0000 (14:53 +1200)]
CRM-16542 re-fix paypal express form in a way that reflects our code direction
Eileen McNaughton [Mon, 3 Aug 2015 02:06:37 +0000 (14:06 +1200)]
Merge pull request #6364 from eileenmcnaughton/CRM-16945
CRM-16945 add test to demonstrate bug & lock in fix
eileenmcnaugton [Mon, 3 Aug 2015 02:03:47 +0000 (14:03 +1200)]
CRM-16953 standardise declaration of ->_defaults
eileenmcnaugton [Mon, 3 Aug 2015 01:52:48 +0000 (13:52 +1200)]
CRM-16952 wrap getContactID function
eileenmcnaugton [Fri, 31 Jul 2015 18:46:51 +0000 (06:46 +1200)]
remove some unused variables
Eileen McNaughton [Mon, 3 Aug 2015 00:45:28 +0000 (12:45 +1200)]
Merge pull request #6382 from eileenmcnaughton/CRM-16923-tests
CRM-16923 follow up test fixes
eileenmcnaugton [Fri, 31 Jul 2015 04:54:15 +0000 (16:54 +1200)]
CRM-16945 add test to demonstrate bug & lock in fix
colemanw [Sun, 2 Aug 2015 22:59:56 +0000 (18:59 -0400)]
Merge pull request #6378 from johanv/CRM-15991-permission_delete_relationship
CRM-15991 - Can now delete relationships w edit all contacts permission
eileenmcnaughton [Sun, 2 Aug 2015 22:36:02 +0000 (22:36 +0000)]
CRM-16923 follow up test fixes
colemanw [Sun, 2 Aug 2015 19:53:15 +0000 (15:53 -0400)]
Merge pull request #6380 from colemanw/CRM-16478
CRM-16478 - Remove custom fatal error tpl option
colemanw [Sun, 2 Aug 2015 01:53:51 +0000 (21:53 -0400)]
Merge pull request #6376 from colemanw/CRM-16337
CRM-16337 - Add pledge_start_date to Pledge Get API response
Coleman Watts [Sun, 2 Aug 2015 01:46:59 +0000 (21:46 -0400)]
CRM-16478 - Tweak upgrade message
JKingsnorth [Mon, 27 Jul 2015 10:43:29 +0000 (11:43 +0100)]
CRM-16478 Initial changes to remove custom error template path
colemanw [Sat, 1 Aug 2015 22:22:40 +0000 (18:22 -0400)]
Merge pull request #6377 from colemanw/CRM-16447
CRM-16447 - Fix province name 'Northern Ostrobothnia'
Johan Vervloet [Sat, 1 Aug 2015 21:00:28 +0000 (23:00 +0200)]
CRM-15991 - Can now delete relationships with edit all contacts permissions.
Delete contacts permission is not required any more for deleting
relationships.
----------------------------------------
* CRM-15991: http-api: User needs 'delete contacts' permission to delete relationships
https://issues.civicrm.org/jira/browse/CRM-15991
Coleman Watts [Sat, 1 Aug 2015 19:33:29 +0000 (15:33 -0400)]
CRM-16447 - Fix province name 'Northern Ostrobothnia'
Coleman Watts [Sat, 1 Aug 2015 19:23:19 +0000 (15:23 -0400)]
CRM-16337 - Add pledge_start_date to Pledge Get API response
colemanw [Sat, 1 Aug 2015 19:16:40 +0000 (15:16 -0400)]
Merge pull request #6375 from colemanw/CRM-16172
CRM-16172 - Add help text to Localization Settings page
Coleman Watts [Sat, 1 Aug 2015 19:10:02 +0000 (15:10 -0400)]
CRM-16172 - Add help text to Localization Settings page
colemanw [Sat, 1 Aug 2015 17:46:24 +0000 (13:46 -0400)]
Merge pull request #6373 from colemanw/CRM-15918
CRM-15918 - Remove auction and touchstone files
colemanw [Sat, 1 Aug 2015 17:38:38 +0000 (13:38 -0400)]
Merge pull request #6372 from colemanw/CRM-14647
CRM-14647 - Add maxlength to profile titles
Coleman Watts [Sat, 1 Aug 2015 17:35:55 +0000 (13:35 -0400)]
CRM-15918 - Remove auction and touchstone files
Coleman Watts [Sat, 1 Aug 2015 16:46:44 +0000 (12:46 -0400)]
CRM-14647 - Add maxlength to profile titles
Coleman Watts [Sat, 1 Aug 2015 14:32:32 +0000 (10:32 -0400)]
CRM_Utils_REST cleanup
colemanw [Sat, 1 Aug 2015 11:59:32 +0000 (07:59 -0400)]
Merge pull request #6370 from colemanw/CRM-13104
CRM-13104 - Remove obsolete hook_civicrm_validate
colemanw [Sat, 1 Aug 2015 11:58:55 +0000 (07:58 -0400)]
Merge pull request #6371 from colemanw/CRM-16891
CRM-16891 - Add $region param to hook_civicrm_coreResourceList
Monish Deb [Sat, 1 Aug 2015 08:09:34 +0000 (13:39 +0530)]
Merge pull request #6342 from monishdeb/4.6
CRM-16927 fix - Notice Search membership with custom fields
colemanw [Sat, 1 Aug 2015 02:35:40 +0000 (22:35 -0400)]
Merge pull request #6368 from colemanw/gender
Add api alias for 'gender_id' as 'gender'
Coleman Watts [Sat, 1 Aug 2015 02:18:42 +0000 (22:18 -0400)]
CRM-16891 - Add $region param to hook_civicrm_coreResourceList
Coleman Watts [Sat, 1 Aug 2015 01:40:20 +0000 (21:40 -0400)]
CRM-13104 - Remove obsolete hook_civicrm_validate
colemanw [Sat, 1 Aug 2015 01:32:23 +0000 (21:32 -0400)]
Merge pull request #6369 from colemanw/explorer
API Explorer fixes
Coleman Watts [Fri, 31 Jul 2015 21:34:56 +0000 (17:34 -0400)]
API Explorer - Fix jumpy select boxes
Coleman Watts [Fri, 31 Jul 2015 20:41:57 +0000 (16:41 -0400)]
API Explorer - Default contact-ref to select current user
Coleman Watts [Fri, 31 Jul 2015 20:14:59 +0000 (16:14 -0400)]
Add destroy methods for crmEntityRef and crmSelect2
Coleman Watts [Fri, 31 Jul 2015 19:27:09 +0000 (15:27 -0400)]
Improve api explorer smarty code generation
Dave Greenberg [Fri, 31 Jul 2015 19:17:47 +0000 (12:17 -0700)]
Merge pull request #6365 from yashodha/CRM-16936
CRM-16936: Donor with only email address shows no display name
eileenmcnaugton [Fri, 31 Jul 2015 18:46:51 +0000 (06:46 +1200)]
remove some unused variables
monishdeb [Fri, 31 Jul 2015 18:04:03 +0000 (23:34 +0530)]
minor change
monishdeb [Fri, 31 Jul 2015 17:59:17 +0000 (23:29 +0530)]
CustomValue fix for Grant
monishdeb [Wed, 29 Jul 2015 17:28:23 +0000 (22:58 +0530)]
format fix
monishdeb [Wed, 29 Jul 2015 17:21:28 +0000 (22:51 +0530)]
CRM-16927 fix - Notice Search membership with custom fields
https://issues.civicrm.org/jira/browse/CRM-16927
Coleman Watts [Fri, 31 Jul 2015 17:20:00 +0000 (13:20 -0400)]
Add api alias for 'gender_id' as 'gender'
Monish Deb [Fri, 31 Jul 2015 14:29:30 +0000 (19:59 +0530)]
Merge pull request #6367 from monishdeb/generated-mysql
Generated Data for CRM-16907 changes
monishdeb [Fri, 31 Jul 2015 14:26:33 +0000 (19:56 +0530)]
Generated Data for CRM-16907 changes
----------------------------------------
* CRM-16907: Improvements to in-app Help menu content
https://issues.civicrm.org/jira/browse/CRM-16907
Monish Deb [Fri, 31 Jul 2015 10:35:09 +0000 (16:05 +0530)]
Merge pull request #6354 from yashodha/CRM-16907
CRM-16907: Improvements to in-app Help menu content
yashodha [Fri, 31 Jul 2015 08:01:08 +0000 (13:31 +0530)]
CRM-16936: Donor with only email address shows no display name
----------------------------------------
* CRM-16936: Donor with only email address shows no display name
https://issues.civicrm.org/jira/browse/CRM-16936
Monish Deb [Fri, 31 Jul 2015 06:17:58 +0000 (11:47 +0530)]
Merge pull request #6356 from monishdeb/CRM-16931
CRM-16931 fix - Update Smart Group Counts throws a syntax error (AND …
eileenmcnaugton [Fri, 31 Jul 2015 04:53:41 +0000 (16:53 +1200)]
tidy up on test class
Kurund Jalmi [Fri, 31 Jul 2015 02:56:35 +0000 (08:26 +0530)]
Merge pull request #6363 from civicrm/CRM-16944
CRM-16944 e-notice
Eileen McNaughton [Fri, 31 Jul 2015 00:39:42 +0000 (12:39 +1200)]
CRM-16944 e-notice
Tim Otten [Thu, 30 Jul 2015 22:27:38 +0000 (15:27 -0700)]
Merge pull request #6286 from colemanw/CRM-16891
CRM-16891 - Add hook_civicrm_coreResourceList
colemanw [Thu, 30 Jul 2015 19:38:51 +0000 (15:38 -0400)]
Merge pull request #6358 from colemanw/CRM-16940
CRM-16940 - Deprecated php < 5.5
Kurund Jalmi [Thu, 30 Jul 2015 18:09:08 +0000 (23:39 +0530)]
Merge remote-tracking branch 'upstream/4.6' into 4.6-master-2015-07-30-23-34-40
Conflicts:
CRM/Contribute/BAO/Contribution/Utils.php
CRM/Contribute/BAO/ContributionPage.php
CRM/Contribute/Form/Contribution.php
CRM/Member/BAO/Membership.php
Dave Greenberg [Thu, 30 Jul 2015 17:57:52 +0000 (10:57 -0700)]
Merge pull request #6345 from pradpnayak/CRM-15187
--CRM-15187, Added warning message when membership type is changed
colemanw [Thu, 30 Jul 2015 17:34:26 +0000 (13:34 -0400)]
Merge pull request #6361 from colemanw/CRM-14136
CRM-14136 - Don't show deleted contacts on case dashboard
Coleman Watts [Thu, 30 Jul 2015 17:16:19 +0000 (13:16 -0400)]
Improve upgrade screen style
Coleman Watts [Thu, 30 Jul 2015 12:12:51 +0000 (08:12 -0400)]
CRM-16940 - Add php deprecation warning
Dave Greenberg [Thu, 30 Jul 2015 17:02:35 +0000 (10:02 -0700)]
Merge pull request #6357 from colemanw/bdombro-more-job-frequencies
CRM-16500 - Added more options to job frequency
colemanw [Thu, 30 Jul 2015 15:34:21 +0000 (11:34 -0400)]
Merge pull request #6362 from colemanw/CRM-14239
CRM-14239 - Fix undefined variable notice
Coleman Watts [Thu, 30 Jul 2015 15:24:34 +0000 (11:24 -0400)]
CRM-14239 - Fix undefined variable notice
Coleman Watts [Thu, 30 Jul 2015 15:16:22 +0000 (11:16 -0400)]
CRM-14136 - Don't show deleted contacts on case dashboard
Kurund Jalmi [Thu, 30 Jul 2015 13:48:37 +0000 (19:18 +0530)]
Merge pull request #6355 from jitendrapurohit/CRM-16915addfixes
Additional fixes for CRM-16915
Coleman Watts [Thu, 30 Jul 2015 13:32:39 +0000 (09:32 -0400)]
CRM-16500 - Style cleanup and fix missing breaks in switch
BrianDombrowski [Wed, 13 May 2015 15:41:13 +0000 (11:41 -0400)]
CRM-16500 - Added more options to job frequency to make it more useable
----------------------------------------
* CRM-16500: Add more common options to scheduled job frequency
https://issues.civicrm.org/jira/browse/CRM-16500
monishdeb [Thu, 30 Jul 2015 09:58:27 +0000 (15:28 +0530)]
CRM-16931 fix - Update Smart Group Counts throws a syntax error (AND instead of WHERE)
https://issues.civicrm.org/jira/browse/CRM-16931
jitendrapurohit [Thu, 30 Jul 2015 08:55:37 +0000 (14:25 +0530)]
additional fixes for CRM-16915
yashodha [Thu, 30 Jul 2015 08:15:02 +0000 (13:45 +0530)]
CRM-16907: Improvements to in-app Help menu content
----------------------------------------
* CRM-16907: Improvements to in-app Help menu content
https://issues.civicrm.org/jira/browse/CRM-16907
Eileen McNaughton [Thu, 30 Jul 2015 01:43:46 +0000 (13:43 +1200)]
Merge pull request #6323 from eileenmcnaughton/CRM-16923
CRM-16923 enotice fix,
eileenmcnaughton [Thu, 30 Jul 2015 00:04:23 +0000 (00:04 +0000)]
CRM-16923 fix passing on incorrect value for payment processor id frompaypal
colemanw [Thu, 30 Jul 2015 01:35:07 +0000 (21:35 -0400)]
Merge pull request #6353 from eileenmcnaughton/master
Master
Eileen McNaughton [Wed, 22 Jul 2015 02:38:03 +0000 (14:38 +1200)]
CRM-16882 renew my membership automatically should not show for non-auto-renew memberships
I am not convinced this is the full story on CRM-16882 - however, it makes
the symptom disappear, at least in one instance & the logic of the change
is strong - ie. when iterating through the memberships to determine
auto-renewability we should
check whether they are auto-renew
Conflicts:
CRM/Member/BAO/Membership.php
projects / civicrm-core.git / log