totten@civicrm.org [Sat, 21 Jun 2014 11:10:31 +0000 (04:10 -0700)]
distmaker - DRY common.sh
totten@civicrm.org [Sat, 21 Jun 2014 10:57:47 +0000 (03:57 -0700)]
distmaker - Extract function dm_install_joomla()
totten@civicrm.org [Sat, 21 Jun 2014 10:41:52 +0000 (03:41 -0700)]
distmaker - Extract function dm_generate_version()
totten@civicrm.org [Sat, 21 Jun 2014 10:33:10 +0000 (03:33 -0700)]
distmaker - Extract functions dm_install_drupal() and dm_install_drupal_info()
totten@civicrm.org [Sat, 21 Jun 2014 10:23:37 +0000 (03:23 -0700)]
distmaker - Extract function dm_install_packages()
totten@civicrm.org [Sat, 21 Jun 2014 10:13:24 +0000 (03:13 -0700)]
distmaker - Extract function dm_install_core()
Conflicts:
distmaker/dists/drupal6_php5.sh
distmaker/dists/drupal_php5.sh
distmaker/dists/drupal_sk_php5.sh
distmaker/dists/joomla_php5.sh
distmaker/dists/wordpress_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 09:26:45 +0000 (02:26 -0700)]
distmaker - Auto-create DM_GENFILESDIR, DM_TARGETDIR, $DM_TMPDIR
Tim Otten [Sat, 21 Jun 2014 01:41:46 +0000 (18:41 -0700)]
Merge pull request #3536 from totten/4.4-12856
CRM-12856 - Cleanup
Tim Otten [Sat, 21 Jun 2014 00:19:17 +0000 (17:19 -0700)]
CRM-12856 - CRM_Core_Lock - Quieter logs
The log is very noisy (adding several log lines on most page requests). This
might be useful for debugging lock issues, but that's a developer task, so
we'll only do it if CIVICRM_LOCK_DEBUG is defined.
Tim Otten [Fri, 20 Jun 2014 23:57:04 +0000 (16:57 -0700)]
CRM-12856 - CRM_Core_Lock - Autoformat
Eileen McNaughton [Fri, 20 Jun 2014 21:39:24 +0000 (09:39 +1200)]
Merge pull request #3528 from eileenmcnaughton/api-sync
syncronise 4.5 api behaviour with 4.4 to provide more consistent extensi...
Eileen McNaughton [Fri, 20 Jun 2014 02:15:57 +0000 (14:15 +1200)]
syncronise 4.5 api behaviour with 4.4 to provide more consistent extension support
Tim Otten [Thu, 19 Jun 2014 06:05:53 +0000 (23:05 -0700)]
Merge pull request #3502 from totten/4.4-profile-db-settings
CRM-14856 - Profile DB settings
Kurund Jalmi [Sat, 14 Jun 2014 05:49:59 +0000 (11:19 +0530)]
Merge pull request #3439 from dlobo/CRM-14799
CRM-14799 - CiviMail keeps delivering (and bouncing) if SMTP server disappears
Tim Otten [Sat, 14 Jun 2014 02:50:43 +0000 (19:50 -0700)]
CRM-14856 - CRM_Profile_Form_Edit - Reimplement cancelURL
Tim Otten [Sat, 14 Jun 2014 00:05:06 +0000 (17:05 -0700)]
CRM-14856 - CRM_Profile_Form - Load postURL and add_to_group from DB (instead of POST)
Also:
* Keep & use a single copy of the UFGroup in $this->_ufGroup.
* Retain "gid" as a hidden field (for use in POST-backs).
Eileen McNaughton [Fri, 13 Jun 2014 03:13:07 +0000 (15:13 +1200)]
Merge pull request #3490 from civicrm/CRM-14842
trivial tidy up to trigger jenkins
Eileen McNaughton [Fri, 13 Jun 2014 03:12:14 +0000 (15:12 +1200)]
minor tidy up to trigger new test run
(we are removing __LINE__ lines - as no longer required - but driver here is to get jenkins to re-run as failing test appears to be due to freaky timing issue so want to check)
Eileen McNaughton [Thu, 12 Jun 2014 21:03:15 +0000 (09:03 +1200)]
Merge pull request #3487 from eileenmcnaughton/CRM-14842
CRM-14842 fix string validation
Eileen McNaughton [Thu, 12 Jun 2014 20:51:12 +0000 (08:51 +1200)]
comment fixes
Eileen McNaughton [Thu, 12 Jun 2014 20:44:53 +0000 (08:44 +1200)]
CRM-14842 decode utf prior to checking strlen
Dave Greenberg [Thu, 12 Jun 2014 15:53:52 +0000 (08:53 -0700)]
Merge pull request #3395 from mlutfy/4.4-crm14769
CRM-14769: Extension translation: bugfix and add support for phpgettext.
Tim Otten [Wed, 11 Jun 2014 23:18:12 +0000 (16:18 -0700)]
Merge pull request #3399 from totten/4.4-time-threshold
CRM_Utils_Check_Env::checkMysqlTime - Be more forgiving
Eileen McNaughton [Wed, 11 Jun 2014 13:09:42 +0000 (01:09 +1200)]
Merge pull request #3478 from eileenmcnaughton/e-notice
E notice
Eileen McNaughton [Wed, 11 Jun 2014 13:06:30 +0000 (01:06 +1200)]
enotice fix
Tim Otten [Wed, 11 Jun 2014 04:56:43 +0000 (21:56 -0700)]
Merge pull request #3475 from eileenmcnaughton/CRM-14822
CRM-14822 add checkbox handling to api custom fields
Eileen McNaughton [Wed, 11 Jun 2014 04:27:16 +0000 (16:27 +1200)]
CRM-14822 Comment fixes
Eileen McNaughton [Wed, 11 Jun 2014 04:22:31 +0000 (16:22 +1200)]
CRM-14822 Comment fixes
Tim Otten [Wed, 11 Jun 2014 03:56:51 +0000 (20:56 -0700)]
Merge pull request #3476 from eileenmcnaughton/CRM-14838
CRM-14838 tokens not working when value is rendered as an integer
Eileen McNaughton [Wed, 11 Jun 2014 01:34:35 +0000 (13:34 +1200)]
CRM-14838 tokens not working when value is rendered as an integer
Eileen McNaughton [Tue, 10 Jun 2014 04:10:31 +0000 (16:10 +1200)]
CRM-14822 tests to ensure correct checkbox handling
Eileen McNaughton [Tue, 10 Jun 2014 04:12:16 +0000 (16:12 +1200)]
CRM-14822 fix api handling of checkbox fields so it supports api-consistent input along with previous form-oriented format
Dave Greenberg [Tue, 10 Jun 2014 21:00:26 +0000 (14:00 -0700)]
Merge pull request #3470 from jmcclelland/activities-typo
Activities typo
Jamie McClelland [Tue, 10 Jun 2014 19:14:47 +0000 (15:14 -0400)]
CRM-14836 - fix mispelling of activities.
----------------------------------------
* CRM-14836: Activities is misspelled on activity delete confirmation page
https://issues.civicrm.org/jira/browse/CRM-14836
Monish Deb [Tue, 10 Jun 2014 17:35:37 +0000 (23:05 +0530)]
Merge pull request #3383 from jmcclelland/prefix-id-update-via-profile
Prefix id update via profile
Donald A. Lobo [Thu, 5 Jun 2014 14:19:13 +0000 (07:19 -0700)]
CRM-14799 - CiviMail keeps delivering (and bouncing) if SMTP server disappears
https://issues.civicrm.org/jira/browse/CRM-14799
Eileen McNaughton [Thu, 5 Jun 2014 00:11:48 +0000 (12:11 +1200)]
Merge pull request #3292 from eileenmcnaughton/CRM-14708
CRM-14708 accept POSTs without x_cust_id based on missing contact_id … …
Eileen McNaughton [Thu, 5 Jun 2014 00:10:57 +0000 (12:10 +1200)]
Merge pull request #3390 from eileenmcnaughton/CRM-12856
CRM-12856 short-term fix - stop double mailings arising from core locks
Eileen McNaughton [Thu, 5 Jun 2014 00:02:41 +0000 (12:02 +1200)]
Merge pull request #3318 from eileenmcnaughton/CRM-14718
CRM-14718 return early for already-handled-notifications
Mathieu Lutfy [Mon, 2 Jun 2014 19:07:50 +0000 (15:07 -0400)]
CRM-14769: fix for i18n extensions and domain changes (do not change domain if using en_US).
Tim Otten [Sat, 31 May 2014 22:22:39 +0000 (15:22 -0700)]
CRM_Utils_Check_Env::checkMysqlTime - Be more forgiving
Per lcdweb, differences of 1-2 min are acceptable. This check was
originally created because some PHP/MySQL systems have different
TZ's and show differences of several hours.
Tim Otten [Sat, 31 May 2014 21:19:50 +0000 (14:19 -0700)]
Merge pull request #3398 from totten/4.4-define-webtest
CRM-14605 - Add define(CIVICRM_WEBTEST)
Tim Otten [Sat, 31 May 2014 21:16:31 +0000 (14:16 -0700)]
CRM-14605 - Add define(CIVICRM_WEBTEST)
This can be used by CiviTest/civicrm.settings*.php to select different
configuration options for web-tests and unit-tests.
Mathieu Lutfy [Fri, 30 May 2014 19:33:19 +0000 (15:33 -0400)]
CRM-14769: Extension translation: bugfix and add support for phpgettext.
Eileen [Fri, 30 May 2014 04:11:23 +0000 (00:11 -0400)]
CRM-12856 hack to stop problems arising from mis-use of locks - need to review correct approach
Jamie McClelland [Wed, 28 May 2014 15:27:40 +0000 (11:27 -0400)]
CRM-14760 - ensure prefix/suffix is updated via profile update
----------------------------------------
* CRM-14760: updating individual prefix via profile fails
https://issues.civicrm.org/jira/browse/CRM-14760
Yashodha Chaku [Thu, 22 May 2014 11:48:27 +0000 (17:18 +0530)]
Merge pull request #3324 from pratik-joshi/CRM-14317-comment-fix
Crm 14317 comment fix
Pratik Joshi [Wed, 21 May 2014 13:47:28 +0000 (19:17 +0530)]
CRM-14317-comment-fix
Kurund Jalmi [Wed, 21 May 2014 13:36:19 +0000 (19:06 +0530)]
Merge pull request #3294 from systopia/Ticket-#918
CRM-14709 - ChangeLog-Lookup: civicrm_note-query fixed
Eileen [Wed, 21 May 2014 04:10:36 +0000 (00:10 -0400)]
CRM-14718 early return on already processed subscription updates
Tim Otten [Tue, 20 May 2014 03:12:55 +0000 (20:12 -0700)]
Merge pull request #2988 from totten/4.4-rmorgtools
INFRA-107 - Cleanup
Dave Greenberg [Mon, 19 May 2014 22:41:16 +0000 (15:41 -0700)]
Merge pull request #3278 from pratik-joshi/CRM-14681
Crm 14681 : Import Contacts no longer checks contact type, instead contact type is changed.
thomas [Mon, 19 May 2014 10:08:17 +0000 (12:08 +0200)]
Logging-ChangeLog-Lookup-Bugfix
Eileen [Mon, 19 May 2014 08:20:08 +0000 (04:20 -0400)]
CRM-14708 accept POSTs without x_cust_id based on missing contact_id problem & existing logic making it optional
Conflicts:
CRM/Core/Payment/AuthorizeNetIPN2.php
Kurund Jalmi [Mon, 19 May 2014 08:41:31 +0000 (14:11 +0530)]
Merge pull request #3291 from eileenmcnaughton/CRM-14708
CRM-14708 - Authorize.net recurring back-office membership transaction data loss
Eileen [Mon, 19 May 2014 08:10:35 +0000 (04:10 -0400)]
CRM-14708 - Authorize.net recurring back-office membership transactions silent failure
Eileen [Mon, 19 May 2014 08:11:07 +0000 (04:11 -0400)]
fix mis-cased classname
Pratik Joshi [Fri, 16 May 2014 08:03:59 +0000 (13:33 +0530)]
CRM-14681 : fix for non matching contact getting created errorneously
Kurund Jalmi [Wed, 14 May 2014 19:37:08 +0000 (09:37 -1000)]
Merge pull request #3190 from eileenmcnaughton/trans
CRM-14657 - is_transactional is inconsistent in api
Dave Greenberg [Tue, 13 May 2014 18:52:53 +0000 (11:52 -0700)]
Merge pull request #3243 from jmcclelland/contribution-aggregate-report-custom-field
Contribution aggregate report custom field
Jamie McClelland [Tue, 13 May 2014 14:32:46 +0000 (10:32 -0400)]
CRM-14680 - ensure custom tables included in sql statement
Fix for the Contribution Aggregate by Relationship report.
----------------------------------------
* CRM-14680: Contribution Aggregate by Relationship report fails with custom contribution field
https://issues.civicrm.org/jira/browse/CRM-14680
Kurund Jalmi [Tue, 13 May 2014 02:25:59 +0000 (16:25 -1000)]
Merge pull request #3235 from jmcclelland/escape-prev-next-cache
Escape prev next cache
Jamie McClelland [Mon, 12 May 2014 14:46:44 +0000 (10:46 -0400)]
CRM-14676 - need to escape names before inserting into prev_next_cache
----------------------------------------
* CRM-14676: Inserting values into civicrm_prevnext_cache fails to properly escape names
https://issues.civicrm.org/jira/browse/CRM-14676
Tim Otten [Fri, 9 May 2014 19:28:39 +0000 (12:28 -0700)]
Merge pull request #3224 from totten/4.4-image-url-idx
CRM-14646 - optimze image display upgrade code
Jamie McClelland [Mon, 5 May 2014 15:43:12 +0000 (11:43 -0400)]
CRM-14646 - optimze image display upgrade code
----------------------------------------
* CRM-14646: new image display upgrade code not optimized, can result in error
https://issues.civicrm.org/jira/browse/CRM-14646
Eileen McNaughton [Wed, 7 May 2014 06:30:56 +0000 (18:30 +1200)]
CRM-14657 - is_transactiona is inconsistent in api
Kurund Jalmi [Tue, 6 May 2014 19:20:23 +0000 (12:20 -0700)]
Merge pull request #3188 from Ezodesign/CRM-14624
Fixed call by reference in CRM_Utils_System_Joomla
Jeremy Proffitt [Tue, 6 May 2014 18:12:47 +0000 (14:12 -0400)]
CRM-14624 - Removed call by reference in Joomla.php:105
----------------------------------------
* CRM-14624: Strict Standards Error - CRM_Utils_System_Joomla
https://issues.civicrm.org/jira/browse/CRM-14624
Tim Otten [Tue, 6 May 2014 16:53:50 +0000 (09:53 -0700)]
Merge pull request #3186 from totten/4.4-rest-q
CRM-14506 - REST - Prefer "entity"/"action" over "q" (via xavier and enders)
systopia [Mon, 5 May 2014 09:25:19 +0000 (11:25 +0200)]
Xaviers fix for CRM-14506
dlobo [Mon, 5 May 2014 22:12:45 +0000 (15:12 -0700)]
Merge pull request #3178 from jmcclelland/pledge-report-debug-function
Pledge report debug function
Jamie McClelland [Mon, 5 May 2014 19:25:22 +0000 (15:25 -0400)]
remove debug output from report.
colemanw [Sun, 4 May 2014 01:57:25 +0000 (18:57 -0700)]
Merge pull request #2968 from eileenmcnaughton/CRM-14459
CRM-14459 fix for fatal error on bad street parsing
Tim Otten [Fri, 2 May 2014 23:44:22 +0000 (16:44 -0700)]
Merge pull request #3086 from colemanw/onBehalf
Contribution form improvements
Kurund Jalmi [Fri, 2 May 2014 23:02:11 +0000 (16:02 -0700)]
Merge pull request #3132 from GinkgoFJG/4.4
Update CONTRIBUTORS.txt for Ginkgo Street Labs.
Coleman Watts [Fri, 2 May 2014 22:40:11 +0000 (15:40 -0700)]
Contribution onBehalf form - Improve ajax callback
Coleman Watts [Fri, 2 May 2014 22:39:39 +0000 (15:39 -0700)]
Contribution onBehalf form - Fix js bug
Coleman Watts [Fri, 2 May 2014 22:29:54 +0000 (15:29 -0700)]
code cleanup
Frank J. Gómez [Fri, 2 May 2014 22:15:49 +0000 (15:15 -0700)]
Update for Ginkgo Street Labs.
Kurund Jalmi [Fri, 2 May 2014 21:52:37 +0000 (14:52 -0700)]
Merge pull request #3111 from mlutfy/4.4-crm13068-b
CRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo
Mathieu Lutfy [Fri, 2 May 2014 02:05:12 +0000 (22:05 -0400)]
CRM-13068: better document native gettext in the civicrm.settings.php.template.
Mathieu Lutfy [Fri, 2 May 2014 00:27:51 +0000 (20:27 -0400)]
CRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo
Since 4.3, CiviCRM supports two gettext implementations: phpgettext
(default) and native gettext. The performance of native gettext is
much better, but requires a specific file hierarchy and that the
operating system has support for the locale (dpkg-reconfigure locale).
Now that the release scripts package the files as:
l10n/xx_XX/LC_MESSAGES/civicrm.mo, instead of
l10n/xx_XX/civicrm.mo, we needed to modify phpgettext to load the
files from the new directory. However, we also support the old
hierarchy as a fallback, so that we do not break the build scripts
of people who do not use phpgettext.
Coleman Watts [Thu, 1 May 2014 19:39:28 +0000 (12:39 -0700)]
Contribution Pages - Improve related employer autofill
Coleman Watts [Thu, 1 May 2014 18:50:18 +0000 (11:50 -0700)]
Contribution Pages - Allow checksum contact to select employer
Coleman Watts [Thu, 1 May 2014 18:40:19 +0000 (11:40 -0700)]
Contribution Pages - Change employer from autocomplete to select
Coleman Watts [Thu, 1 May 2014 17:40:14 +0000 (10:40 -0700)]
Contact Dashboard - cleanup and remove unused code
Eileen McNaughton [Wed, 30 Apr 2014 23:40:57 +0000 (16:40 -0700)]
Merge pull request #3065 from eileenmcnaughton/CRM-14589
CRM-14589 - Next Payment Due broken on pledged but not paid report
Eileen [Wed, 30 Apr 2014 23:29:58 +0000 (19:29 -0400)]
CRM-14589 - Next Payment Due broken on pledged but not paid report
Tim Otten [Wed, 30 Apr 2014 19:57:16 +0000 (12:57 -0700)]
Merge pull request #3058 from totten/mepps-4.4-secure-image-urls
CRM-14499 - Image URL fixup
Tim Otten [Wed, 30 Apr 2014 19:50:49 +0000 (12:50 -0700)]
CRM-14499 - ImageFile - Fix photo URL validation on WP
----------------------------------------
* CRM-14499: Upgrade to 4.4.5 causes contact photos to be unviewable
https://issues.civicrm.org/jira/browse/CRM-14499
Kurund Jalmi [Wed, 30 Apr 2014 05:56:31 +0000 (22:56 -0700)]
Merge pull request #3040 from mlutfy/4.4-crm14573
CRM-14573: ts fixes for 4.4
Margaret Epps [Wed, 30 Apr 2014 01:47:36 +0000 (21:47 -0400)]
Redid indentation in CRM/Upgrade/Incremental/php/FourFour.php
Mathieu Lutfy [Wed, 30 Apr 2014 01:46:21 +0000 (21:46 -0400)]
CRM-14573: ts fixes (CRM/Event/Cart/Form/Checkout/Payment.php, templates/CRM/Contribute/Form/ContributionPage/Tab.hlp).
Maggie [Tue, 29 Apr 2014 19:06:08 +0000 (15:06 -0400)]
CRM-14499: Update FourFour upgrade script and changes image urls to improve security but allow access
Maggie [Tue, 29 Apr 2014 16:44:52 +0000 (12:44 -0400)]
Rewrote system CRM_Utils_System::download to take optional disposition argument
Eileen McNaughton [Tue, 29 Apr 2014 01:07:30 +0000 (18:07 -0700)]
Merge pull request #3010 from eileenmcnaughton/CRM-14559
CRM-14559 fix invalid html
Eileen McNaughton [Tue, 29 Apr 2014 00:56:51 +0000 (17:56 -0700)]
CRM-14559 fix invalid html
Tim Otten [Mon, 28 Apr 2014 18:10:01 +0000 (11:10 -0700)]
INFRA-107 - Cleanup
Remove custom Drupal modules for civicrm.org from civicrm-core.git. These
are already in civicrm-website-org.git, and those are the versions in use.
Eileen McNaughton [Fri, 11 Apr 2014 05:14:47 +0000 (17:14 +1200)]
CRM-14459 fix for fatal error on bad street parsing
Eileen McNaughton [Sun, 27 Apr 2014 23:10:18 +0000 (16:10 -0700)]
Merge pull request #2966 from eileenmcnaughton/patch-2
E-Notice fix
projects / civicrm-core.git / log