civicrm-core.git
9 years agoslight change
Siddhant Rajagopalan [Tue, 26 Aug 2014 10:53:01 +0000 (16:23 +0530)]
slight change

9 years agoCkeditor works
Siddhant Rajagopalan [Tue, 26 Aug 2014 10:36:29 +0000 (16:06 +0530)]
Ckeditor works

9 years agorenamed some files
Siddhant Rajagopalan [Tue, 19 Aug 2014 09:50:17 +0000 (15:20 +0530)]
renamed some files

9 years agoremoved console statements
Siddhant Rajagopalan [Tue, 19 Aug 2014 09:48:39 +0000 (15:18 +0530)]
removed console statements

9 years agolayout changed
Siddhant Rajagopalan [Mon, 18 Aug 2014 21:20:56 +0000 (02:50 +0530)]
layout changed

9 years agofrom address and reply to working
Siddhant Rajagopalan [Mon, 18 Aug 2014 18:43:18 +0000 (00:13 +0530)]
from address and reply to working

9 years agochanging layout
Siddhant Rajagopalan [Sun, 17 Aug 2014 16:04:31 +0000 (21:34 +0530)]
changing layout

9 years agodedupe email working
Siddhant Rajagopalan [Sun, 17 Aug 2014 15:24:56 +0000 (20:54 +0530)]
dedupe email working

9 years agotime working properly
Siddhant Rajagopalan [Sun, 17 Aug 2014 09:49:59 +0000 (15:19 +0530)]
time working properly

9 years agosend test and send mail working
Siddhant Rajagopalan [Sun, 17 Aug 2014 09:39:34 +0000 (15:09 +0530)]
send test and send mail working

9 years agoindented code
Siddhant Rajagopalan [Sun, 17 Aug 2014 08:29:26 +0000 (13:59 +0530)]
indented code

9 years agolisting done
Siddhant Rajagopalan [Thu, 14 Aug 2014 16:15:55 +0000 (21:45 +0530)]
listing done

9 years agogorups working final
Siddhant Rajagopalan [Wed, 13 Aug 2014 20:42:49 +0000 (02:12 +0530)]
gorups working final

9 years agoPreview working
Siddhant Rajagopalan [Sat, 9 Aug 2014 06:04:26 +0000 (11:34 +0530)]
Preview working

9 years agochanged apis
Siddhant Rajagopalan [Sat, 9 Aug 2014 04:47:43 +0000 (10:17 +0530)]
changed apis

9 years agoWorking Tokens and some apis
Siddhant Rajagopalan [Sat, 26 Jul 2014 13:35:44 +0000 (19:05 +0530)]
Working Tokens and some apis

9 years agodeleted node modules
Siddhant Rajagopalan [Sat, 26 Jul 2014 04:53:00 +0000 (10:23 +0530)]
deleted node modules

9 years agomailing group api added
Siddhant Rajagopalan [Thu, 17 Jul 2014 18:15:43 +0000 (23:45 +0530)]
mailing group api added

9 years agoscheduled date working
Siddhant Rajagopalan [Sun, 13 Jul 2014 13:28:47 +0000 (18:58 +0530)]
scheduled date working

9 years agogroups remove and msg-templates
Siddhant Rajagopalan [Sat, 12 Jul 2014 17:51:44 +0000 (23:21 +0530)]
groups remove and msg-templates

9 years agomade a superselect2 box,validations
Siddhant Rajagopalan [Fri, 11 Jul 2014 04:22:59 +0000 (09:52 +0530)]
made a superselect2 box,validations

9 years agogroups working
Siddhant Rajagopalan [Fri, 4 Jul 2014 07:37:06 +0000 (13:07 +0530)]
groups working

9 years agofrom email handled
Siddhant Rajagopalan [Fri, 4 Jul 2014 03:45:38 +0000 (09:15 +0530)]
from email handled

9 years agofrom email now working. cool_api not needed
Siddhant Rajagopalan [Thu, 3 Jul 2014 16:21:48 +0000 (21:51 +0530)]
from email now working. cool_api not needed

