civicrm-core.git
10 years agoMerge pull request #3553 from eileenmcnaughton/4.4
Tim Otten [Tue, 24 Jun 2014 01:47:07 +0000 (18:47 -0700)]
Merge pull request #3553 from eileenmcnaughton/4.4

CRM-14903 fix REGEX to RLIKE

10 years agoCRM-14903 fix REGEX to RLIKE
Eileen McNaughton [Tue, 24 Jun 2014 01:44:28 +0000 (13:44 +1200)]
CRM-14903 fix REGEX to RLIKE

10 years agoMerge pull request #3540 from totten/4.4-distmaker
Tim Otten [Tue, 24 Jun 2014 01:23:01 +0000 (18:23 -0700)]
Merge pull request #3540 from totten/4.4-distmaker

distmaker cleanup

10 years agoMerge pull request #3546 from eileenmcnaughton/4.4
Dave Greenberg [Mon, 23 Jun 2014 21:50:57 +0000 (14:50 -0700)]
Merge pull request #3546 from eileenmcnaughton/4.4

CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed o...

10 years agoCRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators
Eileen McNaughton [Mon, 23 Jun 2014 13:54:18 +0000 (01:54 +1200)]
CRM-14903 alter enum field on civicrm_mapping_field to reflect allowed operators

10 years agodistmaker - Fix the *.info filter and apply it to all Drupal builds
totten@civicrm.org [Sat, 21 Jun 2014 13:53:42 +0000 (06:53 -0700)]
distmaker - Fix the *.info filter and apply it to all Drupal builds

10 years agodistmaker - Allow running individual builds without switching branches
totten@civicrm.org [Sat, 21 Jun 2014 13:22:52 +0000 (06:22 -0700)]
distmaker - Allow running individual builds without switching branches

One of the more annoying things with distmaker is that it switches all the
branches, which means that you need to commit everything before building.
This is necessary for building D6 & D7 in the same script, but makes it
harder to work on changes to builds.

With this patch, one can directly call the "dists/*.sh" files to trigger a
build, and it muck with git.  All the git checkouts are now specified in the
distmaker.sh

10 years agodistmaker - dm_install_wordpress - Should allow building on "wp-demo" (untested)
totten@civicrm.org [Sat, 21 Jun 2014 12:58:41 +0000 (05:58 -0700)]
distmaker - dm_install_wordpress - Should allow building on "wp-demo" (untested)

10 years agodistmaker - Demindfuckify joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 12:31:20 +0000 (05:31 -0700)]
distmaker - Demindfuckify joomla_php5.sh

10 years agodistmaker - Reduce noise in joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 12:05:11 +0000 (05:05 -0700)]
distmaker - Reduce noise in joomla_php5.sh

10 years agodistmaker - Extract function dm_reset_dirs(). Reduce noise.
totten@civicrm.org [Sat, 21 Jun 2014 11:58:14 +0000 (04:58 -0700)]
distmaker - Extract function dm_reset_dirs(). Reduce noise.

10 years agodistmaker - Simplify l10n.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:46:55 +0000 (04:46 -0700)]
distmaker - Simplify l10n.sh

