kurund [Mon, 9 Mar 2015 16:27:45 +0000 (21:57 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-09-21-44-34
Conflicts:
CRM/Contact/Page/AJAX.php
CRM/Core/Form.php
CRM/Core/Page/AJAX.php
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Mon, 9 Mar 2015 16:04:01 +0000 (21:34 +0530)]
Merge pull request #5338 from kurund/CRM-15756
CRM-15756, add credit card class for validation
colemanw [Mon, 9 Mar 2015 14:35:41 +0000 (10:35 -0400)]
Merge pull request #5317 from sfe-ev/chainselect-missing-fields
Make "Chain Select" mechanism robust against missing 'target' form field
colemanw [Mon, 9 Mar 2015 14:10:59 +0000 (10:10 -0400)]
Merge pull request #5334 from colemanw/CRM-16071
CRM-16071 - Expose field descriptions to api & explorer
kurund [Mon, 9 Mar 2015 12:55:08 +0000 (18:25 +0530)]
fixed typo
colemanw [Sun, 8 Mar 2015 20:07:36 +0000 (16:07 -0400)]
Merge pull request #5337 from colemanw/datePicker
CRM-15932 - Fix multi-date widget edge-case behavior
Coleman Watts [Sun, 8 Mar 2015 19:50:21 +0000 (15:50 -0400)]
CRM-15932 - Fix multi-date widget edge-case behavior
kurund [Sun, 8 Mar 2015 19:33:16 +0000 (01:03 +0530)]
CRM-15756, add credit card class for validation
----------------------------------------
* CRM-15756: Back-office Submit Credit Card Contribution form: card # validation is no longer working
https://issues.civicrm.org/jira/browse/CRM-15756
colemanw [Sun, 8 Mar 2015 16:53:38 +0000 (12:53 -0400)]
Merge pull request #5336 from colemanw/recurringFix
CRM-15932 - Repeat tab must refresh page when switching repeat mode so js & vars will get set-up
Coleman Watts [Sun, 8 Mar 2015 16:24:46 +0000 (12:24 -0400)]
CRM-14353 - Better select2 handling
Coleman Watts [Sun, 8 Mar 2015 16:12:10 +0000 (12:12 -0400)]
CRM-15932 - Multi-date-select2 widget improvements
Coleman Watts [Sun, 8 Mar 2015 14:10:55 +0000 (10:10 -0400)]
CRM-15932 - Repeat tab must refresh page when switching repeat mode so js & vars will get set-up
colemanw [Sun, 8 Mar 2015 12:48:41 +0000 (08:48 -0400)]
Merge pull request #5335 from colemanw/CRM-14353
CRM-14353 - Fix unsavedChanges js to support checkboxes & radios
Coleman Watts [Sun, 8 Mar 2015 02:39:11 +0000 (21:39 -0500)]
CRM-15932 - Fix recurringEntity form validation
Coleman Watts [Sun, 8 Mar 2015 02:38:11 +0000 (21:38 -0500)]
CRM-14353 - Fix unsavedChanges js to handle disabled fields
Coleman Watts [Sun, 8 Mar 2015 02:27:36 +0000 (21:27 -0500)]
CRM-14353 - Fix unsavedChanges js to support checkboxes & radios
colemanw [Sat, 7 Mar 2015 21:22:22 +0000 (16:22 -0500)]
Merge pull request #5332 from totten/4.5-mailingcomp-api
CRM-16063 - MailingComponent.create API fixes
colemanw [Sat, 7 Mar 2015 21:20:40 +0000 (16:20 -0500)]
Merge pull request #5325 from colemanw/CRM-14154
CRM-14154 - Fix broken message_template_send api and enhance spec
Coleman Watts [Sat, 7 Mar 2015 20:38:11 +0000 (15:38 -0500)]
CRM-16071 - Fix double-escaped single quotes
Escaping happens in a different layer and is not necessary in the xml.
Coleman Watts [Sat, 7 Mar 2015 18:27:47 +0000 (13:27 -0500)]
API Explorer - Disable operator selection when not appropriate
Coleman Watts [Sat, 7 Mar 2015 16:53:55 +0000 (11:53 -0500)]
CRM-16071 - Expose field descriptions to api & explorer
Tim Otten [Sat, 7 Mar 2015 04:29:24 +0000 (20:29 -0800)]
CRM-16063 - MailingComponent.create API - Fix management of is_default
Tim Otten [Sat, 7 Mar 2015 04:29:01 +0000 (20:29 -0800)]
CRM-16063 - MailingComponent.create API - is_active=1 by default
Tim Otten [Sat, 7 Mar 2015 04:01:00 +0000 (20:01 -0800)]
Merge pull request #5327 from colemanw/totten-master-headerlist
CRM-16063 - CiviMail - Ensure mailing option lookups have no limit
Coleman Watts [Sat, 7 Mar 2015 00:15:43 +0000 (19:15 -0500)]
CRM-16063 - CiviMail - Filter civiMails by is_completed
Tim Otten [Sat, 7 Mar 2015 00:23:03 +0000 (16:23 -0800)]
Merge pull request #5329 from totten/master-bower-fch
setup.sh - bower - Only use "-f" if bower.json has changed since last run
Tim Otten [Sat, 7 Mar 2015 00:14:56 +0000 (16:14 -0800)]
Merge branch 'atif-shaikh-CRM-15979'
Tim Otten [Fri, 6 Mar 2015 22:55:26 +0000 (14:55 -0800)]
Merge branch 'master' into atif-shaikh-CRM-15979
Conflicts:
CRM/Upgrade/Incremental/sql/4.6.beta3.mysql.tpl
Coleman Watts [Fri, 6 Mar 2015 22:31:36 +0000 (17:31 -0500)]
CRM-16063 - CiviMail - Don't fetch unused fields/options
Tim Otten [Fri, 6 Mar 2015 22:29:18 +0000 (14:29 -0800)]
Merge pull request #5316 from GinkgoFJG/CRM-15965-4.6
CRM-15965: Update search interface for 4.6 (deferred in 4.5).
Tim Otten [Fri, 6 Mar 2015 22:19:58 +0000 (14:19 -0800)]
Merge pull request #5324 from totten/4.5-mailingcomp-bool
CRM-16063 - Mailing Component - Fix saving of booleans
Tim Otten [Fri, 6 Mar 2015 21:29:02 +0000 (13:29 -0800)]
setup.sh - bower - Only use "-f" if bower.json has changed since last run
Note: If "bower install" fails for some reason, it should abend without
recreating bower_components/.setupsh.ts missing. In the next run, it will
do "-f".
Tim Otten [Fri, 6 Mar 2015 21:10:35 +0000 (13:10 -0800)]
Merge pull request #5319 from totten/master-setup-nodejs
setup.sh, npm test - Fix for debian.org's build of nodejs
Coleman Watts [Fri, 6 Mar 2015 19:40:49 +0000 (14:40 -0500)]
CRM-16063 - Ensure mailing option lookups have no limit
Coleman Watts [Fri, 6 Mar 2015 19:12:45 +0000 (14:12 -0500)]
Mailing 'visibility' option value cleanup
Dave Greenberg [Fri, 6 Mar 2015 17:27:57 +0000 (09:27 -0800)]
Merge pull request #5320 from mlutfy/4.6-crm16061
CRM-16061: translation string fixes.
Dave Greenberg [Fri, 6 Mar 2015 17:25:59 +0000 (09:25 -0800)]
Merge pull request #5321 from mlutfy/4.6-crm16059-2
CRM-16059: Fix Bulgarian province names (upgrade sql).
Coleman Watts [Fri, 6 Mar 2015 16:36:39 +0000 (11:36 -0500)]
CRM-14154 - Fix broken message_template_send api and enhance spec
Coleman Watts [Fri, 6 Mar 2015 15:27:00 +0000 (10:27 -0500)]
CRM-16063 - Set is_active default at the api layer
CiviCRM [Fri, 6 Mar 2015 05:40:51 +0000 (21:40 -0800)]
Update version to 4.5.9
Tim Otten [Fri, 6 Mar 2015 04:38:26 +0000 (20:38 -0800)]
CRM-16063 - Mailing Component - Reset is_default when making a new default
Tim Otten [Fri, 6 Mar 2015 04:32:50 +0000 (20:32 -0800)]
CRM-16063 - Mailing Component - Fix saving of booleans
Tim Otten [Fri, 6 Mar 2015 03:55:50 +0000 (19:55 -0800)]
CRM-16063 - CiviMail - Get full list of active mailin components.
Tim Otten [Fri, 6 Mar 2015 02:14:42 +0000 (18:14 -0800)]
Merge pull request #5318 from totten/4.5-missing-prs
Restore missing PRs
Mathieu Lutfy [Fri, 6 Mar 2015 02:11:55 +0000 (21:11 -0500)]
CRM-16059: Fix Bulgarian province names (upgrade sql).
Mathieu Lutfy [Fri, 6 Mar 2015 01:57:51 +0000 (20:57 -0500)]
CRM-16061: translation string fixes.
Mathieu Lutfy [Fri, 6 Mar 2015 01:51:43 +0000 (20:51 -0500)]
CRM-16061: translation string fixes.
Tim Otten [Fri, 6 Mar 2015 00:25:54 +0000 (16:25 -0800)]
Merge commit '
7aa3a631943cb' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:42 +0000 (16:25 -0800)]
Merge commit '
9974506a13375' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:28 +0000 (16:25 -0800)]
Merge commit '
e2d85c92c3232' into 4.5-missing-prs
Conflicts:
xml/version.xml
Tim Otten [Fri, 6 Mar 2015 00:25:11 +0000 (16:25 -0800)]
Merge commit '
013198e90942d' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:06 +0000 (16:25 -0800)]
Merge commit '
227e59a6a8437' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:25:01 +0000 (16:25 -0800)]
Merge commit '
d8f34a6e5245e' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:51 +0000 (16:24 -0800)]
Merge commit '
8939b4b21c001' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:46 +0000 (16:24 -0800)]
Merge commit '
1ebbf8bfc16f4' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:42 +0000 (16:24 -0800)]
Merge commit '
1ad799fac8340' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:37 +0000 (16:24 -0800)]
Merge commit '
c940014dce8bd' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:33 +0000 (16:24 -0800)]
Merge commit '
762fe6d92bc' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:27 +0000 (16:24 -0800)]
Merge commit '
9942d1dc86' into 4.5-missing-prs
Tim Otten [Fri, 6 Mar 2015 00:24:15 +0000 (16:24 -0800)]
Merge commit '
b02664034bd2' into 4.5-missing-prs
Olaf Buddenhagen [Thu, 5 Mar 2015 23:43:18 +0000 (00:43 +0100)]
Make "Chain Select" mechanism robust against missing 'target' form field
If removeElement() was invoked on an element that is the 'target' of a
'chainSelect' (which can happen through a form hook in an extension),
the chainSelect handling code was subsequently erroring out.
Add checks to avoid that.
This is related to the CRM-15476 fixes in
8f9c3cbea992320f344d576c8a87c5bab318466c and
14b2ff1521a8c25e363b13723c2979f52ad1cd47 , which already fixed the
situation where the 'control' element is missing.
Dave Greenberg [Thu, 5 Mar 2015 22:52:14 +0000 (14:52 -0800)]
Merge pull request #5314 from mlutfy/4.6-crm16059
CRM-16059: Fix Bulgarian province names.
Kurund Jalmi [Thu, 5 Mar 2015 22:32:26 +0000 (04:02 +0530)]
Merge pull request #5312 from atif-shaikh/CRM-16034
CRM-16034 - comma acts as decimal in price set text pricing
Kurund Jalmi [Thu, 5 Mar 2015 22:32:02 +0000 (04:02 +0530)]
Merge pull request #5311 from jitendrapurohit/CRM-testfix
CRM test fix for deleteContact
Dave Greenberg [Thu, 5 Mar 2015 21:18:19 +0000 (13:18 -0800)]
Merge pull request #5313 from compucorp/4.5
Add job ID to mailParams for external email delivery service to utilise
Frank J. Gómez [Thu, 5 Mar 2015 20:32:45 +0000 (15:32 -0500)]
CRM-15965: Fixed typo.
Frank J. Gómez [Thu, 5 Mar 2015 20:24:10 +0000 (15:24 -0500)]
CRM-15965: Update search interface for 4.6 (deferred in 4.5).
Dave Greenberg [Thu, 5 Mar 2015 19:18:51 +0000 (11:18 -0800)]
Merge pull request #5309 from mlutfy/4.6-crm13584-3
CRM-13584: Finish internationalisation of the installer, and minor cleanups
Mathieu Lutfy [Thu, 5 Mar 2015 15:19:49 +0000 (10:19 -0500)]
CRM-16059: Fix Bulgarian province names.
colemanw [Thu, 5 Mar 2015 14:58:04 +0000 (09:58 -0500)]
Merge pull request #5289 from mallezie/crm-16040
CRM-16040: updates on basic criteria advanced search pane
Kurund Jalmi [Thu, 5 Mar 2015 14:07:42 +0000 (19:37 +0530)]
Merge pull request #5310 from monishdeb/testFailures
api Test failure fixes
atif-shaikh [Thu, 5 Mar 2015 12:15:33 +0000 (17:45 +0530)]
CRM-16034 - comma acts as decimal in price set text pricing
https://issues.civicrm.org/jira/browse/CRM-16034
Guanhuan Chen [Thu, 5 Mar 2015 11:44:20 +0000 (11:44 +0000)]
Add job ID to mailParams for external email delivery service to utilise
atif-shaikh [Thu, 5 Mar 2015 11:05:08 +0000 (16:35 +0530)]
CRM-15979 changes as suggested by totten
----------------------------------------
* CRM-15979: Differentiate standalone mailings from A/B test mailings
https://issues.civicrm.org/jira/browse/CRM-15979
monishdeb [Thu, 5 Mar 2015 10:31:31 +0000 (16:01 +0530)]
api Test failure fixes
jitendrapurohit [Thu, 5 Mar 2015 09:10:54 +0000 (14:40 +0530)]
CRM test fix for deleteContact
monishdeb [Thu, 5 Mar 2015 08:47:40 +0000 (14:17 +0530)]
api Test failure fixes
atif-shaikh [Tue, 3 Mar 2015 05:38:42 +0000 (11:08 +0530)]
CRM-15979 QA Fix
----------------------------------------
* CRM-15979: Differentiate standalone mailings from A/B test mailings
https://issues.civicrm.org/jira/browse/CRM-15979
atif-shaikh [Tue, 3 Mar 2015 05:01:53 +0000 (10:31 +0530)]
CRM-15979 - Differentiate standalone mailings from A/B test mailings
----------------------------------------
* CRM-15979: Differentiate standalone mailings from A/B test mailings
https://issues.civicrm.org/jira/browse/CRM-15979
Mathieu Lutfy [Thu, 5 Mar 2015 02:55:30 +0000 (21:55 -0500)]
CRM-13584: Minor fix to code style per build feedback.
Mathieu Lutfy [Thu, 5 Mar 2015 02:31:48 +0000 (21:31 -0500)]
CRM-13584: Finish internationalisation of the installer, and minor cleanups.
Tim Otten [Wed, 4 Mar 2015 23:51:25 +0000 (15:51 -0800)]
setup.sh, npm test - Fix for debian.org's build of nodejs
Debian renamed "node" to "nodejs" to avoid conflicts with another package.
One can resolve that by installing an extra package ("nodejs-legacy") or by
using the nodesource.com packages, but users may not know that.
https://lists.debian.org/debian-devel-announce/2012/07/msg00002.html
This commit uses whichever command is available.
Dave Greenberg [Wed, 4 Mar 2015 20:51:44 +0000 (12:51 -0800)]
Merge pull request #5297 from rohankatkar/CRM15729
Fix for CRM-15729
Tim Otten [Wed, 4 Mar 2015 20:23:11 +0000 (12:23 -0800)]
Merge pull request #5302 from totten/master-karma-phantom
CRM-16046 - karma - Use PhantomJS by default.
Dave Greenberg [Wed, 4 Mar 2015 15:53:08 +0000 (07:53 -0800)]
Merge pull request #5292 from jitendrapurohit/CRM-15933
CRM-15933 Profile HTML Snippets don't respect CIVICRM_UF_WP_BASEPAGE
CiviCRM [Wed, 4 Mar 2015 15:07:32 +0000 (07:07 -0800)]
Update version to 4.6.beta3
CiviCRM [Wed, 4 Mar 2015 14:16:49 +0000 (06:16 -0800)]
Update version to 4.5.8
Kurund Jalmi [Wed, 4 Mar 2015 13:24:24 +0000 (18:54 +0530)]
Merge pull request #5303 from davecivicrm/CRM-15578b
CRM-15578 - Change A/B test navigation permissions to require access Civ...
kurund [Wed, 4 Mar 2015 13:22:06 +0000 (18:52 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-03-04-18-48-05
Conflicts:
CRM/Mailing/BAO/Mailing.php
sql/civicrm_generated.mysql
xml/version.xml
Kurund Jalmi [Wed, 4 Mar 2015 12:16:47 +0000 (17:46 +0530)]
Merge pull request #5306 from kurund/PR-5111
re-adding changes done in #5111
Kurund Jalmi [Wed, 4 Mar 2015 11:53:32 +0000 (17:23 +0530)]
Merge pull request #5287 from mlutfy/4.6-crm13584-2
CRM-13584: After non-en_US installation in Drupal, revert settings...
kurund [Wed, 4 Mar 2015 10:15:52 +0000 (15:45 +0530)]
also update generated data
kurund [Wed, 4 Mar 2015 10:14:14 +0000 (15:44 +0530)]
re-adding PR-5111
Web Access [Wed, 4 Mar 2015 06:51:41 +0000 (12:21 +0530)]
Updated code to fix jScript error
Web Access [Tue, 3 Mar 2015 15:58:43 +0000 (21:28 +0530)]
Changes to CRm-15729
Web Access [Tue, 3 Mar 2015 15:36:43 +0000 (21:06 +0530)]
Fix for CRM-15729
colemanw [Wed, 4 Mar 2015 01:21:18 +0000 (20:21 -0500)]
Merge pull request #5304 from colemanw/CRM-15932
CRM-15932 - Fix exclude date format
Coleman Watts [Wed, 4 Mar 2015 01:20:39 +0000 (20:20 -0500)]
CRM-15932 - Fix exclude date format
Dave Greenberg [Wed, 4 Mar 2015 01:18:48 +0000 (17:18 -0800)]
Merge pull request #5301 from totten/master-abtest-perm
CRM-15854 - MailingAB API - Restrict to 'access CiviMail'
Dave Greenberg [Wed, 4 Mar 2015 01:17:28 +0000 (17:17 -0800)]
CRM-15578 - Change A/B test navigation permissions to require access CiviMail.
----------------------------------------
* CRM-15578: Implement "New Mailing" + "AB Testing" in Angular
https://issues.civicrm.org/jira/browse/CRM-15578
projects / civicrm-core.git / log