vcs.fsf.org Git - civicrm-core.git/log

Tim Otten [Mon, 23 Jun 2014 22:12:52 +0000 (15:12 -0700)]

Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-06-23-14-48-29

Conflicts:
CRM/Core/Invoke.php
CRM/Profile/Form.php
CRM/Profile/Form/Edit.php
api/v3/utils.php

commit | commitdiff | tree

Dave Greenberg [Mon, 23 Jun 2014 21:11:48 +0000 (14:11 -0700)]

Merge pull request #3550 from davecivicrm/CRM-14897

CRM-14897 - fix adminGroup for Cleanup Caches so it appears properly in ...

commit | commitdiff | tree

Dave Greenberg [Mon, 23 Jun 2014 21:11:03 +0000 (14:11 -0700)]

CRM-14897 - fix adminGroup for Cleanup Caches so it appears properly in admin console.

----------------------------------------
* CRM-14897:
https://issues.civicrm.org/jira/browse/CRM-14897

commit | commitdiff | tree

Dave Greenberg [Mon, 23 Jun 2014 20:31:35 +0000 (13:31 -0700)]

Merge pull request #3549 from davecivicrm/CRM-14906

CRM-14906 - notice fix on IS (NOT) EMPTY searches.

commit | commitdiff | tree

Dave Greenberg [Mon, 23 Jun 2014 20:30:50 +0000 (13:30 -0700)]

CRM-14906 - notice fix on IS (NOT) EMPTY searches.

----------------------------------------
* CRM-14906:
https://issues.civicrm.org/jira/browse/CRM-14906

commit | commitdiff | tree

Dave Greenberg [Mon, 23 Jun 2014 19:23:22 +0000 (12:23 -0700)]

Merge pull request #3547 from lcdservices/CRM-14904

CRM-14904 retain subtype when saving org from contact dashboard form

commit | commitdiff | tree

Brian Shaughnessy [Mon, 23 Jun 2014 17:38:00 +0000 (13:38 -0400)]

CRM-14904 retain subtype when saving org from contact dashboard form

commit | commitdiff | tree

Yashodha Chaku [Mon, 23 Jun 2014 06:34:38 +0000 (12:04 +0530)]

Merge pull request #3525 from yashodha/CRM-14670

CRM-14670: include target contact counter for mass mailings

commit | commitdiff | tree

Monish Deb [Mon, 23 Jun 2014 06:20:06 +0000 (11:50 +0530)]

Merge pull request #3454 from kenwest/CRM-14815

CRM-14815 subscriptionURL() doesn't add checksum when called from CLI

commit | commitdiff | tree

Eileen McNaughton [Sun, 22 Jun 2014 22:28:27 +0000 (10:28 +1200)]

Merge pull request #3541 from crusonweb/patch-2

Update 4.5.alpha2.mysql.tpl

commit | commitdiff | tree

Dan Cruson [Sun, 22 Jun 2014 22:21:33 +0000 (18:21 -0400)]

Update 4.5.alpha2.mysql.tpl

CRM-14843 Correct the update query to use name instead of id as id could be different in other installs.

commit | commitdiff | tree

Tim Otten [Sat, 21 Jun 2014 01:41:46 +0000 (18:41 -0700)]

Merge pull request #3536 from totten/4.4-12856

CRM-12856 - Cleanup

commit | commitdiff | tree

Dave Greenberg [Sat, 21 Jun 2014 00:56:21 +0000 (17:56 -0700)]

Merge pull request #3537 from davecivicrm/CRM-14861

CRM-14861 - Add order by to getLineItems function so that line-items in ...

commit | commitdiff | tree

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

commit | commitdiff | tree

Tim Otten [Sat, 21 Jun 2014 00:19:17 +0000 (17:19 -0700)]

CRM-12856 - CRM_Core_Lock - Quieter logs

The log is very noisy (adding several log lines on most page requests). This
might be useful for debugging lock issues, but that's a developer task, so
we'll only do it if CIVICRM_LOCK_DEBUG is defined.

commit | commitdiff | tree

Tim Otten [Fri, 20 Jun 2014 23:57:04 +0000 (16:57 -0700)]

CRM-12856 - CRM_Core_Lock - Autoformat

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

Eileen McNaughton [Fri, 20 Jun 2014 21:39:24 +0000 (09:39 +1200)]

Merge pull request #3528 from eileenmcnaughton/api-sync

syncronise 4.5 api behaviour with 4.4 to provide more consistent extensi...

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

fernandomv3 [Fri, 20 Jun 2014 15:10:05 +0000 (10:10 -0500)]

