civicrm-core.git
10 years agopartials/abtesting/tab1.html - fixed some interface issues on the campaing tab.
Vitor [Wed, 1 Oct 2014 11:16:27 +0000 (12:16 +0100)]
partials/abtesting/tab1.html - fixed some interface issues on the campaing tab.

10 years agoabtesting/subject_lines.html - Use select2 for "Reply-To"
John Prescott [Thu, 2 Oct 2014 08:57:24 +0000 (09:57 +0100)]
abtesting/subject_lines.html - Use select2 for "Reply-To"

Conflicts:

js/angular-crmMailingAB.js

10 years agoImprove formatting of "Declare Winner By" field on "Preview & Send" tab
David Knoll [Tue, 30 Sep 2014 22:50:05 +0000 (23:50 +0100)]
Improve formatting of "Declare Winner By" field on "Preview & Send" tab

10 years agoBetter naming for Mailings arising from AB tests
David Knoll [Tue, 30 Sep 2014 22:33:23 +0000 (23:33 +0100)]
Better naming for Mailings arising from AB tests

10 years agoAdd phpdoc comment to random recipients function
David Knoll [Tue, 30 Sep 2014 22:31:18 +0000 (23:31 +0100)]
Add phpdoc comment to random recipients function

10 years agoAdded rowCount to disable default API limit of 25 in listing existing AB tests
David Knoll [Tue, 30 Sep 2014 15:50:41 +0000 (16:50 +0100)]
Added rowCount to disable default API limit of 25 in listing existing AB tests

10 years agocrmMailingAB.js - Consolidate 4 TAB_clicked() functions into one gotoTab()
Tim Otten [Tue, 30 Sep 2014 14:30:27 +0000 (15:30 +0100)]
crmMailingAB.js - Consolidate 4 TAB_clicked() functions into one gotoTab()

10 years agoangular-crmMailingAB.js - Remove unnecessary variable
Tim Otten [Tue, 30 Sep 2014 14:23:30 +0000 (15:23 +0100)]
angular-crmMailingAB.js - Remove unnecessary variable

10 years agopartials/abtesting/main.html - removed debugging messages
Vitor [Tue, 30 Sep 2014 13:51:48 +0000 (14:51 +0100)]
partials/abtesting/main.html - removed debugging messages

10 years agoangular-crmMailingAB - Extract ReportCtrl as separate file
Tim Otten [Tue, 30 Sep 2014 14:20:11 +0000 (15:20 +0100)]
angular-crmMailingAB - Extract ReportCtrl as separate file

10 years agopartials/abtesting/tab4.html - Altered interface so that elements now look like buttons.
Vitor [Tue, 30 Sep 2014 13:33:16 +0000 (14:33 +0100)]
partials/abtesting/tab4.html - Altered interface so that elements now look like buttons.

10 years agojs/angular-crmMailingAB.js - Fix warnings
Tim Otten [Tue, 30 Sep 2014 13:07:08 +0000 (14:07 +0100)]
js/angular-crmMailingAB.js - Fix warnings

10 years agoangular-crmMailingAB.js - Autoformat
Tim Otten [Tue, 30 Sep 2014 11:40:47 +0000 (12:40 +0100)]
angular-crmMailingAB.js - Autoformat

10 years agoabtesting/list.html - Added a new column that shows the AB mailing type
Vitor [Tue, 30 Sep 2014 11:21:44 +0000 (12:21 +0100)]
abtesting/list.html - Added a new column that shows the AB mailing type

10 years agoabtesting/tab1.html - Fixed the radio buttons
Vitor [Tue, 30 Sep 2014 10:43:20 +0000 (11:43 +0100)]
abtesting/tab1.html - Fixed the radio buttons

10 years agoGraphs are working
aditya-nambiar [Tue, 26 Aug 2014 09:18:15 +0000 (14:48 +0530)]
Graphs are working

10 years agotemplate & subject linking
aditya-nambiar [Mon, 18 Aug 2014 13:07:30 +0000 (18:37 +0530)]
template & subject linking

