Coleman Watts [Wed, 30 Apr 2014 03:10:09 +0000 (20:10 -0700)]
CRM-14557 - Remove stray script tag which was breaking ajax
Coleman Watts [Wed, 30 Apr 2014 03:03:24 +0000 (20:03 -0700)]
Standardize on get not request
Coleman Watts [Wed, 30 Apr 2014 03:01:36 +0000 (20:01 -0700)]
CRM-14215 - Fix ajax redirects
Coleman Watts [Wed, 30 Apr 2014 01:45:19 +0000 (18:45 -0700)]
CRM-14215 - Fix popup form errors
Kurund Jalmi [Wed, 30 Apr 2014 00:33:53 +0000 (17:33 -0700)]
Merge pull request #2744 from pratik-joshi/CRM-13992_temp_fix
CRM-14386 fix for : form rule validation notifications not shown
Kurund Jalmi [Wed, 30 Apr 2014 00:33:04 +0000 (17:33 -0700)]
Merge pull request #3024 from relldoesphp/CRM-14503
CRM-14503 patch fixes grouphierarchy error
Coleman Watts [Wed, 30 Apr 2014 00:14:32 +0000 (17:14 -0700)]
Merge branch 'tests'
Conflicts:
CRM/Core/SelectValues.php
Coleman Watts [Tue, 29 Apr 2014 20:42:05 +0000 (13:42 -0700)]
Code cleanup
Coleman Watts [Tue, 29 Apr 2014 20:27:03 +0000 (13:27 -0700)]
tpl cleanup
colemanw [Tue, 29 Apr 2014 20:16:23 +0000 (13:16 -0700)]
Merge pull request #3021 from NileemaJadhav/HR-345
HR-345 Fix the broken edit link on profileSelector for support of case sub type
Kurund Jalmi [Tue, 29 Apr 2014 19:50:48 +0000 (12:50 -0700)]
Merge pull request #3007 from GinkgoFJG/CRM-14283
Fixed CRM-14283. Strips protocol and domain name from premium image befo...
Yashodha Chaku [Tue, 29 Apr 2014 19:50:41 +0000 (01:20 +0530)]
Merge pull request #3027 from yashodha/CRM-14418
CRM-14418: fix scheduled reminder UI
Yashodha Chaku [Tue, 29 Apr 2014 19:28:31 +0000 (00:58 +0530)]
Merge pull request #3018 from divya-jose/HR-344-fixes
--fixes for HR-344,changes to retrieve caseId based on case_type
Eileen McNaughton [Tue, 29 Apr 2014 19:15:28 +0000 (12:15 -0700)]
Merge pull request #3031 from eileenmcnaughton/code-cleanup
standardise api scheduled reminder
Eileen McNaughton [Thu, 13 Mar 2014 04:53:36 +0000 (17:53 +1300)]
CRM-14319 standardise action_schedule api
in the course of trying to write tests for this I found the api was non-standard in ways that suggested copy & paste rather than
intention. The mandatory fields said one of title, mapping_id, entity_value & entity_status - whereas it seemed to me that all
are required except entity_status, also I found that one date field was required, other changes were only legacy boilerplate
----------------------------------------
* CRM-14319: not all scheduled reminders are being sent
http://issues.civicrm.org/jira/browse/CRM-14319
Conflicts:
api/v3/ActionSchedule.php
Eileen McNaughton [Tue, 29 Apr 2014 14:56:20 +0000 (07:56 -0700)]
fix comment blocks
Coleman Watts [Tue, 29 Apr 2014 19:02:05 +0000 (12:02 -0700)]
Fix profileSelector and select2
Eileen McNaughton [Tue, 29 Apr 2014 18:29:18 +0000 (11:29 -0700)]
Merge pull request #3028 from eileenmcnaughton/test-fixes
Test fixes - Membership form test
Eileen McNaughton [Tue, 29 Apr 2014 14:39:04 +0000 (07:39 -0700)]
minor code tidyups
Eileen McNaughton [Tue, 29 Apr 2014 16:48:59 +0000 (09:48 -0700)]
more comment fixes
Eileen McNaughton [Tue, 29 Apr 2014 17:39:07 +0000 (10:39 -0700)]
fix invalid php count statement (identified by IDE - unsure if it was causing bug
Eileen McNaughton [Tue, 29 Apr 2014 14:34:04 +0000 (07:34 -0700)]
add product api test:
Eileen McNaughton [Tue, 29 Apr 2014 18:25:50 +0000 (11:25 -0700)]
update membership form rule test
Coleman Watts [Tue, 29 Apr 2014 18:21:42 +0000 (11:21 -0700)]
CRM-14181 - Cleanup membership form
colemanw [Tue, 29 Apr 2014 17:50:55 +0000 (10:50 -0700)]
Merge pull request #3001 from torrance/breadcrumbs
Ensure breadcrumbs are formatted correctly by the CMS.
Eileen McNaughton [Tue, 29 Apr 2014 17:39:07 +0000 (10:39 -0700)]
fix invalid php count statement (identified by IDE - unsure if it was causing bug
Eileen McNaughton [Tue, 29 Apr 2014 17:22:45 +0000 (10:22 -0700)]
Merge pull request #3025 from sgladstone/patch-3
Update Membership.php
Sarah Gladstone [Tue, 29 Apr 2014 17:21:38 +0000 (10:21 -0700)]
Update Membership.php
formatting improvements
Sarah Gladstone [Tue, 29 Apr 2014 17:16:13 +0000 (10:16 -0700)]
Update Membership.php
Change compare to false to "empty" function
Sarah Gladstone [Tue, 29 Apr 2014 17:11:49 +0000 (10:11 -0700)]
Update Membership.php
Check if status_id is empty before using it to look inside an array
Tyrell Cook [Tue, 29 Apr 2014 17:06:51 +0000 (13:06 -0400)]
CRM-14503 patch fixes grouphierarchy error
Kurund Jalmi [Tue, 29 Apr 2014 16:59:20 +0000 (09:59 -0700)]
Merge pull request #3016 from jitendrapurohit/Import_Webtest
Web Test Fix
Eileen McNaughton [Tue, 29 Apr 2014 16:48:59 +0000 (09:48 -0700)]
more comment fixes
Eileen McNaughton [Tue, 29 Apr 2014 16:46:58 +0000 (09:46 -0700)]
CRM-14181 remove form-related enum options from static functions (need to separately alter form elements) as this breaks test & returns invalid options (eg api)
colemanw [Tue, 29 Apr 2014 16:26:25 +0000 (09:26 -0700)]
Merge pull request #3012 from eileenmcnaughton/CRM-14527
CRM-14527 migrate cid=0 to use entity ref
Eileen McNaughton [Tue, 29 Apr 2014 14:56:20 +0000 (07:56 -0700)]
fix comment blocks
Nileema [Tue, 29 Apr 2014 14:47:18 +0000 (20:17 +0530)]
HR-345 Fix the broken edit link on profileSelector for support of case sub type
Eileen McNaughton [Tue, 29 Apr 2014 14:44:04 +0000 (07:44 -0700)]
minor code tidy ups
Eileen McNaughton [Tue, 29 Apr 2014 14:39:04 +0000 (07:39 -0700)]
minor code tidyups
Divya Jose [Tue, 29 Apr 2014 14:34:36 +0000 (20:04 +0530)]
--minor fixes
Eileen McNaughton [Tue, 29 Apr 2014 14:34:04 +0000 (07:34 -0700)]
add product api test:
Divya Jose [Tue, 29 Apr 2014 14:19:21 +0000 (19:49 +0530)]
--fixes for HR-344,changes to retrieve caseId based on case_type
Eileen McNaughton [Tue, 29 Apr 2014 13:42:32 +0000 (06:42 -0700)]
Merge pull request #3017 from eileenmcnaughton/tests
CRM-14350 add test to check for reported E-Notice
Eileen McNaughton [Tue, 29 Apr 2014 13:42:01 +0000 (06:42 -0700)]
CRM-14350 add test to check for reported E-Notice
jitendrapurohit [Tue, 29 Apr 2014 13:03:16 +0000 (18:33 +0530)]
Web Test Fix
Deepak Srivastava [Tue, 29 Apr 2014 08:14:58 +0000 (13:44 +0530)]
Merge pull request #3014 from deepak-srivastava/CRM-14452
appropriate base table for source activities
Deepak Srivastava [Tue, 29 Apr 2014 08:13:43 +0000 (13:43 +0530)]
appropriate base table for source activities
Deepak Srivastava [Tue, 29 Apr 2014 07:32:10 +0000 (13:02 +0530)]
Merge pull request #3013 from deepak-srivastava/CRM-14453
remove redundant where clause
Deepak Srivastava [Tue, 29 Apr 2014 07:14:42 +0000 (12:44 +0530)]
remove redundant where clause
Eileen McNaughton [Tue, 29 Apr 2014 06:51:53 +0000 (23:51 -0700)]
CRM-14527 migrate cid=0 to use entity ref
Kurund Jalmi [Tue, 29 Apr 2014 05:37:07 +0000 (22:37 -0700)]
Merge pull request #3006 from davecivicrm/CRM-14492
CRM-14492 - Show admin-only price fields on front end event info and eve...
Kurund Jalmi [Tue, 29 Apr 2014 05:29:42 +0000 (22:29 -0700)]
Merge pull request #3005 from kurund/CRM-14300
CRM-14300
Frank J. Gómez [Tue, 29 Apr 2014 03:57:32 +0000 (20:57 -0700)]
CRM-14283 - Removed URL validation for premium images since we now use local URLs (i.e., no domain).
----------------------------------------
* CRM-14283: Premium image upload button => http-only URL for images => Firefox insecure page warning
https://issues.civicrm.org/jira/browse/CRM-14283
yashodha [Tue, 29 Apr 2014 02:49:01 +0000 (08:19 +0530)]
CRM-14418: fix scheduled reminder UI
colemanw [Tue, 29 Apr 2014 01:23:48 +0000 (18:23 -0700)]
Merge pull request #3004 from sgladstone/master
CRM-14555
Sarah Gladstone [Tue, 29 Apr 2014 01:23:27 +0000 (18:23 -0700)]
fix whitespace
Sarah Gladstone [Tue, 29 Apr 2014 01:12:52 +0000 (18:12 -0700)]
more formatting changes
Sarah Gladstone [Tue, 29 Apr 2014 01:08:28 +0000 (18:08 -0700)]
formatting changes
Sarah Gladstone [Tue, 29 Apr 2014 01:04:09 +0000 (18:04 -0700)]
Update Membership.php
Frank J. Gómez [Tue, 29 Apr 2014 00:29:13 +0000 (17:29 -0700)]
Fixed CRM-14283. Strips protocol and domain name from premium image before storing URL in DB.
----------------------------------------
* CRM-14283: Premium image upload button => http-only URL for images => Firefox insecure page warning
https://issues.civicrm.org/jira/browse/CRM-14283
Dave Greenberg [Tue, 29 Apr 2014 00:14:15 +0000 (17:14 -0700)]
CRM-14492 - Show admin-only price fields on front end event info and event registration pages if the user is logged in and has administer CiviCRM permission.
----------------------------------------
* CRM-14492:
https://issues.civicrm.org/jira/browse/CRM-14492
kurund [Tue, 29 Apr 2014 00:05:33 +0000 (17:05 -0700)]
Merge branch 'CRM-14300' of github.com:monishdeb/civicrm-core into CRM-14300
Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql
----------------------------------------
* CRM-14300: Slow query - participant report
https://issues.civicrm.org/jira/browse/CRM-14300
Sarah Gladstone [Tue, 29 Apr 2014 00:04:25 +0000 (17:04 -0700)]
CRM-14555
Back-office user can now fill in an end date for lifetime memberships
Kurund Jalmi [Mon, 28 Apr 2014 23:57:34 +0000 (16:57 -0700)]
Merge pull request #2916 from NileemaJadhav/HR-13-fix
HR fix to show case status based on filter column
Kurund Jalmi [Mon, 28 Apr 2014 23:09:47 +0000 (16:09 -0700)]
Merge pull request #3002 from kurund/error-fixes
notice fixes
kurund [Mon, 28 Apr 2014 23:09:10 +0000 (16:09 -0700)]
notice fixes
colemanw [Mon, 28 Apr 2014 23:03:19 +0000 (16:03 -0700)]
Merge pull request #3000 from sgladstone/pdfcase
Allow use of PDF letter from within a case
Sarah Gladstone [Mon, 28 Apr 2014 22:57:25 +0000 (15:57 -0700)]
Update CaseView.php
formatting changes
Torrance [Mon, 28 Apr 2014 22:57:07 +0000 (10:57 +1200)]
Ensure breadcrumbs are formatted correctly by the CMS.
Sarah Gladstone [Mon, 28 Apr 2014 22:55:26 +0000 (15:55 -0700)]
Update CaseView.php
formatting changes
Sarah Gladstone [Mon, 28 Apr 2014 22:49:46 +0000 (18:49 -0400)]
X-Powered-By: PHP/5.3.27
Content-type: text/html
Kurund Jalmi [Mon, 28 Apr 2014 22:38:58 +0000 (15:38 -0700)]
Merge pull request #2999 from GinkgoFJG/CRM-14545
Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for memberships.
Frank J. Gómez [Mon, 28 Apr 2014 22:27:16 +0000 (15:27 -0700)]
Fixed CRM-14545. "Contribution Amounts Label" is respected even when used for memberships.
----------------------------------------
* CRM-14545: Contribution page does not respect "Contribution Amounts Label" when page is also used for memberships
https://issues.civicrm.org/jira/browse/CRM-14545
colemanw [Mon, 28 Apr 2014 22:23:17 +0000 (15:23 -0700)]
Merge pull request #2997 from sgladstone/mailtoken
CRM-14507 - Domain tokens using HTML in plain text portion
Sarah Gladstone [Mon, 28 Apr 2014 22:19:54 +0000 (18:19 -0400)]
X-Powered-By: PHP/5.3.27
Content-type: text/html
CRM-14507 - Domain tokens using HTML in plain text portion
----------------------------------------
* CRM-14507: Domain token replacement in Message Templates uses HTML tokens for text parts
https://issues.civicrm.org/jira/browse/CRM-14507
Kurund Jalmi [Mon, 28 Apr 2014 22:01:27 +0000 (15:01 -0700)]
Merge pull request #2996 from kurund/CRM-14164
fixes for CRM-14164
Kurund Jalmi [Mon, 28 Apr 2014 21:59:38 +0000 (14:59 -0700)]
Merge pull request #2984 from relldoesphp/CRM-14247
implemented patch and fixed bulk email name change possibility
Tyrell Cook [Mon, 28 Apr 2014 21:56:41 +0000 (17:56 -0400)]
CRM-14247 applied Kurund patch
kurund [Mon, 28 Apr 2014 21:56:26 +0000 (14:56 -0700)]
fixes for CRM-14164
----------------------------------------
* CRM-14164: Static methods called non-statically :: CRM_Mailing_BAO_MailingJob::create
https://issues.civicrm.org/jira/browse/CRM-14164
Tyrell Cook [Mon, 28 Apr 2014 21:55:49 +0000 (17:55 -0400)]
CRM-14247 applied Kurund patch
Eileen McNaughton [Mon, 28 Apr 2014 21:54:41 +0000 (14:54 -0700)]
Merge pull request #2995 from eileenmcnaughton/tests
Test fix - ensure options is an array
Eileen McNaughton [Mon, 28 Apr 2014 21:54:05 +0000 (14:54 -0700)]
test fix for possibility of as string- eg. products
Eileen McNaughton [Mon, 28 Apr 2014 21:53:33 +0000 (14:53 -0700)]
comment fix
Dave Greenberg [Mon, 28 Apr 2014 21:40:24 +0000 (14:40 -0700)]
Merge pull request #2993 from colemanw/master
CRM-14477 - Fix case datatable refresh
Kurund Jalmi [Mon, 28 Apr 2014 21:36:54 +0000 (14:36 -0700)]
Merge pull request #2973 from GinkgoFJG/CRM-14354v2
Fix for CRM-14354 - Additional gift breaks ARB (auto-renewing) memberships.
Coleman Watts [Mon, 28 Apr 2014 21:27:17 +0000 (14:27 -0700)]
CRM-14477 - Fix case datatable refresh
Coleman Watts [Mon, 28 Apr 2014 21:21:09 +0000 (14:21 -0700)]
Action icon tweaks
Dave Greenberg [Mon, 28 Apr 2014 21:18:21 +0000 (14:18 -0700)]
Merge pull request #2992 from davecivicrm/CRM-14122
CRM-14122 - Clarify contact matching rules for component imports.
Dave Greenberg [Mon, 28 Apr 2014 21:15:01 +0000 (14:15 -0700)]
CRM-14122 - Clarify contact matching rules for component imports.
----------------------------------------
* CRM-14122:
https://issues.civicrm.org/jira/browse/CRM-14122
Dave Greenberg [Mon, 28 Apr 2014 20:49:26 +0000 (13:49 -0700)]
Merge pull request #2909 from jake-mw/crm-14472
CRM-14472 - query correct table for contribution-type vs. event-type PCPs
colemanw [Mon, 28 Apr 2014 20:40:15 +0000 (13:40 -0700)]
Merge pull request #2979 from tadpolecc/tadpole-wc
CRM-14543 - Enabling ReCaptcha fails if library is already loaded
colemanw [Mon, 28 Apr 2014 20:29:55 +0000 (13:29 -0700)]
Merge pull request #2991 from colemanw/master
CRM-14490 - Fix batch entry table
Coleman Watts [Mon, 28 Apr 2014 20:22:41 +0000 (13:22 -0700)]
CRM-14490 - Fix batch entry table
Eileen McNaughton [Mon, 28 Apr 2014 19:55:13 +0000 (12:55 -0700)]
Merge pull request #2990 from eileenmcnaughton/tests
output unknown reload mode
Eileen McNaughton [Mon, 28 Apr 2014 19:54:12 +0000 (12:54 -0700)]
output unknown reload mode
Eileen McNaughton [Mon, 28 Apr 2014 19:29:23 +0000 (12:29 -0700)]
Merge pull request #2989 from eileenmcnaughton/tests
For unknown reasons using the API rather than BAO fixes the test locally...
Eileen McNaughton [Mon, 28 Apr 2014 19:27:39 +0000 (12:27 -0700)]
For unknown reasons using the API rather than BAO fixes the test locally for me
Kurund Jalmi [Mon, 28 Apr 2014 19:00:03 +0000 (12:00 -0700)]
Merge pull request #2987 from kurund/CRM-14276
fatal error fixes due to bad merge CRM-14276
kurund [Mon, 28 Apr 2014 18:59:18 +0000 (11:59 -0700)]
fatal error fixes due to bad merge CRM-14276
----------------------------------------
* CRM-14276: Hook for display name
https://issues.civicrm.org/jira/browse/CRM-14276
Eileen McNaughton [Mon, 28 Apr 2014 18:47:23 +0000 (11:47 -0700)]
Merge pull request #2985 from eileenmcnaughton/tests
remove & before function
projects / civicrm-core.git / log