9 years agoGroups are stored in a variable
Siddhant Rajagopalan [Thu, 3 Jul 2014 04:44:32 +0000 (10:14 +0530)]
Groups are stored in a variable

9 years agocommented code, preview mailing
Siddhant Rajagopalan [Sun, 29 Jun 2014 13:21:48 +0000 (18:51 +0530)]
commented code, preview mailing

9 years agoMessage template id done and a dummy for fromemail
Siddhant Rajagopalan [Tue, 24 Jun 2014 05:05:55 +0000 (10:35 +0530)]
Message template id done and a dummy for fromemail

9 years agoHeader and footer done, auto-responder, some part of scheduling
Siddhant Rajagopalan [Mon, 23 Jun 2014 11:05:21 +0000 (16:35 +0530)]
Header and footer done, auto-responder, some part of scheduling

9 years agoscreens look like theyre supposed to
Siddhant Rajagopalan [Sun, 22 Jun 2014 13:17:38 +0000 (18:47 +0530)]
screens look like theyre supposed to

9 years agoattachments added
Siddhant Rajagopalan [Sat, 21 Jun 2014 10:46:44 +0000 (16:16 +0530)]
attachments added

9 years agoBasic version of new CiviMail interface
Siddhant Rajagopalan [Sat, 21 Jun 2014 08:28:05 +0000 (13:58 +0530)]
Basic version of new CiviMail interface

9 years agoMerge pull request #3735 from davecivicrm/CRM-15037
Dave Greenberg [Fri, 25 Jul 2014 21:52:37 +0000 (14:52 -0700)]
Merge pull request #3735 from davecivicrm/CRM-15037

CRM-15037 - Extend webtest to test for this bug.

9 years agoCRM-15037 - Extend webtest to test for this bug.
Dave Greenberg [Fri, 25 Jul 2014 21:51:49 +0000 (14:51 -0700)]
CRM-15037 - Extend webtest to test for this bug.

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

9 years agoMerge pull request #3727 from monishdeb/CRM-14875
Dave Greenberg [Fri, 25 Jul 2014 21:19:02 +0000 (14:19 -0700)]
Merge pull request #3727 from monishdeb/CRM-14875

CRM-14875 fix - Related membership line_items missing from View Contribu...

9 years agoMerge pull request #3732 from yashodha/CRM-15002
Dave Greenberg [Fri, 25 Jul 2014 19:12:12 +0000 (12:12 -0700)]
Merge pull request #3732 from yashodha/CRM-15002

CRM-15002: fix case activity view

9 years agoCRM-15002: fix case activity view
CiviCRM [Fri, 25 Jul 2014 07:37:48 +0000 (13:07 +0530)]
CRM-15002: fix case activity view

9 years agoMerge pull request #3731 from davecivicrm/CRM-15031
Dave Greenberg [Fri, 25 Jul 2014 00:32:42 +0000 (17:32 -0700)]
Merge pull request #3731 from davecivicrm/CRM-15031

CRM-15031 - Partial fixes for Event related webtests.

9 years agoCRM-15031 - Partial fixes for Event related webtests.
Dave Greenberg [Fri, 25 Jul 2014 00:31:46 +0000 (17:31 -0700)]
CRM-15031 - Partial fixes for Event related webtests.

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

9 years agoMerge pull request #3726 from jitendrapurohit/CRM-14983
Kurund Jalmi [Thu, 24 Jul 2014 18:09:53 +0000 (23:39 +0530)]
Merge pull request #3726 from jitendrapurohit/CRM-14983

Empty check for datetime field

9 years agoMerge pull request #3728 from atif-shaikh/CRM-14952-webtest-fix
Kurund Jalmi [Thu, 24 Jul 2014 18:09:32 +0000 (23:39 +0530)]
Merge pull request #3728 from atif-shaikh/CRM-14952-webtest-fix

Webtest for CRM-14952

9 years agoMerge pull request #3708 from atif-shaikh/CRM-14983
Kurund Jalmi [Thu, 24 Jul 2014 18:09:02 +0000 (23:39 +0530)]
Merge pull request #3708 from atif-shaikh/CRM-14983