10 years agoremoved console logs
aditya-nambiar [Mon, 18 Aug 2014 11:25:01 +0000 (16:55 +0530)]
removed console logs

10 years agochanged listing removed group code
aditya-nambiar [Mon, 18 Aug 2014 11:12:27 +0000 (16:42 +0530)]
changed listing removed group code

10 years agoFixes
aditya-nambiar [Sun, 17 Aug 2014 13:40:50 +0000 (19:10 +0530)]
Fixes

10 years agoDouble storing fixed
aditya-nambiar [Sun, 17 Aug 2014 11:50:27 +0000 (17:20 +0530)]
Double storing fixed

10 years agofixed saving of mailing a/b
aditya-nambiar [Sun, 17 Aug 2014 10:43:08 +0000 (16:13 +0530)]
fixed saving of mailing a/b

10 years agoTokens included
aditya-nambiar [Sat, 16 Aug 2014 13:37:42 +0000 (19:07 +0530)]
Tokens included

10 years agominor changes
aditya-nambiar [Sat, 9 Aug 2014 14:21:21 +0000 (19:51 +0530)]
minor changes

10 years agoMajor changes
aditya-nambiar [Sat, 9 Aug 2014 13:41:48 +0000 (19:11 +0530)]
Major changes

10 years agochs fixed1
aditya-nambiar [Sat, 9 Aug 2014 08:24:48 +0000 (13:54 +0530)]
chs fixed1

10 years agochs fixed
aditya-nambiar [Sat, 9 Aug 2014 08:01:40 +0000 (13:31 +0530)]
chs fixed

10 years agoTab structure fixed1
aditya-nambiar [Sat, 9 Aug 2014 07:46:25 +0000 (13:16 +0530)]
Tab structure fixed1

10 years agoTab structure fixed
aditya-nambiar [Sat, 9 Aug 2014 07:44:19 +0000 (13:14 +0530)]
Tab structure fixed

10 years agoTab disable fixed
aditya-nambiar [Sat, 9 Aug 2014 06:23:25 +0000 (11:53 +0530)]
Tab disable fixed

10 years agoLisitng Page Fixes
aditya-nambiar [Sat, 9 Aug 2014 06:04:12 +0000 (11:34 +0530)]
Lisitng Page Fixes

10 years agopreview working
aditya-nambiar [Sat, 9 Aug 2014 05:20:19 +0000 (10:50 +0530)]
preview working

10 years agoApi's added, preview added
aditya-nambiar [Sat, 9 Aug 2014 04:46:55 +0000 (10:16 +0530)]
Api's added, preview added

10 years agoGraph is better table added
aditya-nambiar [Wed, 30 Jul 2014 17:48:39 +0000 (23:18 +0530)]
Graph is better table added

10 years agoListing.html stage 2
aditya-nambiar [Sun, 27 Jul 2014 14:07:52 +0000 (19:37 +0530)]
Listing.html stage 2

10 years agoListing.html stage 1
aditya-nambiar [Sun, 27 Jul 2014 13:52:48 +0000 (19:22 +0530)]
Listing.html stage 1

10 years agoRetrieving & Stroing from DB stage 2
aditya-nambiar [Sun, 27 Jul 2014 12:11:57 +0000 (17:41 +0530)]
Retrieving & Stroing from DB stage 2

10 years agoRetrieving from DB
aditya-nambiar [Sun, 27 Jul 2014 07:22:21 +0000 (12:52 +0530)]
Retrieving from DB

10 years agoStoring from DB
aditya-nambiar [Sun, 27 Jul 2014 06:31:01 +0000 (12:01 +0530)]
Storing from DB

10 years agofixed the api and added tests
aditya-nambiar [Sat, 26 Jul 2014 11:52:37 +0000 (17:22 +0530)]
fixed the api and added tests

10 years agoadding non-working api structure and indentation fixes
aditya-nambiar [Sat, 26 Jul 2014 10:25:41 +0000 (15:55 +0530)]
adding non-working api structure and indentation fixes

