Monish Deb [Mon, 29 Dec 2014 10:41:47 +0000 (16:11 +0530)]
Merge pull request #4726 from atif-shaikh/CRM-5039
CRM-5039 - Events don't always limit registrations to "max participants"...
Kurund Jalmi [Sat, 27 Dec 2014 18:04:33 +0000 (23:34 +0530)]
Merge pull request #4788 from kurund/generated-data
fixed generated data
kurund [Sat, 27 Dec 2014 13:54:54 +0000 (19:24 +0530)]
fixed generated data
Kurund Jalmi [Fri, 26 Dec 2014 14:50:02 +0000 (20:20 +0530)]
Merge pull request #4787 from rohankatkar/Webtests
Webtest fix
Yashodha Chaku [Fri, 26 Dec 2014 14:33:16 +0000 (20:03 +0530)]
Merge pull request #4786 from rohankatkar/CRM_15757
CRM-15757 Notices fix
Rohan Katkar [Fri, 26 Dec 2014 13:35:00 +0000 (19:05 +0530)]
Webtest fix
Rohan Katkar [Fri, 26 Dec 2014 13:03:17 +0000 (18:33 +0530)]
CRM-15757 Notices fix
Monish Deb [Fri, 26 Dec 2014 07:13:13 +0000 (12:43 +0530)]
Merge pull request #4784 from atif-shaikh/CRM-15718
CRM-15718 - Bulk sms: Check for do not send sms instead of is opt out
atif-shaikh [Fri, 26 Dec 2014 05:42:32 +0000 (11:12 +0530)]
CRM-15718 - Bulk sms: Check for do not send sms instead of is opt out
https://issues.civicrm.org/jira/browse/CRM-15718
Kurund Jalmi [Fri, 26 Dec 2014 05:03:59 +0000 (10:33 +0530)]
Merge pull request #4771 from pratikshad/CRM-15409
CRM-15409 fix issue of printpdf button on popup and spelling mistecks of...
Yashodha Chaku [Wed, 24 Dec 2014 13:05:49 +0000 (18:35 +0530)]
Merge pull request #4781 from civicrm/CRM-15732
CRM-15732 : fix looking up deleted 'On behalf' orgs
Monish Deb [Wed, 24 Dec 2014 12:09:25 +0000 (17:39 +0530)]
Merge pull request #4782 from atif-shaikh/CRM-15754
Crm 15754
atif-shaikh [Wed, 24 Dec 2014 11:55:59 +0000 (17:25 +0530)]
CRM-15754 - Custom participant statuses print their ID in event confirmation email
https://issues.civicrm.org/jira/browse/CRM-15754
JKingsnorth [Tue, 23 Dec 2014 10:46:16 +0000 (10:46 +0000)]
CRM-15754 Use participant status label
yashodha [Wed, 24 Dec 2014 09:12:57 +0000 (14:42 +0530)]
CRM-15732 : fix looking up deleted 'On behalf' orgs
----------------------------------------
* CRM-15732: Donations with an On Behalf Of an organization profile dedupes with contacts in the trash
https://issues.civicrm.org/jira/browse/CRM-15732
pratikshad [Wed, 24 Dec 2014 06:09:01 +0000 (11:39 +0530)]
CRM-15409 Changes into membership.tpl file and regenerated mysql file
----------------------------------------
* CRM-15409: Add Sales Tax and Invoicing support
https://issues.civicrm.org/jira/browse/CRM-15409
Kurund Jalmi [Tue, 23 Dec 2014 19:28:57 +0000 (00:58 +0530)]
Merge pull request #4772 from jitendrapurohit/CRM-15750
Fix for CRM-15750 advanced search using relationship and smart group pro...
Kurund Jalmi [Tue, 23 Dec 2014 19:27:59 +0000 (00:57 +0530)]
Merge pull request #4773 from civicrm/version-fix
fix version in header
Kurund Jalmi [Tue, 23 Dec 2014 19:27:33 +0000 (00:57 +0530)]
Merge pull request #4776 from webaccess/master
Webtests fixes for CRM-15701
Kurund Jalmi [Tue, 23 Dec 2014 19:20:45 +0000 (00:50 +0530)]
Merge pull request #4777 from civicrm/revert-4766-CRM-15714
Revert "CRM-15714 CiviContribute convert validateCreditCard to validateP...
Kurund Jalmi [Tue, 23 Dec 2014 19:20:33 +0000 (00:50 +0530)]
Revert "CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument"
Kurund Jalmi [Tue, 23 Dec 2014 14:42:09 +0000 (20:12 +0530)]
Merge pull request #4 from manishmore/CRM-15701-QA-fixes
Webtests fixes for CRM-15701 fix
moremanish [Tue, 23 Dec 2014 14:37:30 +0000 (20:07 +0530)]
Webtests fixes for CRM-15701 fix
Monish Deb [Tue, 23 Dec 2014 13:53:15 +0000 (19:23 +0530)]
Merge pull request #4774 from rohankatkar/Webtests
Fix for webtests
Monish Deb [Tue, 23 Dec 2014 13:49:59 +0000 (19:19 +0530)]
Merge pull request #4775 from jitendrapurohit/CRM-15743
comment for CRM 15743
jitendrapurohit [Tue, 23 Dec 2014 13:48:47 +0000 (19:18 +0530)]
CRM-15743 comment
jitendrapurohit [Tue, 23 Dec 2014 13:30:54 +0000 (19:00 +0530)]
added comment for CRM-15743 modification
Rohan Katkar [Tue, 23 Dec 2014 13:24:28 +0000 (18:54 +0530)]
Fix for webtests
jitendrapurohit [Tue, 23 Dec 2014 13:15:56 +0000 (18:45 +0530)]
Fix for CRM-15750 advanced search using relationship and smart group produces backtrace
yashodha [Tue, 23 Dec 2014 13:13:11 +0000 (18:43 +0530)]
fix version in header
pratikshad [Tue, 23 Dec 2014 12:58:36 +0000 (18:28 +0530)]
CRM-15409 fix issue of printpdf button on popup and spelling mistecks of invoice template and also added new feature into offline membership page to show totaltaxamount with their tax term
----------------------------------------
* CRM-15409: Add Sales Tax and Invoicing support
https://issues.civicrm.org/jira/browse/CRM-15409
Monish Deb [Tue, 23 Dec 2014 11:38:45 +0000 (17:08 +0530)]
Merge pull request #4764 from rohankatkar/CRM-15615
Fix for CRM-15615
Kurund Jalmi [Tue, 23 Dec 2014 09:50:12 +0000 (15:20 +0530)]
Merge pull request #4768 from rohankatkar/CRM-10331Fix
Fix for CRM-10331 group_id parameter ignored in API for GroupContact
Kurund Jalmi [Tue, 23 Dec 2014 09:42:27 +0000 (15:12 +0530)]
Merge pull request #4766 from adixon/CRM-15714
CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument
Rohan Katkar [Tue, 23 Dec 2014 06:38:39 +0000 (12:08 +0530)]
Fix for CRM-10331 group_id parameter ignored in API for GroupContact
Monish Deb [Tue, 23 Dec 2014 05:42:26 +0000 (11:12 +0530)]
Merge pull request #4737 from eileenmcnaughton/master
CRM-14246 - event on behalf - alter function that assigns events to cope...
Yashodha Chaku [Tue, 23 Dec 2014 04:56:40 +0000 (10:26 +0530)]
Merge pull request #4762 from yashodha/CRM-15744
CRM-15744- fix wrong event link for pcp on dashboard
Dave Greenberg [Tue, 23 Dec 2014 00:59:11 +0000 (16:59 -0800)]
Merge pull request #4761 from atif-shaikh/CRM-15743
CRM-15743 - Online contributions: Pay Later flag is not being passed to ...
Dave Greenberg [Mon, 22 Dec 2014 23:22:40 +0000 (15:22 -0800)]
Merge pull request #4763 from jitendrapurohit/CRM-15557-Fix
CRM-15557 fix
adixon [Mon, 22 Dec 2014 21:27:36 +0000 (16:27 -0500)]
CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument
The validateCreditCard function is too restrictive for both SWIPE and DirectDebit payment processors. Convert those calls to a new validatePaymentInstrument that only invokes validateCreditCard for credit card payment processors, and also allows SWIPE processors to override it.
Eileen [Wed, 19 Feb 2014 09:10:04 +0000 (22:10 +1300)]
CRM-14246 - event on behalf - alter function that assigns events to cope with string or array
kurund [Mon, 22 Dec 2014 16:31:51 +0000 (22:01 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-22-22-01-44
jitendrapurohit [Mon, 22 Dec 2014 13:03:38 +0000 (18:33 +0530)]
CRM-15557 fix
CiviCRM [Mon, 22 Dec 2014 12:13:36 +0000 (17:43 +0530)]
CRM-15744- fix wrong event link for pcp on dashboard
Yashodha Chaku [Mon, 22 Dec 2014 09:08:43 +0000 (14:38 +0530)]
Merge pull request #4721 from maxateff/apiexplorer-link
CRM-15722 - fixes transposed keys in REST URL output
atif-shaikh [Mon, 22 Dec 2014 07:05:03 +0000 (12:35 +0530)]
CRM-15743 - Online contributions: Pay Later flag is not being passed to confirm and thank-you pages
https://issues.civicrm.org/jira/browse/CRM-15743
Yashodha Chaku [Mon, 22 Dec 2014 06:16:07 +0000 (11:46 +0530)]
Merge pull request #4735 from kenwest/CRM-15738
CRM-15738 prevent notice when viewing contact's activities
colemanw [Sun, 21 Dec 2014 20:09:16 +0000 (15:09 -0500)]
Merge pull request #4760 from colemanw/settingFix
Fix setting api in api explorer
Coleman Watts [Sun, 21 Dec 2014 20:08:25 +0000 (15:08 -0500)]
Fix setting api in api explorer
Kurund Jalmi [Sun, 21 Dec 2014 14:43:44 +0000 (20:13 +0530)]
Merge pull request #4757 from davecivicrm/CRM-15409
CRM-15409 - UI fixes for Sales Tax implementation.
Tim Otten [Sun, 21 Dec 2014 01:14:38 +0000 (17:14 -0800)]
Merge pull request #4592 from civicrm/master-civimail-abtest
CRM-15578 - CiviMail UI & AB Testing
Tim Otten [Sat, 20 Dec 2014 14:22:17 +0000 (06:22 -0800)]
CRM-15578 - Remove uunused JS/CSS/html
The content has been integrated into the main crmMailingAB module.
Tim Otten [Sat, 20 Dec 2014 14:18:08 +0000 (06:18 -0800)]
Merge branch 'master' into master-civimail-abtest
Conflicts:
CRM/Mailing/BAO/Mailing.php
CRM/Mailing/BAO/MailingJob.php
CRM/Upgrade/Incremental/sql/4.6.alpha1.mysql.tpl
CRM/Utils/Array.php
sql/civicrm_generated.mysql
tests/phpunit/CiviTest/CiviUnitTestCase.php
Tim Otten [Sat, 20 Dec 2014 14:10:25 +0000 (06:10 -0800)]
Merge pull request #4759 from totten/master-civimail-status
CRM-15578 - Various updates to A/B testing
Tim Otten [Sat, 20 Dec 2014 06:00:15 +0000 (22:00 -0800)]
civicrm_generated.mysql - Regenerate
Tim Otten [Sat, 20 Dec 2014 12:50:29 +0000 (04:50 -0800)]
crmMailingAB - Report - Add options to view mailing content, select winner, & view winner stats
Tim Otten [Sat, 20 Dec 2014 09:32:21 +0000 (01:32 -0800)]
crmMailingAB - Transplant report. Decouple stats API.
Note: Previously, the MailingAB.graph_stats API keyed off the pre-declared
"winning criteria" and target date, which made it necessary to choose these
things in advance. This API now accepts these as parameters which can be
tweaked interactively (based on what the user whats to investigate).
The graphs don't really work right now, but I've transplanted the code to
show how to encapsulate it in a directive.
Tim Otten [Sat, 20 Dec 2014 09:31:09 +0000 (01:31 -0800)]
crmD3 - Add stub module for declaring dependencies on D3
Tim Otten [Sat, 20 Dec 2014 08:50:48 +0000 (00:50 -0800)]
CRM-15578 - crmMailingAB - Improve listing
* Translate strings
* Remove unused help section
* Display status
Tim Otten [Sat, 20 Dec 2014 08:33:23 +0000 (00:33 -0800)]
DRY - crmNow
Tim Otten [Sat, 20 Dec 2014 06:00:39 +0000 (22:00 -0800)]
CRM-15578 - crmMailingAB - Submit UI
Tim Otten [Sat, 20 Dec 2014 04:26:22 +0000 (20:26 -0800)]
CRM-15578 - MailingAB.submit API
Tim Otten [Sat, 20 Dec 2014 03:06:03 +0000 (19:06 -0800)]
CRM-15578 - Mailing.submit API - Accept "approval_note"
Tim Otten [Sat, 20 Dec 2014 02:28:38 +0000 (18:28 -0800)]
Remove debug code
Tim Otten [Sat, 20 Dec 2014 02:11:39 +0000 (18:11 -0800)]
CRM-15578 - Rename "civicrm_mailing_abtesting" to "civicrm_mailing_abtest"
Tim Otten [Sat, 20 Dec 2014 02:09:27 +0000 (18:09 -0800)]
CRM-15578 - Add "status" column to MailingAB
Tim Otten [Sat, 20 Dec 2014 01:44:47 +0000 (17:44 -0800)]
CRM-15578 - Add navigation entries for A/B testing
Dave Greenberg [Fri, 19 Dec 2014 23:22:35 +0000 (15:22 -0800)]
Merge pull request #4756 from davecivicrm/CRM-15701b
CRM-15701 - Fix form rule error.
Dave Greenberg [Fri, 19 Dec 2014 23:22:01 +0000 (15:22 -0800)]
CRM-15701 - Fix form rule error.
----------------------------------------
* CRM-15701:
https://issues.civicrm.org/jira/browse/CRM-15701
Dave Greenberg [Fri, 19 Dec 2014 23:18:46 +0000 (15:18 -0800)]
Merge pull request #4755 from webaccess/master
CRM-15701 QA fixes
Dave Greenberg [Fri, 19 Dec 2014 20:03:51 +0000 (12:03 -0800)]
CRM-15409 - UI fixes for Sales Tax implementation.
----------------------------------------
* CRM-15409:
https://issues.civicrm.org/jira/browse/CRM-15409
Kurund Jalmi [Fri, 19 Dec 2014 18:54:50 +0000 (00:24 +0530)]
Merge pull request #3 from manishmore/CRM-15701-QA-fixes
Crm 15701 qa fixes
moremanish [Fri, 19 Dec 2014 14:45:52 +0000 (20:15 +0530)]
typo fix
moremanish [Fri, 19 Dec 2014 14:41:45 +0000 (20:11 +0530)]
Minor fixes
moremanish [Fri, 19 Dec 2014 14:08:13 +0000 (19:38 +0530)]
CRM-15701 QA fixes
Tim Otten [Fri, 19 Dec 2014 11:39:44 +0000 (03:39 -0800)]
Merge pull request #4753 from totten/master-civimail-status
CRM-15578 - crmMailing - Pageflow changes
Monish Deb [Fri, 19 Dec 2014 10:54:38 +0000 (16:24 +0530)]
Merge pull request #4724 from atif-shaikh/CRM-15598
CRM-15598 - Allow relative URL's for Link custom fields
Monish Deb [Fri, 19 Dec 2014 10:53:19 +0000 (16:23 +0530)]
Merge pull request #4749 from atif-shaikh/CRM-15729
CRM-15729 - Contact batch update via profile removes group contacts
Monish Deb [Fri, 19 Dec 2014 10:51:43 +0000 (16:21 +0530)]
Merge pull request #4747 from jitendrapurohit/CRM-15730
Registration Confirm page fails with discounted priceset CRM-15730 fix
Monish Deb [Fri, 19 Dec 2014 10:51:07 +0000 (16:21 +0530)]
Merge pull request #4754 from rohankatkar/CRM-15694
QA fix for CRM-15694
Rohan Katkar [Fri, 19 Dec 2014 10:40:28 +0000 (16:10 +0530)]
QA fix for CRM-15694
Tim Otten [Fri, 19 Dec 2014 08:59:46 +0000 (00:59 -0800)]
CRM-15578 - Redirect "civicrm/mailing/send" to "civicrm/a/#/mailing/new"
Tim Otten [Fri, 19 Dec 2014 08:27:59 +0000 (00:27 -0800)]
CRM-15578 - crmMailing(AB) - Refine pageflow:
* "Submit" => leave('scheduled')
* "Delete" => leave('unscheduled')
* "Save" => updateUrl()
* "Send Test" => updateUrl()
This commit also switches back to managing pageflow from the controller
(rather than calling .then(leave) in the .html). At the moment, it seems
more useful to have all the different composition screens follow the same
pageflow (rather than allowing them to have different pageflows).
Tim Otten [Fri, 19 Dec 2014 08:12:28 +0000 (00:12 -0800)]
edit-split.html - Remove unused file
Tim Otten [Fri, 19 Dec 2014 07:59:22 +0000 (23:59 -0800)]
Remove unused imports
Tim Otten [Fri, 19 Dec 2014 02:42:22 +0000 (18:42 -0800)]
CRM-15578 - crmMailing(AB) - Submission & status tracking
When loading or submitting, determine the status of any jobs tied to this mailing.
When attempting to edit a submitted mailing, display a message instead of a form.
Change the technique for updating URL -- instead of watching 'mailing.id',
explicitly call updateUrl after saving. This ensures a consistent, linear
sequence of operations. (Note: The watch technique was useful when there
were different variations of save() in EditMailingCtrl and
PreviewMailingCtrl, but we eliminated PreviewMailingCtrl, so it's much
easier to manage the dataflows in a centralized fashion.)
atif-shaikh [Tue, 16 Dec 2014 14:31:46 +0000 (20:01 +0530)]
CRM-5039 - QA Fix
----------------------------------------
* CRM-5039: Events don't always limit registrations to "max participants" setting
https://issues.civicrm.org/jira/browse/CRM-5039
atif-shaikh [Fri, 19 Dec 2014 05:54:04 +0000 (11:24 +0530)]
Rebase changes
Tim Otten [Fri, 19 Dec 2014 00:42:38 +0000 (16:42 -0800)]
Merge pull request #4745 from totten/master-civimail-previewbug
CRM-15578 - crmMailing - Fix for sending tests
Dave Greenberg [Thu, 18 Dec 2014 23:35:10 +0000 (15:35 -0800)]
Merge pull request #4752 from davecivicrm/CRM-15180
CRM-15180 - https://issues.civicrm.org/jira/browse/CRM-15180
Dave Greenberg [Thu, 18 Dec 2014 22:04:26 +0000 (14:04 -0800)]
CRM-15180 - https://issues.civicrm.org/jira/browse/CRM-15180
Dave Greenberg [Thu, 18 Dec 2014 21:52:02 +0000 (13:52 -0800)]
Merge pull request #4751 from kurund/CRM-15180
CRM-15180, now we disable non-selectable tags
kurund [Thu, 18 Dec 2014 20:55:57 +0000 (02:25 +0530)]
CRM-15180, added support in case view
----------------------------------------
* CRM-15180: Using the taglist style of the "contact" page for the "new contact" page
https://issues.civicrm.org/jira/browse/CRM-15180
kurund [Thu, 18 Dec 2014 20:43:26 +0000 (02:13 +0530)]
CRM-15180, added support for attachments and some wierd error fixes
----------------------------------------
* CRM-15180: Using the taglist style of the "contact" page for the "new contact" page
https://issues.civicrm.org/jira/browse/CRM-15180
kurund [Thu, 18 Dec 2014 19:24:09 +0000 (00:54 +0530)]
code cleanup
kurund [Thu, 18 Dec 2014 19:21:45 +0000 (00:51 +0530)]
code cleanup
kurund [Thu, 18 Dec 2014 19:13:57 +0000 (00:43 +0530)]
CRM-15180, now we disable non-selectable tags
----------------------------------------
* CRM-15180: Using the taglist style of the "contact" page for the "new contact" page
https://issues.civicrm.org/jira/browse/CRM-15180
Kurund Jalmi [Thu, 18 Dec 2014 16:30:48 +0000 (22:00 +0530)]
Merge pull request #4748 from rohankatkar/Webtests
Webtests Fix
atif-shaikh [Thu, 18 Dec 2014 14:46:00 +0000 (20:16 +0530)]
CRM-15729 - Contact batch update via profile removes group contacts
https://issues.civicrm.org/jira/browse/CRM-15729
Rohan Katkar [Thu, 18 Dec 2014 13:30:35 +0000 (19:00 +0530)]
Webtests Fix
projects / civicrm-core.git / log