CRM-14983 - Sunning Contribution via Search Builder Fails Putting Contac...

9 years agoWebtest for CRM-14952
atif-shaikh [Thu, 24 Jul 2014 13:07:46 +0000 (18:37 +0530)]
Webtest for CRM-14952

----------------------------------------
* CRM-14952: Sorting on state in search throws FATAL error: Database Error Code: Unknown column 'civicrm_state_province.name' in 'field list'
  https://issues.civicrm.org/jira/browse/CRM-14952

9 years agoCRM-14875 fix - Related membership line_items missing from View Contribution page
monishdeb [Thu, 24 Jul 2014 12:30:39 +0000 (18:00 +0530)]
CRM-14875 fix - Related membership line_items missing from View Contribution page

https://issues.civicrm.org/jira/browse/CRM-14875

9 years agoEmpty check for datetime field
jitendra.purohit@webaccessglobal.com [Thu, 24 Jul 2014 08:37:24 +0000 (14:07 +0530)]
Empty check for datetime field

9 years agoMerge pull request #3725 from PoonamNalawade/HR-404
Yashodha Chaku [Thu, 24 Jul 2014 06:05:06 +0000 (11:35 +0530)]
Merge pull request #3725 from PoonamNalawade/HR-404

--HR-404 Clicking organization sub-types opens CiviHR Dashboard

9 years agoMerge pull request #3723 from totten/master-phpunit-para
Tim Otten [Thu, 24 Jul 2014 04:09:08 +0000 (21:09 -0700)]
Merge pull request #3723 from totten/master-phpunit-para

INFRA-124 - Facilitate parallel testing by making test environment more flexible

9 years agoUpdate version to 4.5.beta4
CiviCRM [Wed, 23 Jul 2014 14:56:59 +0000 (07:56 -0700)]
Update version to 4.5.beta4

9 years ago--HR-404 Clicking organization sub-types opens CiviHR Dashboard
Poonam [Wed, 23 Jul 2014 14:12:44 +0000 (19:42 +0530)]
--HR-404 Clicking organization sub-types opens CiviHR Dashboard

9 years agoMerge pull request #3724 from rohankatkar/CRM-15026
Kurund Jalmi [Wed, 23 Jul 2014 13:21:05 +0000 (18:51 +0530)]
Merge pull request #3724 from rohankatkar/CRM-15026

Fix for CRM-15026

9 years agoFix for CRM-15026
Rohan Katkar [Wed, 23 Jul 2014 11:17:39 +0000 (16:47 +0530)]
Fix for CRM-15026

9 years agoMerge pull request #3679 from yashodha/CRM-14951
Monish Deb [Wed, 23 Jul 2014 10:34:42 +0000 (16:04 +0530)]
Merge pull request #3679 from yashodha/CRM-14951

Tested, working fine.

9 years agoINFRA-124 - CiviSeleniumTestCase - Load cookies from $this->settings->cookies
Tim Otten [Wed, 23 Jul 2014 08:29:32 +0000 (01:29 -0700)]
INFRA-124 - CiviSeleniumTestCase - Load cookies from $this->settings->cookies

For INFRA-124, we'll need a way to distinguish requests that correspond to
different test-instances.  We'll do that by passing along a cookie.

9 years agoINFRA-124 - civicrm.settings.php - Softer define()s
Tim Otten [Wed, 23 Jul 2014 07:21:21 +0000 (00:21 -0700)]
INFRA-124 - civicrm.settings.php - Softer define()s

INFRA-124 will require that we make some defines (e.g. CIVICRM_DSN) dynamic
when running multiple test processes.  This patch allows us to
inject/override those settings without fully parsing/understanding the
content of civicrm.settings.php.

9 years agoMerge pull request #3719 from yashodha/CRM-15002
Kurund Jalmi [Wed, 23 Jul 2014 08:21:00 +0000 (13:51 +0530)]
Merge pull request #3719 from yashodha/CRM-15002

CRM-15002: fix case id in subject

