Dave Greenberg [Sat, 21 Jun 2014 00:55:10 +0000 (17:55 -0700)]
CRM-14861 - Add order by to getLineItems function so that line-items in participant, membership and contribution view pages as well as receipt emails are ordered by price field and price field value weight.
----------------------------------------
* CRM-14861:
https://issues.civicrm.org/jira/browse/CRM-14861
Dave Greenberg [Fri, 20 Jun 2014 23:30:57 +0000 (16:30 -0700)]
Merge pull request #3535 from davecivicrm/CRM-14896
CRM-14896 - remove obsolete markup from AdditionalParticipant.tpl
Dave Greenberg [Fri, 20 Jun 2014 23:29:33 +0000 (16:29 -0700)]
CRM-14896 - remove obsolete markup from AdditionalParticipant.tpl
----------------------------------------
* CRM-14896:
https://issues.civicrm.org/jira/browse/CRM-14896
Dave Greenberg [Fri, 20 Jun 2014 23:21:45 +0000 (16:21 -0700)]
Merge pull request #3534 from davecivicrm/CRM-14895
CRM-14895 - Do not load Schedule Reminders form in pop-up to prevent scr...
Dave Greenberg [Fri, 20 Jun 2014 23:20:45 +0000 (16:20 -0700)]
CRM-14895 - Do not load Schedule Reminders form in pop-up to prevent scrollbar jumping and weird behavior in token inserts.
----------------------------------------
* CRM-14895:
https://issues.civicrm.org/jira/browse/CRM-14895
Dave Greenberg [Fri, 20 Jun 2014 21:41:23 +0000 (14:41 -0700)]
Merge pull request #3531 from pradpnayak/CRM-14645
-- CRM-14645, Added form rule to check if contact has Cancelled membersh...
Dave Greenberg [Fri, 20 Jun 2014 18:42:13 +0000 (11:42 -0700)]
Merge pull request #3527 from davecivicrm/CRM-14734
Crm 14734 - fix notices for anonymous contact viewing a mailing
Dave Greenberg [Fri, 20 Jun 2014 18:39:52 +0000 (11:39 -0700)]
CRM-14734 - allow $details[0][0] for possible hook usage.
----------------------------------------
* CRM-14734:
https://issues.civicrm.org/jira/browse/CRM-14734
Dave Greenberg [Fri, 20 Jun 2014 16:27:08 +0000 (09:27 -0700)]
Merge pull request #3532 from fernandomv3/patch-1
Add missing state from Peru
Dave Greenberg [Fri, 20 Jun 2014 16:26:07 +0000 (09:26 -0700)]
Merge pull request #3533 from davecivicrm/CRM-14843
CRM-14843 - fixes for upgrade script including INSERT IGNORE usage.
Dave Greenberg [Fri, 20 Jun 2014 16:24:35 +0000 (09:24 -0700)]
CRM-14843 - fixes for upgrade script including INSERT IGNORE usage.
----------------------------------------
* CRM-14843:
https://issues.civicrm.org/jira/browse/CRM-14843
fernandomv3 [Fri, 20 Jun 2014 15:10:05 +0000 (10:10 -0500)]
Add missing state from Peru
Amazonas added
Pradeep Nayak [Fri, 20 Jun 2014 11:07:34 +0000 (16:37 +0530)]
-- CRM-14645, fixed notice error
----------------------------------------
* CRM-14645: Contribution is accepted even if Membership is not renewed.
https://issues.civicrm.org/jira/browse/CRM-14645
Monish Deb [Fri, 20 Jun 2014 10:16:09 +0000 (15:46 +0530)]
Merge pull request #3526 from davecivicrm/CRM-14875
Tested the PR and its good to merge
Pradeep Nayak [Fri, 20 Jun 2014 07:32:17 +0000 (13:02 +0530)]
-- CRM-14645, Added form rule to check if contact has Cancelled membership when sign up from Online
----------------------------------------
* CRM-14645: Contribution is accepted even if Membership is not renewed.
https://issues.civicrm.org/jira/browse/CRM-14645
Monish Deb [Fri, 20 Jun 2014 06:45:34 +0000 (12:15 +0530)]
Merge pull request #3516 from jitendrapurohit/CRM-14869
CRM-14869
Eileen McNaughton [Fri, 20 Jun 2014 05:30:45 +0000 (17:30 +1200)]
Merge pull request #3530 from eileenmcnaughton/CRM-14263
CRM-14263 further fix for CRM-14263 fix phone in search profile situatio...
Eileen McNaughton [Fri, 20 Jun 2014 05:26:51 +0000 (17:26 +1200)]
CRM-14263 further fix for CRM-14263 fix phone in search profile situation
Eileen McNaughton [Fri, 20 Jun 2014 03:44:09 +0000 (15:44 +1200)]
Merge pull request #3529 from eileenmcnaughton/CRM-14887
Crm 14887
Eileen McNaughton [Fri, 20 Jun 2014 03:43:56 +0000 (15:43 +1200)]
CRM-14887 further fix on table
Eileen McNaughton [Fri, 20 Jun 2014 03:33:30 +0000 (15:33 +1200)]
CRM-14887 smart group search regression on location
Dave Greenberg [Thu, 19 Jun 2014 23:22:23 +0000 (16:22 -0700)]
CRM-14734 - fix notices for anonymous contact viewing a mailing.
----------------------------------------
* CRM-14734:
https://issues.civicrm.org/jira/browse/CRM-14734
Dave Greenberg [Thu, 19 Jun 2014 23:21:04 +0000 (16:21 -0700)]
CRM-14734 - fix notices for anonymous contact viewing a mailing.
----------------------------------------
* CRM-14734:
https://issues.civicrm.org/jira/browse/CRM-14734
Dave Greenberg [Thu, 19 Jun 2014 17:47:24 +0000 (10:47 -0700)]
CRM-14875 - Make sure line items show up for any contribution, event reg or membership signup which uses a non-quick-config price set.
----------------------------------------
* CRM-14875:
https://issues.civicrm.org/jira/browse/CRM-14875
Kurund Jalmi [Thu, 19 Jun 2014 13:12:16 +0000 (18:42 +0530)]
Merge pull request #3524 from atif-shaikh/CRM-14816
CRM-14816 - Order Rows widget is broken again
atif-shaikh [Thu, 19 Jun 2014 12:52:10 +0000 (18:22 +0530)]
CRM-14816 - Order Rows widget is broken again
https://issues.civicrm.org/jira/browse/CRM-14816
Monish Deb [Thu, 19 Jun 2014 09:29:31 +0000 (14:59 +0530)]
Merge pull request #3523 from monishdeb/CRM-14784
CRM-14784 fix - The update greetings job times out without saving to the...
monishdeb [Thu, 19 Jun 2014 08:35:10 +0000 (14:05 +0530)]
CRM-14784 fix - The update greetings job times out without saving to the database
https://issues.civicrm.org/jira/browse/CRM-14784
Dave Greenberg [Wed, 18 Jun 2014 21:45:45 +0000 (14:45 -0700)]
Merge pull request #3518 from monishdeb/CRM-14874
CRM-14874 fix - Display and sort names should be populated with email ad...
Dave Greenberg [Wed, 18 Jun 2014 21:24:42 +0000 (14:24 -0700)]
Merge pull request #3519 from davecivicrm/CRM-14879
CRM-14879 - rebuilt civicrm_generated.mysql with the new meta-data
Dave Greenberg [Wed, 18 Jun 2014 21:23:59 +0000 (14:23 -0700)]
CRM-14879 - rebuilt civicrm_generated.mysql with the new meta-data
----------------------------------------
* CRM-14879:
https://issues.civicrm.org/jira/browse/CRM-14879
Dave Greenberg [Wed, 18 Jun 2014 21:21:29 +0000 (14:21 -0700)]
Merge pull request #3517 from agh1/birthday
CRM-14879: Scheduled reminders for contact date fields
monishdeb [Wed, 18 Jun 2014 21:12:58 +0000 (02:42 +0530)]
CRM-14874 fix - Display and sort names should be populated with email address when contribution form only has email address
https://issues.civicrm.org/jira/browse/CRM-14874
Dave Greenberg [Wed, 18 Jun 2014 18:28:54 +0000 (11:28 -0700)]
Merge pull request #3515 from JKingsnorth/CRM-14870
CRM-14870 - More consistent event form navigation
Andrew Hunt [Mon, 16 Jun 2014 15:45:53 +0000 (11:45 -0400)]
CRM-14879: action mapping and option group for contact date field reminders
----------------------------------------
* CRM-14879: Scheduled reminders for contact date fields
https://issues.civicrm.org/jira/browse/CRM-14879
Andrew Hunt [Wed, 18 Jun 2014 01:05:20 +0000 (21:05 -0400)]
CRM-14879: scheduled reminders - add anniversary mode and custom fields for contact
----------------------------------------
* CRM-14879: Scheduled reminders for contact date fields
https://issues.civicrm.org/jira/browse/CRM-14879
Andrew Hunt [Mon, 16 Jun 2014 15:45:53 +0000 (11:45 -0400)]
CRM-14879: basics for contact fields to display in schedule reminders form
----------------------------------------
* CRM-14879: Scheduled reminders for contact date fields
https://issues.civicrm.org/jira/browse/CRM-14879
Dave Greenberg [Wed, 18 Jun 2014 15:54:25 +0000 (08:54 -0700)]
Merge pull request #3511 from lcdservices/CRM-14872
CRM-14872 redirect after login
jitendrapurohit [Wed, 18 Jun 2014 13:36:54 +0000 (19:06 +0530)]
CRM-14869
JKingsnorth [Wed, 18 Jun 2014 10:51:19 +0000 (11:51 +0100)]
CRM-14870 - More consistent event form navigation
Update CSS and button text to provide a more consistent experience when
registering for events.
Yashodha Chaku [Wed, 18 Jun 2014 09:48:50 +0000 (15:18 +0530)]
Merge pull request #3513 from yashodha/CRM-14867
CRM-14867: fix notice when lineitem doesn't have corresponding contribution id
CiviCRM [Wed, 18 Jun 2014 09:35:29 +0000 (15:05 +0530)]
fix notice for participant role
CiviCRM [Wed, 18 Jun 2014 07:11:35 +0000 (12:41 +0530)]
CRM-14867: fix notice when lineitem doesn't have corresponding contribution ID
Dave Greenberg [Tue, 17 Jun 2014 23:18:15 +0000 (16:18 -0700)]
Merge pull request #3509 from monishdeb/CRM-14864
CRM-14864 fix - Advanced search - bug in contact type filters OR
Dave Greenberg [Tue, 17 Jun 2014 21:52:31 +0000 (14:52 -0700)]
Merge pull request #3506 from eileenmcnaughton/CRM-14866
CRM-14866 membership payment not creating for membership block type
Dave Greenberg [Tue, 17 Jun 2014 21:27:58 +0000 (14:27 -0700)]
Merge pull request #3508 from jitendrapurohit/CRM-14698
CRM-14698
Dave Greenberg [Tue, 17 Jun 2014 19:42:26 +0000 (12:42 -0700)]
Merge pull request #3501 from jmcclelland/no-dupe-participants
CRM-14865 - prevent duplicate participant records when added offline.
Jamie McClelland [Tue, 17 Jun 2014 18:19:51 +0000 (14:19 -0400)]
CRM-14865 - ensure contacts and participants arrays are keyed the same
To avoid:
Notice: Undefined offset: 1 in CRM_Event_Form_Participant->postProcess()
(line 1497...)
----------------------------------------
* CRM-14865: Prevent duplicate participants when using offline event registration
https://issues.civicrm.org/jira/browse/CRM-14865
Brian Shaughnessy [Tue, 17 Jun 2014 16:24:36 +0000 (12:24 -0400)]
CRM-14872 redirect after login
monishdeb [Tue, 17 Jun 2014 13:17:50 +0000 (18:47 +0530)]
CRM-14864 fix - Advanced search - bug in contact type filters OR
https://issues.civicrm.org/jira/browse/CRM-14864
CiviCRM [Tue, 17 Jun 2014 13:07:58 +0000 (18:37 +0530)]
CRM-14698
Tim Otten [Tue, 17 Jun 2014 02:27:17 +0000 (19:27 -0700)]
Merge pull request #3507 from totten/master-fts-misc
CRM-14811 - Full Text - Move settings. Merge NYSS changes.
Eileen McNaughton [Tue, 17 Jun 2014 02:00:22 +0000 (14:00 +1200)]
minor test tidy ups
Eileen McNaughton [Tue, 17 Jun 2014 01:58:19 +0000 (13:58 +1200)]
test fix - flush cache when creating contribution page
Eileen McNaughton [Tue, 17 Jun 2014 01:41:28 +0000 (13:41 +1200)]
CRM-14866 membership payment not creating for membership block type
Dave Greenberg [Tue, 17 Jun 2014 01:31:36 +0000 (18:31 -0700)]
Merge pull request #3505 from davecivicrm/CRM-14852
CRM-14852 - Fix for bad access_arguments statement.
Dave Greenberg [Tue, 17 Jun 2014 01:30:49 +0000 (18:30 -0700)]
CRM-14852 - Fix for bad access_arguments statement.
----------------------------------------
* CRM-14852:
https://issues.civicrm.org/jira/browse/CRM-14852
Tim Otten [Tue, 17 Jun 2014 01:00:18 +0000 (18:00 -0700)]
CRM-14811 - QueryFormatter - Merge NYSS changes
* https://github.com/nysenate/Bluebird-CRM/commit/
39c0480a2d0a1a918aaa4dd90d71a3df48389df2
* https://github.com/nysenate/Bluebird-CRM/commit/
f7ac29becb84d8541256808c3839f6141dcd299c
Tim Otten [Tue, 17 Jun 2014 00:26:06 +0000 (17:26 -0700)]
CRM-14811 - enable_innodb_fts - Move from group SYSTEM_PREFERENCES_NAME to SEARCH_PREFERENCES_NAME
Tim Otten [Tue, 17 Jun 2014 00:21:32 +0000 (17:21 -0700)]
CRM-14811 - Move enable_innodb_fts from "Admin => Misc" to "Admin => Search Prefs"
Dave Greenberg [Mon, 16 Jun 2014 23:24:59 +0000 (16:24 -0700)]
Merge pull request #3504 from davecivicrm/CRM-14852
CRM-14852 - add access CiviCRM to access argument to various paths.
Dave Greenberg [Mon, 16 Jun 2014 23:22:12 +0000 (16:22 -0700)]
CRM-14852 - add access CiviCRM to access argument to various paths.
----------------------------------------
* CRM-14852:
https://issues.civicrm.org/jira/browse/CRM-14852
Eileen McNaughton [Mon, 16 Jun 2014 22:47:59 +0000 (10:47 +1200)]
Merge pull request #3503 from eileenmcnaughton/CRM-14866
test fix - set globals in main setup function rather than ad hoc
Eileen McNaughton [Mon, 16 Jun 2014 22:47:36 +0000 (10:47 +1200)]
test fix - set globals in main setup function rather than ad hoc
Dave Greenberg [Mon, 16 Jun 2014 18:59:17 +0000 (11:59 -0700)]
Merge pull request #3491 from fuzionnz/CRM-14854
CRM-14854. Highlight the selected price, not everything in that row.
Jamie McClelland [Mon, 16 Jun 2014 18:44:56 +0000 (14:44 -0400)]
CRM-14865 - prevent duplicate participant records when added offline.
----------------------------------------
* CRM-14865: Prevent duplicate participants when using offline event registration
https://issues.civicrm.org/jira/browse/CRM-14865
Yashodha Chaku [Mon, 16 Jun 2014 14:41:23 +0000 (20:11 +0530)]
Merge pull request #3497 from crusonweb/patch-1
CRM-14843 fix - 3 Missing Regions in Chile
Yashodha Chaku [Mon, 16 Jun 2014 11:58:29 +0000 (17:28 +0530)]
Merge pull request #3499 from yashodha/CRM-14847
CRM-14847: notice fix
CiviCRM [Mon, 16 Jun 2014 10:39:32 +0000 (16:09 +0530)]
CRM-14847: notice fix
Dave Greenberg [Mon, 16 Jun 2014 01:47:37 +0000 (18:47 -0700)]
Merge pull request #3493 from jimyhuang/CRM-14817
CRM-14817 - Core CiviCRM - Relationship field mapping option disappear
crusonweb [Sat, 14 Jun 2014 13:31:44 +0000 (09:31 -0400)]
Update 4.5.alpha2.mysql.tpl
CRM-14843 - Add two missing regions for Chile (Los Rios and Arica y Parinacota) and update the name for Region Metropolitana de Santiago to Santiago Matropolitan for consistency.
crusonweb [Sat, 14 Jun 2014 13:24:52 +0000 (09:24 -0400)]
Update civicrm_state_province.tpl
CRM-14843 - Add two missing regions for Chile (Los Rios and Arica y Parinacota) and update the name for Region Metropolitana de Santiago to Santiago Matropolitan for consistency.
Dave Greenberg [Fri, 13 Jun 2014 17:59:40 +0000 (10:59 -0700)]
Merge pull request #3488 from colemanw/ajax
First stab at handling form-post+reload in a popup
Jimmy Huang [Fri, 13 Jun 2014 15:38:50 +0000 (23:38 +0800)]
CRM-14817 - Core CiviCRM - Relationship field mapping option disappear
----------------------------------------
* CRM-14817: Relationship field mapping option disappear after select more field
https://issues.civicrm.org/jira/browse/CRM-14817
Kurund Jalmi [Fri, 13 Jun 2014 10:27:23 +0000 (15:57 +0530)]
Merge pull request #3466 from eileenmcnaughton/code-tidies
grant xml fixes, make grant_type exportable so it's available to api, ad...
Chris Burgess [Fri, 13 Jun 2014 04:39:12 +0000 (16:39 +1200)]
CRM-14854. Highlight the selected price, not everything in that row.
Dave Greenberg [Thu, 12 Jun 2014 22:36:09 +0000 (15:36 -0700)]
Merge pull request #3489 from davecivicrm/CRM-14851
CRM-14851 - Validation of profile type for on behalf of profiles was che...
Dave Greenberg [Thu, 12 Jun 2014 22:34:49 +0000 (15:34 -0700)]
CRM-14851 - Validation of profile type for on behalf of profiles was checking the wrong profile.
----------------------------------------
* CRM-14851:
https://issues.civicrm.org/jira/browse/CRM-14851
Coleman Watts [Thu, 12 Jun 2014 20:57:41 +0000 (21:57 +0100)]
crm.ajax.js - Alow a button to prevent ajax submit
Coleman Watts [Thu, 12 Jun 2014 20:10:41 +0000 (21:10 +0100)]
First stab at handling multi-step forms in a popup
Kurund Jalmi [Thu, 12 Jun 2014 17:14:35 +0000 (22:44 +0530)]
Merge pull request #3485 from jitendrapurohit/CRM_14627
CRM-14627
Dave Greenberg [Thu, 12 Jun 2014 15:36:38 +0000 (08:36 -0700)]
Merge pull request #3486 from davecivicrm/CRM-14755
Crm 14755 - use INSERT IGNORE for state_province additions
Dave Greenberg [Thu, 12 Jun 2014 15:35:26 +0000 (08:35 -0700)]
CRM-14755 typo correcion.
----------------------------------------
* CRM-14755:
https://issues.civicrm.org/jira/browse/CRM-14755
CiviCRM [Thu, 12 Jun 2014 14:13:58 +0000 (19:43 +0530)]
CRM-14627
CiviCRM [Thu, 12 Jun 2014 14:08:13 +0000 (19:38 +0530)]
fullscreen_url updation
CiviCRM [Thu, 12 Jun 2014 13:31:54 +0000 (19:01 +0530)]
Revert "CRM-14627"
This reverts commit
f696833b2a680edb260974adb1439c1c00f2714e.
CiviCRM [Thu, 12 Jun 2014 13:17:02 +0000 (18:47 +0530)]
CRM-14627
Tim Otten [Thu, 12 Jun 2014 07:48:35 +0000 (00:48 -0700)]
Merge pull request #3483 from totten/master-sequence-postcase
CRM-14727 - Allow SequenceListener to work (even if there is no standard timeline).
totten@civicrm.org [Thu, 12 Jun 2014 07:10:44 +0000 (00:10 -0700)]
CRM-14727 - Allow SequenceListener to work (even if there is no standard timeline).
Tim Otten [Thu, 12 Jun 2014 02:31:15 +0000 (19:31 -0700)]
Merge pull request #3482 from totten/master-fts-bool
CRM-14811 - FullText - Use boolean mode with InnoDB FTS
Tim Otten [Thu, 12 Jun 2014 02:19:44 +0000 (19:19 -0700)]
CRM-14811 - FullText - Use boolean mode with InnoDB FTS
Tim Otten [Thu, 12 Jun 2014 01:36:41 +0000 (18:36 -0700)]
Merge pull request #3481 from totten/master-query-fmt-setting
CRM-14811 - FullText - Register setting ("fts_query_mode")
Tim Otten [Thu, 12 Jun 2014 01:35:36 +0000 (18:35 -0700)]
CRM-14811 - FullText - Register setting ("fts_query_mode")
Tim Otten [Thu, 12 Jun 2014 00:54:14 +0000 (17:54 -0700)]
Merge pull request #3464 from totten/master-file-search
CRM-14765 - FullText - Display file matches as paperclip icons
Tim Otten [Thu, 12 Jun 2014 00:28:52 +0000 (17:28 -0700)]
CRM-14765, CRM14811 - FullText QueryFormatter - Attempt to normalize query text
This introduces a class, CRM_Utils_QueryFormatter, which takes an inputted
query string and converts it to a more specialized query dialect (such as
SQL LIKE, MySQL FTS, or Solr). The exact conversion logic determined
by a setting ("fts_query_mode").
Dave Greenberg [Thu, 12 Jun 2014 00:13:08 +0000 (17:13 -0700)]
CRM-14755 - apply INSERT IGNORE for the state_province inserts in 4.5.
----------------------------------------
* CRM-14755:
https://issues.civicrm.org/jira/browse/CRM-14755
Dave Greenberg [Thu, 12 Jun 2014 00:02:55 +0000 (17:02 -0700)]
Merge pull request #3453 from kenwest/CRM-14813
CRM-14813 Online event rego receipt - no credit card details shown
Dave Greenberg [Wed, 11 Jun 2014 21:57:09 +0000 (14:57 -0700)]
Merge pull request #3480 from davecivicrm/CRM-14826
CRM-14826 - Add no-popup class for Custom Search links (prevents contact...
Dave Greenberg [Wed, 11 Jun 2014 21:56:26 +0000 (14:56 -0700)]
CRM-14826 - Add no-popup class for Custom Search links (prevents contact summary and edit form from loading in a popup).
----------------------------------------
* CRM-14826:
https://issues.civicrm.org/jira/browse/CRM-14826
Dave Greenberg [Wed, 11 Jun 2014 18:00:08 +0000 (11:00 -0700)]
Merge pull request #3479 from monishdeb/CRM-14627
CRM-14653 notice fix
projects / civicrm-core.git / log