Add missing state from Peru

Amazonas added

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Monish Deb [Fri, 20 Jun 2014 06:45:34 +0000 (12:15 +0530)]

Merge pull request #3516 from jitendrapurohit/CRM-14869

CRM-14869

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

CiviCRM [Fri, 20 Jun 2014 05:11:26 +0000 (10:41 +0530)]

CRM-14670: fixed label for target contacts for bulk mail

commit | commitdiff | tree

Eileen McNaughton [Fri, 20 Jun 2014 03:44:09 +0000 (15:44 +1200)]

Merge pull request #3529 from eileenmcnaughton/CRM-14887

Crm 14887

commit | commitdiff | tree

Eileen McNaughton [Fri, 20 Jun 2014 03:43:56 +0000 (15:43 +1200)]

CRM-14887 further fix on table

commit | commitdiff | tree

Eileen McNaughton [Fri, 20 Jun 2014 03:33:30 +0000 (15:33 +1200)]

CRM-14887 smart group search regression on location

commit | commitdiff | tree

Eileen McNaughton [Fri, 20 Jun 2014 02:15:57 +0000 (14:15 +1200)]

syncronise 4.5 api behaviour with 4.4 to provide more consistent extension support

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

CiviCRM [Thu, 19 Jun 2014 14:17:43 +0000 (19:47 +0530)]

CRM-14670: include target contact counter for mass mailings

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

Tim Otten [Thu, 19 Jun 2014 06:05:53 +0000 (23:05 -0700)]

Merge pull request #3502 from totten/4.4-profile-db-settings

CRM-14856 - Profile DB settings

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

jitendrapurohit [Wed, 18 Jun 2014 13:36:54 +0000 (19:06 +0530)]

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

CiviCRM [Wed, 18 Jun 2014 09:35:29 +0000 (15:05 +0530)]

fix notice for participant role

commit | commitdiff | tree

CiviCRM [Wed, 18 Jun 2014 07:11:35 +0000 (12:41 +0530)]

CRM-14867: fix notice when lineitem doesn't have corresponding contribution ID

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Dave Greenberg [Tue, 17 Jun 2014 21:27:58 +0000 (14:27 -0700)]

Merge pull request #3508 from jitendrapurohit/CRM-14698

CRM-14698

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Brian Shaughnessy [Tue, 17 Jun 2014 16:24:36 +0000 (12:24 -0400)]

CRM-14872 redirect after login

commit | commitdiff | tree

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

commit | commitdiff | tree

CiviCRM [Tue, 17 Jun 2014 13:07:58 +0000 (18:37 +0530)]

commit | commitdiff | tree

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.

commit | commitdiff | tree

Eileen McNaughton [Tue, 17 Jun 2014 02:00:22 +0000 (14:00 +1200)]

commit | commitdiff | tree

Eileen McNaughton [Tue, 17 Jun 2014 01:58:19 +0000 (13:58 +1200)]

test fix - flush cache when creating contribution page

commit | commitdiff | tree

Eileen McNaughton [Tue, 17 Jun 2014 01:41:28 +0000 (13:41 +1200)]

CRM-14866 membership payment not creating for membership block type

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

CiviCRM [Mon, 16 Jun 2014 10:39:32 +0000 (16:09 +0530)]

CRM-14847: notice fix

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Kurund Jalmi [Sat, 14 Jun 2014 05:49:59 +0000 (11:19 +0530)]

Merge pull request #3439 from dlobo/CRM-14799

CRM-14799 - CiviMail keeps delivering (and bouncing) if SMTP server disappears

commit | commitdiff | tree

Tim Otten [Sat, 14 Jun 2014 02:50:43 +0000 (19:50 -0700)]

CRM-14856 - CRM_Profile_Form_Edit - Reimplement cancelURL

commit | commitdiff | tree

Tim Otten [Sat, 14 Jun 2014 00:05:06 +0000 (17:05 -0700)]

CRM-14856 - CRM_Profile_Form - Load postURL and add_to_group from DB (instead of POST)

Also:
* Keep & use a single copy of the UFGroup in $this->_ufGroup.
* Retain "gid" as a hidden field (for use in POST-backs).

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

Chris Burgess [Fri, 13 Jun 2014 04:39:12 +0000 (16:39 +1200)]

CRM-14854. Highlight the selected price, not everything in that row.

commit | commitdiff | tree

Eileen McNaughton [Fri, 13 Jun 2014 03:13:07 +0000 (15:13 +1200)]

Merge pull request #3490 from civicrm/CRM-14842

trivial tidy up to trigger jenkins