9 years agoMerge pull request #3721 from totten/master-seqtest
Kurund Jalmi [Wed, 23 Jul 2014 08:19:20 +0000 (13:49 +0530)]
Merge pull request #3721 from totten/master-seqtest

Civi\CCase\SequenceListenerTest - Reduce timing sensitivity

9 years agoMerge pull request #3722 from totten/master-perm-regr
Kurund Jalmi [Wed, 23 Jul 2014 08:18:21 +0000 (13:48 +0530)]
Merge pull request #3722 from totten/master-perm-regr

CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest

9 years agoMerge pull request #3720 from yashodha/CRM-15027
Kurund Jalmi [Wed, 23 Jul 2014 07:32:25 +0000 (13:02 +0530)]
Merge pull request #3720 from yashodha/CRM-15027

CRM-15027- fix copy function for date fields

9 years agoCRM-15023 - Fix regression in CRM_Core_Permission_GenericTest
Tim Otten [Wed, 23 Jul 2014 06:53:54 +0000 (23:53 -0700)]
CRM-15023 - Fix regression in CRM_Core_Permission_GenericTest

Follow-up to 29f6fbb7c

9 years agoCRM-15027- fix copy function for date fields
CiviCRM [Wed, 23 Jul 2014 06:24:33 +0000 (11:54 +0530)]
CRM-15027- fix copy function for date fields

9 years agoCivi\CCase\SequenceListenerTest - Reduce timing sensitivity
Tim Otten [Wed, 23 Jul 2014 06:16:06 +0000 (23:16 -0700)]
Civi\CCase\SequenceListenerTest - Reduce timing sensitivity

9 years agoCRM-15002: fix case id in subject
CiviCRM [Wed, 23 Jul 2014 04:37:50 +0000 (10:07 +0530)]
CRM-15002: fix case id in subject

9 years agoMerge pull request #3713 from yashodha/CRM-15002
Yashodha Chaku [Wed, 23 Jul 2014 04:13:10 +0000 (09:43 +0530)]
Merge pull request #3713 from yashodha/CRM-15002

CRM-15002: fix broken Link Case functionality

9 years agoMerge pull request #3716 from monishdeb/CRM-15021
Dave Greenberg [Tue, 22 Jul 2014 23:19:29 +0000 (16:19 -0700)]
Merge pull request #3716 from monishdeb/CRM-15021

CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page le...

9 years agoCRM-15021 fix - Reenabling 'Allow other amounts' on contribution page leaves field...
monishdeb [Tue, 22 Jul 2014 21:47:08 +0000 (03:17 +0530)]
CRM-15021 fix - Reenabling 'Allow other amounts' on contribution page leaves field inactive

https://issues.civicrm.org/jira/browse/CRM-15021

9 years agoMerge pull request #3715 from davecivicrm/CRM-15001
Dave Greenberg [Tue, 22 Jul 2014 19:26:03 +0000 (12:26 -0700)]
Merge pull request #3715 from davecivicrm/CRM-15001

CRM-15001 - clarify field label, terminology and help text.

9 years agoCRM-15001 - clarify field label, terminology and help text.
Dave Greenberg [Tue, 22 Jul 2014 19:25:17 +0000 (12:25 -0700)]
CRM-15001 - clarify field label, terminology and help text.

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

9 years agoMerge pull request #3712 from tadpolecc/tadpolecc
Monish Deb [Tue, 22 Jul 2014 13:36:37 +0000 (19:06 +0530)]
Merge pull request #3712 from tadpolecc/tadpolecc

Tested working fine

9 years agoCRM-15002: fix broken Link Case functionality
CiviCRM [Tue, 22 Jul 2014 06:24:54 +0000 (11:54 +0530)]
CRM-15002: fix broken Link Case functionality

9 years agoCRM-15023 - Fatal errors thrown on Event Info, registration, Contribution Pages
kcristiano [Tue, 22 Jul 2014 01:33:47 +0000 (21:33 -0400)]
CRM-15023 - Fatal errors thrown on Event Info, registration, Contribution Pages

