Coleman Watts [Thu, 6 Feb 2014 01:31:48 +0000 (17:31 -0800)]
CRM-14165 - Improve option popup editor
Coleman Watts [Thu, 6 Feb 2014 01:16:09 +0000 (17:16 -0800)]
CRM-13970 - Fix admin option links
Coleman Watts [Thu, 6 Feb 2014 00:44:54 +0000 (16:44 -0800)]
CRM-14165 - Improve option page lookup
colemanw [Wed, 5 Feb 2014 23:34:30 +0000 (15:34 -0800)]
Merge pull request #2479 from colemanw/css
Form style improvements
Coleman Watts [Wed, 5 Feb 2014 23:32:53 +0000 (15:32 -0800)]
Make form element css more consistent
Coleman Watts [Wed, 5 Feb 2014 23:31:43 +0000 (15:31 -0800)]
CRM-13966 - Improve select2 styling
colemanw [Wed, 5 Feb 2014 20:00:20 +0000 (12:00 -0800)]
Merge pull request #2477 from colemanw/css
Improve css
Coleman Watts [Wed, 5 Feb 2014 19:46:59 +0000 (11:46 -0800)]
Make CiviCRM look better
Kurund Jalmi [Wed, 5 Feb 2014 15:50:39 +0000 (07:50 -0800)]
Merge pull request #2474 from jitendrapurohit/CRM-13833
CRM-13833 fix
Web Access [Wed, 5 Feb 2014 14:17:05 +0000 (19:47 +0530)]
CRM-13833 fix
Yashodha Chaku [Wed, 5 Feb 2014 09:54:16 +0000 (15:24 +0530)]
Merge pull request #2473 from yashodha/HR-252.fix
get rid of grouping filter
yashodha [Wed, 5 Feb 2014 10:02:50 +0000 (15:32 +0530)]
get of grouping filter
Coleman Watts [Wed, 5 Feb 2014 00:57:01 +0000 (16:57 -0800)]
CRM-14170 - BugFix for closing help dialog when clicked rapidly
colemanw [Wed, 5 Feb 2014 00:50:13 +0000 (16:50 -0800)]
Merge pull request #2469 from colemanw/master
CRM-14170 - Close help dialog when clicked twice
Coleman Watts [Wed, 5 Feb 2014 00:48:33 +0000 (16:48 -0800)]
CRM-14170 - Close help dialog when clicked twice
Coleman Watts [Tue, 4 Feb 2014 23:32:37 +0000 (15:32 -0800)]
CRM-13970 - Fix upgrade script
colemanw [Tue, 4 Feb 2014 22:27:50 +0000 (14:27 -0800)]
Merge pull request #2465 from colemanw/select
Select
Coleman Watts [Tue, 4 Feb 2014 22:26:30 +0000 (14:26 -0800)]
CRM-14165 - Add client-side options editor and add to activity form
Coleman Watts [Tue, 4 Feb 2014 18:34:23 +0000 (10:34 -0800)]
CRM-13970 - Remove redundant option group page/form
Tim Otten [Tue, 4 Feb 2014 09:57:54 +0000 (01:57 -0800)]
Merge pull request #2460 from NileemaJadhav/HR-235
--HR-235 Modification for showing column header label on Map field page
Nileema [Tue, 4 Feb 2014 09:11:50 +0000 (14:41 +0530)]
--HR-235 rowDisplayCount tweak
Nileema [Tue, 4 Feb 2014 07:10:05 +0000 (12:40 +0530)]
-- Code modification
Nileema [Tue, 4 Feb 2014 06:19:56 +0000 (11:49 +0530)]
--HR-235 Modification for showing column header label on Map field page
Coleman Watts [Tue, 4 Feb 2014 04:41:19 +0000 (20:41 -0800)]
CRM-14165 - Add metadata-based quickform select
Coleman Watts [Mon, 3 Feb 2014 23:56:25 +0000 (15:56 -0800)]
Test cleanup
kurund [Mon, 3 Feb 2014 22:55:07 +0000 (14:55 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-02-03-14-48-25
Conflicts:
CRM/Contribute/BAO/Contribution.php
tests/phpunit/api/v3/GroupContactTest.php
Coleman Watts [Mon, 3 Feb 2014 22:14:01 +0000 (14:14 -0800)]
CRM-13966 - select2 - improve defaults and php docs
Kurund Jalmi [Mon, 3 Feb 2014 22:01:24 +0000 (14:01 -0800)]
Merge pull request #2434 from mlutfy/crm14147-4.4
CRM-14147: Fix 4.1 to 4.2 upgrade in non-english (ex: french, where the profileTitle may have an apostrophe in it.
Dave Greenberg [Mon, 3 Feb 2014 21:05:29 +0000 (13:05 -0800)]
Merge pull request #2453 from davecivicrm/CRM-14047b
CRM-14047 - for this participant should only be appended when additional...
Dave Greenberg [Mon, 3 Feb 2014 21:04:09 +0000 (13:04 -0800)]
CRM-14047 - for this participant should only be appended when additionalParticipants flag is true - otherwise it is confusing.
----------------------------------------
* CRM-14047: Online event registration: add text to clarify the meaning of the Total Fee(s) calculated value
http://issues.civicrm.org/jira/browse/CRM-14047
Dave Greenberg [Mon, 3 Feb 2014 20:59:09 +0000 (12:59 -0800)]
Merge pull request #2449 from eileenmcnaughton/CRM-14155
CRM-14155 Participant Reports - add event custom fields as fields & filt...
Tim Otten [Mon, 3 Feb 2014 20:13:06 +0000 (12:13 -0800)]
Merge pull request #2452 from totten/lolas-freeform-CRM-14126
CRM-14126 - Wrap CURLOPT_FOLLOWLOCATION in a check for open_basedir and safe_mode
Tim Otten [Mon, 3 Feb 2014 20:09:58 +0000 (12:09 -0800)]
CRM-14126 - CRM_Extension - Add pleasant warning and log message if open_basedir/safe_mode prevents redirects.
----------------------------------------
* CRM-14126: HttpClient.php library used by CiviCRM issues a PHP warning when open_basedir is set
http://issues.civicrm.org/jira/browse/CRM-14126
Kurund Jalmi [Mon, 3 Feb 2014 20:04:26 +0000 (12:04 -0800)]
Merge pull request #2436 from eileenmcnaughton/test-fix
Test fix
Kurund Jalmi [Mon, 3 Feb 2014 19:32:08 +0000 (11:32 -0800)]
Merge pull request #2444 from eileenmcnaughton/CRM-14151
CRM-14151 add hacky-handling to receive date like other date fields in c...
Kurund Jalmi [Mon, 3 Feb 2014 19:28:20 +0000 (11:28 -0800)]
Merge pull request #2448 from fuzionnz/CRM-14154
CRM-14154. Add API method for "message_template", "send".
colemanw [Mon, 3 Feb 2014 17:47:53 +0000 (09:47 -0800)]
Merge pull request #2451 from colemanw/contactRef
Contact ref
Coleman Watts [Mon, 3 Feb 2014 17:45:15 +0000 (09:45 -0800)]
CRM-13966 - select2 - set default & allowClear from markup
Coleman Watts [Mon, 3 Feb 2014 16:32:25 +0000 (08:32 -0800)]
CRM-13966 - entityRef - Render frozen text as link when appropriate
Coleman Watts [Mon, 3 Feb 2014 07:26:24 +0000 (23:26 -0800)]
CRM-13966 - Change contactRef to entityRef
Dave Greenberg [Mon, 3 Feb 2014 03:45:47 +0000 (19:45 -0800)]
Merge pull request #2446 from pradpnayak/CRM-13968
Crm 13968
Dave Greenberg [Mon, 3 Feb 2014 03:25:42 +0000 (19:25 -0800)]
Merge pull request #2450 from davecivicrm/CRM-13833b
CRM-13833 - Add contact summary link to soft credit contacts in Soft Cre...
Dave Greenberg [Mon, 3 Feb 2014 03:24:35 +0000 (19:24 -0800)]
CRM-13833 - Add contact summary link to soft credit contacts in Soft Credit report.
----------------------------------------
* CRM-13833: Implement Soft Credit Types
http://issues.civicrm.org/jira/browse/CRM-13833
Eileen [Mon, 3 Feb 2014 01:19:10 +0000 (14:19 +1300)]
CRM-14156 Participant Reports add group filter & tag filters
Eileen [Mon, 3 Feb 2014 01:02:14 +0000 (14:02 +1300)]
CRM-14155 Participant Reports - add event custom fields as fields & filters
Chris Burgess [Sun, 2 Feb 2014 21:09:50 +0000 (10:09 +1300)]
CRM-14154. require_once() not required once.
Chris Burgess [Sun, 2 Feb 2014 21:01:04 +0000 (10:01 +1300)]
CRM-14154. Add API method for "message_template", "send".
Coleman Watts [Sun, 2 Feb 2014 05:07:10 +0000 (21:07 -0800)]
CRM-13966 - Migrate activity source_contact_id to use select2
Coleman Watts [Sun, 2 Feb 2014 05:00:51 +0000 (21:00 -0800)]
CRM-13966 - Improve search widget style
Coleman Watts [Sun, 2 Feb 2014 05:00:10 +0000 (21:00 -0800)]
CRM-13966 - Workaround for ui.dialog & select2 conflict
Coleman Watts [Sun, 2 Feb 2014 04:58:44 +0000 (20:58 -0800)]
CRM-13966 - Add method to Core_Form for contactRef fields
Pradeep Nayak [Sat, 1 Feb 2014 18:16:27 +0000 (23:46 +0530)]
-- CRM-13968, added upgrade code to handle errorneous data with incorrect values
for to_financial_account_id and status_id
----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
http://issues.civicrm.org/jira/browse/CRM-13968
Pradeep Nayak [Sat, 1 Feb 2014 18:15:03 +0000 (23:45 +0530)]
-- CRM-13968, Added code to handle transaction for In progress contribution status
----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
http://issues.civicrm.org/jira/browse/CRM-13968
Pradeep Nayak [Sat, 1 Feb 2014 18:11:31 +0000 (23:41 +0530)]
CRM-13968, handled In-progress to Completed contribution status change
----------------------------------------
* CRM-13968: Contributions with "In Progress" status can't be edited and saved
http://issues.civicrm.org/jira/browse/CRM-13968
colemanw [Fri, 31 Jan 2014 22:44:19 +0000 (14:44 -0800)]
Merge pull request #2445 from colemanw/4.4
Fix membership join date from being overwritten by api
Coleman Watts [Fri, 31 Jan 2014 22:35:56 +0000 (14:35 -0800)]
Fix membership join date from being overwritten by api
Eileen McNaughton [Fri, 31 Jan 2014 20:12:42 +0000 (09:12 +1300)]
CRM-14151 add hacky-handling to receive date like other date fields in completetransaction function to mitigate DAO->find() followed by DAO->save() fatalling on date fields .. sometimes
----------------------------------------
* CRM-14151: BaseIPN fails when receipt_date is set
http://issues.civicrm.org/jira/browse/CRM-14151
Dave Greenberg [Fri, 31 Jan 2014 19:15:43 +0000 (11:15 -0800)]
Merge pull request #2443 from davecivicrm/CRM-14149
CRM-14149 - fix bad markup in Job.tpl
Dave Greenberg [Fri, 31 Jan 2014 19:14:56 +0000 (11:14 -0800)]
CRM-14149 - fix bad markup in Job.tpl
----------------------------------------
* CRM-14149: Bad tags on Add Scheduled Job page break page layout
http://issues.civicrm.org/jira/browse/CRM-14149
Dave Greenberg [Fri, 31 Jan 2014 18:57:35 +0000 (10:57 -0800)]
Merge pull request #2442 from davecivicrm/CRM-14146
CRM-14146 - conditionally change contribution button text based on whet...
Dave Greenberg [Fri, 31 Jan 2014 18:55:25 +0000 (10:55 -0800)]
CRM-14146 - conditionally change contribution button text based on whether confirm page is skipped.
----------------------------------------
* CRM-14146: Button on contribution page should be "Confirm Contribution"
http://issues.civicrm.org/jira/browse/CRM-14146
Dave Greenberg [Fri, 31 Jan 2014 18:50:01 +0000 (10:50 -0800)]
Merge pull request #2437 from pratik-joshi/CRM-13965
Crm 13965
colemanw [Fri, 31 Jan 2014 18:49:41 +0000 (10:49 -0800)]
Merge pull request #2441 from colemanw/select2
Goodbye crmasmselect! Hello Select2
Coleman Watts [Fri, 31 Jan 2014 18:27:49 +0000 (10:27 -0800)]
CRM-13966 - Refactor out and remove crmasmselect
dlobo [Fri, 31 Jan 2014 17:42:39 +0000 (09:42 -0800)]
Merge pull request #2440 from dlobo/CRM-14150
CRM-14150 - Auto reply fails
Donald A. Lobo [Fri, 31 Jan 2014 17:41:33 +0000 (09:41 -0800)]
CRM-14150 - Auto reply fails
http://issues.civicrm.org/jira/browse/CRM-14150
deepak-srivastava [Fri, 31 Jan 2014 07:30:38 +0000 (23:30 -0800)]
Merge pull request #2438 from deepak-srivastava/CRM-14129
CRM-14129 - Core reports - passing mhas as a URL criteria is ignored
Coleman Watts [Fri, 31 Jan 2014 04:33:19 +0000 (20:33 -0800)]
CRM-13966 - Style select2 with search icon
Coleman Watts [Fri, 31 Jan 2014 03:33:49 +0000 (19:33 -0800)]
CRM-13966 - Convert campaign crmasmselect to select2 and support optgroups
Pratik Joshi [Fri, 31 Jan 2014 03:33:29 +0000 (09:03 +0530)]
CRM-13965 : webtest, handling one more thing to check
Coleman Watts [Fri, 31 Jan 2014 03:31:30 +0000 (19:31 -0800)]
CRM-13966 - Convert adv search crmasmselect to select2
Pratik Joshi [Fri, 31 Jan 2014 02:20:44 +0000 (07:50 +0530)]
CRM-13965 : webtest adding, also few minor improvements done while coding webtest
Eileen McNaughton [Fri, 31 Jan 2014 02:15:51 +0000 (15:15 +1300)]
test suite, one more fn to change groupCreate signature on
Eileen McNaughton [Tue, 28 Jan 2014 01:23:22 +0000 (14:23 +1300)]
CRM-14139 ajax grouplist call - fixes notices on non-static functions
----------------------------------------
* CRM-14139: Static methods called non-statically
http://issues.civicrm.org/jira/browse/CRM-14139
Dave Greenberg [Fri, 31 Jan 2014 01:26:45 +0000 (17:26 -0800)]
Merge pull request #2435 from davecivicrm/CRM-13833
CRM-13833 - Fix bad variable in message templates.
Dave Greenberg [Fri, 31 Jan 2014 01:25:58 +0000 (17:25 -0800)]
CRM-13833 - Fix bad variable in message templates.
----------------------------------------
* CRM-13833: Implement Soft Credit Types
http://issues.civicrm.org/jira/browse/CRM-13833
Coleman Watts [Thu, 30 Jan 2014 22:36:19 +0000 (14:36 -0800)]
CRM-13966 - Add Select2.js and basic widget support
Mathieu Lutfy [Thu, 30 Jan 2014 21:07:16 +0000 (16:07 -0500)]
CRM-14147: Fix 4.1 to 4.2 upgrade in non-english (ex: french, where the profileTitle may have an apostrophe in it.
colemanw [Thu, 30 Jan 2014 19:10:28 +0000 (11:10 -0800)]
Merge pull request #2433 from colemanw/autocomplete
Autocomplete work in progress
Coleman Watts [Thu, 30 Jan 2014 18:55:47 +0000 (10:55 -0800)]
CRM-10760 - Autocomplte - Add css
Coleman Watts [Thu, 30 Jan 2014 01:02:41 +0000 (17:02 -0800)]
CRM-10760 - Autocomplte - Simplify single contact check
Coleman Watts [Thu, 30 Jan 2014 00:50:11 +0000 (16:50 -0800)]
CRM-10760 - Autocomplte - Place menu in front
Coleman Watts [Wed, 29 Jan 2014 21:25:43 +0000 (13:25 -0800)]
CRM-10760 - Autocomplte - Remove unused function with the same name
Coleman Watts [Wed, 29 Jan 2014 20:53:49 +0000 (12:53 -0800)]
CRM-10760 - Autocomplte - Convert quicksearch bar to use jQuery.ui + CRM.api
Deepak Srivastava [Thu, 30 Jan 2014 08:31:38 +0000 (14:01 +0530)]
CRM-14129 - Core reports - passing mhas as a URL criteria is ignored
http://issues.civicrm.org/jira/browse/CRM-14129
Kurund Jalmi [Thu, 30 Jan 2014 04:20:07 +0000 (20:20 -0800)]
Merge pull request #2430 from pratik-joshi/fix-for-regression
fix-for-regression : caused by PR#2314
Pratik Joshi [Thu, 30 Jan 2014 03:57:22 +0000 (09:27 +0530)]
fix-for-regression : caused by PR#2314
Kurund Jalmi [Thu, 30 Jan 2014 03:26:52 +0000 (19:26 -0800)]
Merge pull request #2427 from pratik-joshi/CRM-13964
Crm 13964
dlobo [Wed, 29 Jan 2014 22:12:17 +0000 (14:12 -0800)]
Merge pull request #2429 from dlobo/CRM-14085
CRM-14085 - wrong syntax on inner join for contribution report
Donald A. Lobo [Wed, 29 Jan 2014 22:11:24 +0000 (14:11 -0800)]
CRM-14085 - wrong syntax on inner join for contribution report
http://issues.civicrm.org/jira/browse/CRM-14085
dlobo [Wed, 29 Jan 2014 22:09:20 +0000 (14:09 -0800)]
Merge pull request #2428 from dlobo/CRM-14101
CRM-14101 - Unauthenticated/anonymous users can register for events even when Drupal permissions should stop them
Donald A. Lobo [Wed, 29 Jan 2014 22:07:47 +0000 (14:07 -0800)]
CRM-14101 - Unauthenticated/anonymous users can register for events even when Drupal permissions should stop them
http://issues.civicrm.org/jira/browse/CRM-14101
dlobo [Wed, 29 Jan 2014 21:46:10 +0000 (13:46 -0800)]
Merge pull request #2424 from eileenmcnaughton/test-fixes
test suite - fix signature on GroupCreate call
dlobo [Wed, 29 Jan 2014 21:43:40 +0000 (13:43 -0800)]
Merge pull request #2425 from dlobo/CRM-14130
CRM-14130 - Undefined property: CRM_Core_DAO...reply.php
Pratik Joshi [Wed, 29 Jan 2014 09:35:56 +0000 (15:05 +0530)]
CRM-13964 : CRM test
Coleman Watts [Tue, 28 Jan 2014 23:01:55 +0000 (15:01 -0800)]
CRM-10760 - Autocomplte - Create utility to abstract rendering of autocomplete output
colemanw [Wed, 29 Jan 2014 01:57:35 +0000 (17:57 -0800)]
Merge pull request #2426 from davecivicrm/CRM-14143
CRM-14143 - Fix group selector display when showOrgInfo is true - multi-...
Dave Greenberg [Wed, 29 Jan 2014 01:44:38 +0000 (17:44 -0800)]
CRM-14143 - Fix group selector display when showOrgInfo is true - multi-site enabled.
----------------------------------------
* CRM-14143: Sub-group display off when multi-site enabled
http://issues.civicrm.org/jira/browse/CRM-14143
Coleman Watts [Wed, 29 Jan 2014 01:37:08 +0000 (17:37 -0800)]
Sharpen logo image
Donald A. Lobo [Wed, 29 Jan 2014 00:09:49 +0000 (16:09 -0800)]
CRM-14130 - Undefined property: CRM_Core_DAO...reply.php
http://issues.civicrm.org/jira/browse/CRM-14130