10 years agodistmaker - Reduce noise in dists/*.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:42:10 +0000 (04:42 -0700)]
distmaker - Reduce noise in dists/*.sh

Conflicts:
distmaker/dists/l10n.sh

10 years agodistmaker - Extract function dm_install_wordpress()
totten@civicrm.org [Sat, 21 Jun 2014 11:36:29 +0000 (04:36 -0700)]
distmaker - Extract function dm_install_wordpress()

10 years agodistmaker - Reduce noise in dists/*.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:25:17 +0000 (04:25 -0700)]
distmaker - Reduce noise in dists/*.sh

10 years agodistmaker - Remove dead code. Shift comments.
totten@civicrm.org [Sat, 21 Jun 2014 11:15:00 +0000 (04:15 -0700)]
distmaker - Remove dead code. Shift comments.

10 years agodistmaker - Extract function dm_install_l10n()
totten@civicrm.org [Sat, 21 Jun 2014 11:10:55 +0000 (04:10 -0700)]
distmaker - Extract function dm_install_l10n()

10 years agodistmaker - DRY common.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:10:31 +0000 (04:10 -0700)]
distmaker - DRY common.sh

10 years agodistmaker - Extract function dm_install_joomla()
totten@civicrm.org [Sat, 21 Jun 2014 10:57:47 +0000 (03:57 -0700)]
distmaker - Extract function dm_install_joomla()

10 years agodistmaker - Extract function dm_generate_version()
totten@civicrm.org [Sat, 21 Jun 2014 10:41:52 +0000 (03:41 -0700)]
distmaker - Extract function dm_generate_version()

10 years agodistmaker - Extract functions dm_install_drupal() and dm_install_drupal_info()
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()

10 years agodistmaker - Extract function dm_install_packages()
totten@civicrm.org [Sat, 21 Jun 2014 10:23:37 +0000 (03:23 -0700)]
distmaker - Extract function dm_install_packages()

10 years agodistmaker - Extract function dm_install_core()
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

10 years agodistmaker - Auto-create DM_GENFILESDIR, DM_TARGETDIR, $DM_TMPDIR
totten@civicrm.org [Sat, 21 Jun 2014 09:26:45 +0000 (02:26 -0700)]
distmaker - Auto-create DM_GENFILESDIR, DM_TARGETDIR, $DM_TMPDIR

10 years agoMerge pull request #3536 from totten/4.4-12856
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

10 years agoCRM-12856 - CRM_Core_Lock - Quieter logs
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.

10 years agoCRM-12856 - CRM_Core_Lock - Autoformat
Tim Otten [Fri, 20 Jun 2014 23:57:04 +0000 (16:57 -0700)]
CRM-12856 - CRM_Core_Lock - Autoformat

10 years agoMerge pull request #3528 from eileenmcnaughton/api-sync
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...

10 years agosyncronise 4.5 api behaviour with 4.4 to provide more consistent extension support
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

10 years agoMerge pull request #3502 from totten/4.4-profile-db-settings
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

10 years agoMerge pull request #3439 from dlobo/CRM-14799
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

10 years agoCRM-14856 - CRM_Profile_Form_Edit - Reimplement cancelURL
Tim Otten [Sat, 14 Jun 2014 02:50:43 +0000 (19:50 -0700)]
CRM-14856 - CRM_Profile_Form_Edit - Reimplement cancelURL

10 years agoCRM-14856 - CRM_Profile_Form - Load postURL and add_to_group from DB (instead of...
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).

10 years agoMerge pull request #3490 from civicrm/CRM-14842
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

10 years agominor tidy up to trigger new test run
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)

10 years agoMerge pull request #3487 from eileenmcnaughton/CRM-14842
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

10 years agocomment fixes
Eileen McNaughton [Thu, 12 Jun 2014 20:51:12 +0000 (08:51 +1200)]
comment fixes

10 years agoCRM-14842 decode utf prior to checking strlen
Eileen McNaughton [Thu, 12 Jun 2014 20:44:53 +0000 (08:44 +1200)]
CRM-14842 decode utf prior to checking strlen

10 years agoMerge pull request #3395 from mlutfy/4.4-crm14769
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.

10 years agoMerge pull request #3399 from totten/4.4-time-threshold
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

10 years agoMerge pull request #3478 from eileenmcnaughton/e-notice
Eileen McNaughton [Wed, 11 Jun 2014 13:09:42 +0000 (01:09 +1200)]
Merge pull request #3478 from eileenmcnaughton/e-notice

E notice

10 years agoenotice fix
Eileen McNaughton [Wed, 11 Jun 2014 13:06:30 +0000 (01:06 +1200)]
enotice fix

10 years agoMerge pull request #3475 from eileenmcnaughton/CRM-14822
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

10 years agoCRM-14822 Comment fixes
Eileen McNaughton [Wed, 11 Jun 2014 04:27:16 +0000 (16:27 +1200)]
CRM-14822 Comment fixes

10 years agoCRM-14822 Comment fixes
Eileen McNaughton [Wed, 11 Jun 2014 04:22:31 +0000 (16:22 +1200)]
CRM-14822 Comment fixes

10 years agoMerge pull request #3476 from eileenmcnaughton/CRM-14838
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

10 years agoCRM-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

10 years agoCRM-14822 tests to ensure correct checkbox handling
Eileen McNaughton [Tue, 10 Jun 2014 04:10:31 +0000 (16:10 +1200)]
CRM-14822 tests to ensure correct checkbox handling

10 years agoCRM-14822 fix api handling of checkbox fields so it supports api-consistent input...
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

10 years agoMerge pull request #3470 from jmcclelland/activities-typo
Dave Greenberg [Tue, 10 Jun 2014 21:00:26 +0000 (14:00 -0700)]
Merge pull request #3470 from jmcclelland/activities-typo

Activities typo

10 years agoCRM-14836 - fix mispelling of activities.
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

10 years agoMerge pull request #3383 from jmcclelland/prefix-id-update-via-profile
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

10 years agoCRM-14799 - CiviMail keeps delivering (and bouncing) if SMTP server disappears
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

10 years agoMerge pull request #3292 from eileenmcnaughton/CRM-14708
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 … …

10 years agoMerge pull request #3390 from eileenmcnaughton/CRM-12856
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

10 years agoMerge pull request #3318 from eileenmcnaughton/CRM-14718
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

10 years agoCRM-14769: fix for i18n extensions and domain changes (do not change domain if using...
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).

10 years agoCRM_Utils_Check_Env::checkMysqlTime - Be more forgiving
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.

10 years agoMerge pull request #3398 from totten/4.4-define-webtest
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)

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

10 years agoCRM-14769: Extension translation: bugfix and add support for phpgettext.
Mathieu Lutfy [Fri, 30 May 2014 19:33:19 +0000 (15:33 -0400)]
CRM-14769: Extension translation: bugfix and add support for phpgettext.

10 years agoCRM-12856 hack to stop problems arising from mis-use of locks - need to review correc...
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

10 years agoCRM-14760 - ensure prefix/suffix is updated via profile update
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

10 years agoMerge pull request #3324 from pratik-joshi/CRM-14317-comment-fix
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

10 years agoCRM-14317-comment-fix
Pratik Joshi [Wed, 21 May 2014 13:47:28 +0000 (19:17 +0530)]
CRM-14317-comment-fix

10 years agoMerge pull request #3294 from systopia/Ticket-#918
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

10 years agoCRM-14718 early return on already processed subscription updates
Eileen [Wed, 21 May 2014 04:10:36 +0000 (00:10 -0400)]
CRM-14718 early return on already processed subscription updates

10 years agoMerge pull request #2988 from totten/4.4-rmorgtools
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

10 years agoMerge pull request #3278 from pratik-joshi/CRM-14681
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.

10 years agoLogging-ChangeLog-Lookup-Bugfix
thomas [Mon, 19 May 2014 10:08:17 +0000 (12:08 +0200)]
Logging-ChangeLog-Lookup-Bugfix

10 years agoCRM-14708 accept POSTs without x_cust_id based on missing contact_id problem & existi...
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

10 years agoMerge pull request #3291 from eileenmcnaughton/CRM-14708
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

10 years agoCRM-14708 - Authorize.net recurring back-office membership transactions silent failure
Eileen [Mon, 19 May 2014 08:10:35 +0000 (04:10 -0400)]
CRM-14708 - Authorize.net recurring back-office membership transactions silent failure

10 years agofix mis-cased classname
Eileen [Mon, 19 May 2014 08:11:07 +0000 (04:11 -0400)]
fix mis-cased classname

10 years agoCRM-14681 : fix for non matching contact getting created errorneously
Pratik Joshi [Fri, 16 May 2014 08:03:59 +0000 (13:33 +0530)]
CRM-14681 : fix for non matching contact getting created errorneously

10 years agoMerge pull request #3190 from eileenmcnaughton/trans
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

10 years agoMerge pull request #3243 from jmcclelland/contribution-aggregate-report-custom-field
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

10 years agoCRM-14680 - ensure custom tables included in sql statement
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

10 years agoMerge pull request #3235 from jmcclelland/escape-prev-next-cache
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

10 years agoCRM-14676 - need to escape names before inserting into 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

10 years agoMerge pull request #3224 from totten/4.4-image-url-idx
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

10 years agoCRM-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

10 years agoCRM-14657 - is_transactiona is inconsistent in api
Eileen McNaughton [Wed, 7 May 2014 06:30:56 +0000 (18:30 +1200)]
CRM-14657 - is_transactiona is inconsistent in api

10 years agoMerge pull request #3188 from Ezodesign/CRM-14624
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

10 years agoCRM-14624 - Removed call by reference in Joomla.php:105
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

10 years agoMerge pull request #3186 from totten/4.4-rest-q
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)

10 years agoXaviers fix for CRM-14506
systopia [Mon, 5 May 2014 09:25:19 +0000 (11:25 +0200)]
Xaviers fix for CRM-14506

10 years agoMerge pull request #3178 from jmcclelland/pledge-report-debug-function
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

10 years agoremove debug output from report.
Jamie McClelland [Mon, 5 May 2014 19:25:22 +0000 (15:25 -0400)]
remove debug output from report.

10 years agoMerge pull request #2968 from eileenmcnaughton/CRM-14459
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

10 years agoMerge pull request #3086 from colemanw/onBehalf
Tim Otten [Fri, 2 May 2014 23:44:22 +0000 (16:44 -0700)]
Merge pull request #3086 from colemanw/onBehalf

Contribution form improvements

10 years agoMerge pull request #3132 from GinkgoFJG/4.4
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.

10 years agoContribution onBehalf form - Improve ajax callback
Coleman Watts [Fri, 2 May 2014 22:40:11 +0000 (15:40 -0700)]
Contribution onBehalf form - Improve ajax callback

10 years agoContribution onBehalf form - Fix js bug
Coleman Watts [Fri, 2 May 2014 22:39:39 +0000 (15:39 -0700)]
Contribution onBehalf form - Fix js bug

10 years agocode cleanup
Coleman Watts [Fri, 2 May 2014 22:29:54 +0000 (15:29 -0700)]
code cleanup

10 years agoUpdate for Ginkgo Street Labs.
Frank J. Gómez [Fri, 2 May 2014 22:15:49 +0000 (15:15 -0700)]
Update for Ginkgo Street Labs.

10 years agoMerge pull request #3111 from mlutfy/4.4-crm13068-b
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

10 years agoCRM-13068: better document native gettext in the civicrm.settings.php.template.
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.

10 years agoCRM-13068: load .mo files from l10n/xx_XX/LC_MESSAGES/civicrm.mo
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.

10 years agoContribution Pages - Improve related employer autofill
Coleman Watts [Thu, 1 May 2014 19:39:28 +0000 (12:39 -0700)]
Contribution Pages - Improve related employer autofill