Simple workaround to ensure that pluggable.php is loaded before we check
capabilities in WordPress

9 years agoMerge pull request #3711 from davecivicrm/CRM-14978
Dave Greenberg [Mon, 21 Jul 2014 23:58:28 +0000 (16:58 -0700)]
Merge pull request #3711 from davecivicrm/CRM-14978

CRM-14978 - add pop-up link to edit participant statuses from event titl...

9 years agoCRM-14978 - add pop-up link to edit participant statuses from event title and setting...
Dave Greenberg [Mon, 21 Jul 2014 23:57:40 +0000 (16:57 -0700)]
CRM-14978 - add pop-up link to edit participant statuses from event title and settings config form.

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

9 years agoMerge pull request #3710 from jmcclelland/import-participant-register-date
Dave Greenberg [Mon, 21 Jul 2014 23:02:46 +0000 (16:02 -0700)]
Merge pull request #3710 from jmcclelland/import-participant-register-date

CRM-15019 - avoid validation error on register date if not using ISO

9 years agoMerge pull request #3705 from eileenmcnaughton/CRM-15009
Dave Greenberg [Mon, 21 Jul 2014 17:35:09 +0000 (10:35 -0700)]
Merge pull request #3705 from eileenmcnaughton/CRM-15009

CRM-15009 extend permitted length of field on payment processor signatur...

9 years agoCRM-15019 - avoid validation error on register date if not using ISO
Jamie McClelland [Mon, 21 Jul 2014 17:25:11 +0000 (13:25 -0400)]
CRM-15019 - avoid validation error on register date if not using ISO
date format.

----------------------------------------
* CRM-15019: Importing participant record with register date in a format other than YYYY-MM-DD results in validation error
  https://issues.civicrm.org/jira/browse/CRM-15019

9 years agoCRM-14983 - Sunning Contribution via Search Builder Fails Putting Contacts in Smart...
atif-shaikh [Mon, 21 Jul 2014 12:40:10 +0000 (18:10 +0530)]
CRM-14983 - Sunning Contribution via Search Builder Fails Putting Contacts in Smart Group

https://issues.civicrm.org/jira/browse/CRM-14983

9 years agoMerge pull request #3707 from colemanw/er
colemanw [Mon, 21 Jul 2014 11:22:34 +0000 (12:22 +0100)]
Merge pull request #3707 from colemanw/er

Form_Renderer - ensure params is an array

9 years agoForm_Renderer - ensure params is an array
Coleman Watts [Mon, 21 Jul 2014 08:39:48 +0000 (09:39 +0100)]
Form_Renderer - ensure params is an array

9 years agoCRM-15009 extend permitted length of field on payment processor signature
Eileen McNaughton [Mon, 21 Jul 2014 02:56:27 +0000 (14:56 +1200)]
CRM-15009 extend permitted length of field on payment processor signature

9 years agoMerge pull request #3704 from colemanw/memberOrg
colemanw [Sun, 20 Jul 2014 14:09:47 +0000 (15:09 +0100)]
Merge pull request #3704 from colemanw/memberOrg

CRM-15017 - Fix existing member check & remove unnecessary checkemail callback

9 years agoCRM-15017 - Fix existing member check & remove unnecessary checkemail callback
Coleman Watts [Sun, 20 Jul 2014 13:45:44 +0000 (14:45 +0100)]
CRM-15017 - Fix existing member check & remove unnecessary checkemail callback

9 years agoTrigger change after loading remote EntityRef default
Coleman Watts [Sun, 20 Jul 2014 13:43:44 +0000 (14:43 +0100)]
Trigger change after loading remote EntityRef default

9 years agoEnsure 'extra' data gets loaded with EntityRef
Coleman Watts [Sun, 20 Jul 2014 13:36:20 +0000 (14:36 +0100)]
Ensure 'extra' data gets loaded with EntityRef

9 years agoCRM-14949 - Remove unneeded tpl include
Coleman Watts [Sun, 20 Jul 2014 01:23:15 +0000 (02:23 +0100)]
CRM-14949 - Remove unneeded tpl include