10 years agoadded mailinAB table and default data
aditya-nambiar [Sat, 26 Jul 2014 06:21:47 +0000 (11:51 +0530)]
added mailinAB table and default data

10 years agoremoved unwanted file
aditya-nambiar [Sat, 26 Jul 2014 05:45:20 +0000 (11:15 +0530)]
removed unwanted file

10 years agoremoved unwanted code
aditya-nambiar [Sat, 26 Jul 2014 05:41:15 +0000 (11:11 +0530)]
removed unwanted code

10 years agocode indentation
aditya-nambiar [Sat, 26 Jul 2014 05:34:48 +0000 (11:04 +0530)]
code indentation

10 years agoimage added
aditya-nambiar [Sat, 26 Jul 2014 04:47:04 +0000 (10:17 +0530)]
image added

10 years agoContent changes in compose tab
aditya-nambiar [Sat, 26 Jul 2014 04:43:54 +0000 (10:13 +0530)]
Content changes in compose tab

10 years agoChanged select 2 and civiplugin
aditya-nambiar [Wed, 16 Jul 2014 12:59:21 +0000 (18:29 +0530)]
Changed select 2 and civiplugin

10 years agominor changes
aditya-nambiar [Tue, 15 Jul 2014 12:16:30 +0000 (17:46 +0530)]
minor changes

10 years agoabtesting xml
aditya-nambiar [Wed, 2 Jul 2014 19:43:42 +0000 (15:43 -0400)]
abtesting xml

10 years agotesting try1
aditya-nambiar [Sat, 28 Jun 2014 11:08:23 +0000 (07:08 -0400)]
testing try1

10 years agoButton functioning cleared up
aditya-nambiar [Sat, 21 Jun 2014 19:51:14 +0000 (15:51 -0400)]
Button functioning cleared up

10 years agoVisual Changes
aditya-nambiar [Sat, 21 Jun 2014 18:55:54 +0000 (14:55 -0400)]
Visual Changes

10 years agoMailing db updateb in all 3 cases
aditya-nambiar [Wed, 18 Jun 2014 18:58:17 +0000 (14:58 -0400)]
Mailing db updateb in all 3 cases

10 years agoCode Cleaned
aditya-nambiar [Mon, 16 Jun 2014 21:03:24 +0000 (17:03 -0400)]
Code Cleaned

10 years agoGroups API used
aditya-nambiar [Mon, 16 Jun 2014 20:47:12 +0000 (16:47 -0400)]
Groups API used

10 years agoForm validation
aditya-nambiar [Mon, 16 Jun 2014 17:36:14 +0000 (13:36 -0400)]
Form validation

10 years agodate reimplemented
aditya-nambiar [Sun, 15 Jun 2014 21:38:49 +0000 (17:38 -0400)]
date reimplemented

10 years agoDate picker implemented
aditya-nambiar [Sun, 15 Jun 2014 19:41:29 +0000 (15:41 -0400)]
Date picker implemented

10 years agoTable Implemented
aditya-nambiar [Sun, 15 Jun 2014 18:58:31 +0000 (14:58 -0400)]
Table Implemented

10 years agomodal window implemented
aditya-nambiar [Sun, 15 Jun 2014 18:10:44 +0000 (14:10 -0400)]
modal window implemented

10 years ago3rd stage
aditya-nambiar [Sun, 15 Jun 2014 04:50:34 +0000 (00:50 -0400)]
3rd stage

10 years agoBifurcation in compose done
aditya-nambiar [Sat, 14 Jun 2014 21:15:18 +0000 (17:15 -0400)]
Bifurcation in compose done

10 years agoDisabling Works with order
aditya-nambiar [Sat, 14 Jun 2014 19:13:12 +0000 (15:13 -0400)]
Disabling Works with order

10 years agoDisabling Works
aditya-nambiar [Sat, 14 Jun 2014 19:05:41 +0000 (15:05 -0400)]
Disabling Works

10 years agoworking next button
aditya-nambiar [Sat, 14 Jun 2014 18:21:52 +0000 (14:21 -0400)]
working next button

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

10 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

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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

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