9 years agoFix contribution context
Coleman Watts [Sat, 19 Jul 2014 21:51:10 +0000 (22:51 +0100)]
Fix contribution context

9 years agoSlightly smaller Civi spinner
Coleman Watts [Sat, 19 Jul 2014 19:22:18 +0000 (20:22 +0100)]
Slightly smaller Civi spinner

9 years agoMerge pull request #3703 from colemanw/spinner
colemanw [Sat, 19 Jul 2014 14:01:50 +0000 (15:01 +0100)]
Merge pull request #3703 from colemanw/spinner

Add CiviCRM-branded spinner

9 years agoCiviCRM-branded spinner
Coleman Watts [Sat, 19 Jul 2014 13:58:58 +0000 (14:58 +0100)]
CiviCRM-branded spinner

9 years agoMerge pull request #3702 from colemanw/limit
colemanw [Sat, 19 Jul 2014 12:48:31 +0000 (13:48 +0100)]
Merge pull request #3702 from colemanw/limit

CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values

9 years agoCRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default...
Coleman Watts [Sat, 19 Jul 2014 12:22:41 +0000 (13:22 +0100)]
CRM-14984 - Fix default 25 limit being applied to getlist api when retrieving default values

9 years agoBlock UI tweaks
Coleman Watts [Fri, 18 Jul 2014 23:50:45 +0000 (00:50 +0100)]
Block UI tweaks

9 years agoMerge pull request #3700 from colemanw/spinner
colemanw [Fri, 18 Jul 2014 22:21:24 +0000 (23:21 +0100)]
Merge pull request #3700 from colemanw/spinner

Style jQuery block-ui to use a spinner instead of 'Please wait'

9 years agoStyle jQuery block-ui to use a spinner instead of 'Please wait'
Coleman Watts [Fri, 18 Jul 2014 22:18:42 +0000 (23:18 +0100)]
Style jQuery block-ui to use a spinner instead of 'Please wait'

9 years agoMerge pull request #3699 from monishdeb/CRM-14996
Dave Greenberg [Fri, 18 Jul 2014 21:32:57 +0000 (14:32 -0700)]
Merge pull request #3699 from monishdeb/CRM-14996

CRM-14996 fix

9 years agoMerge pull request #3695 from totten/master-link-cases
Dave Greenberg [Fri, 18 Jul 2014 19:08:40 +0000 (12:08 -0700)]
Merge pull request #3695 from totten/master-link-cases

CRM-15002 - Link Cases - Fix fatal error

9 years agominor change
monishdeb [Fri, 18 Jul 2014 17:30:53 +0000 (23:00 +0530)]
minor change

9 years agoCRM-14996 fix - Reports county filter option shows all counties regardless of state...
monishdeb [Fri, 18 Jul 2014 06:43:32 +0000 (12:13 +0530)]
CRM-14996 fix - Reports county filter option shows all counties regardless of state or states chosen

https://issues.civicrm.org/jira/browse/CRM-14996

9 years agoMerge pull request #3697 from totten/master-commsg-times
Tim Otten [Thu, 17 Jul 2014 23:44:26 +0000 (16:44 -0700)]
Merge pull request #3697 from totten/master-commsg-times

CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to timing

9 years agoCRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to
Tim Otten [Thu, 17 Jul 2014 23:42:45 +0000 (16:42 -0700)]
CRM_Core_CommunityMessagesTest - Reduce probability of test-failure due to
timing

9 years agoMerge pull request #3696 from davecivicrm/CRM-15002
Dave Greenberg [Thu, 17 Jul 2014 23:40:51 +0000 (16:40 -0700)]
Merge pull request #3696 from davecivicrm/CRM-15002

CRM-15002 - Fix missing case types from case selectors (probably an erro...

9 years agoCRM-15002 - Fix missing case types from case selectors (probably an error from typo...
Dave Greenberg [Thu, 17 Jul 2014 23:39:23 +0000 (16:39 -0700)]
CRM-15002 - Fix missing case types from case selectors (probably an error from typo when replacing CRM_Utils_Array instances with empty).

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