civicrm-core.git
10 years agoMerge pull request #3633 from eileenmcnaughton/CRM-14967
Kurund Jalmi [Mon, 14 Jul 2014 10:00:20 +0000 (15:30 +0530)]
Merge pull request #3633 from eileenmcnaughton/CRM-14967

CRM-14967 fix redirect link

10 years agoMerge pull request #3635 from eileenmcnaughton/4.4-tests
Eileen McNaughton [Thu, 10 Jul 2014 01:15:04 +0000 (13:15 +1200)]
Merge pull request #3635 from eileenmcnaughton/4.4-tests

revert minor data change in test suite

10 years agorevert minor data change in test suite
Eileen McNaughton [Thu, 10 Jul 2014 01:14:58 +0000 (13:14 +1200)]
revert minor data change in test suite

10 years agoMerge pull request #3634 from eileenmcnaughton/4.4-tests
Eileen McNaughton [Thu, 10 Jul 2014 01:06:33 +0000 (13:06 +1200)]
Merge pull request #3634 from eileenmcnaughton/4.4-tests

fix in test suite - mistype

10 years agofix in test suite - mistype
Eileen McNaughton [Thu, 10 Jul 2014 01:05:44 +0000 (13:05 +1200)]
fix in test suite - mistype

10 years agoCRM-14967 fix redirect link
Eileen McNaughton [Wed, 9 Jul 2014 23:23:42 +0000 (11:23 +1200)]
CRM-14967 fix redirect link

10 years agoMerge pull request #3623 from monishdeb/CRM-14758-44-fixes
Eileen McNaughton [Wed, 9 Jul 2014 20:44:11 +0000 (08:44 +1200)]
Merge pull request #3623 from monishdeb/CRM-14758-44-fixes

CRM-14758 fixes for 4.4

10 years agoTest fixes
monishdeb [Wed, 9 Jul 2014 09:54:36 +0000 (15:24 +0530)]
Test fixes

10 years agoCRM-14758 fixes for 4.4
monishdeb [Tue, 8 Jul 2014 20:20:29 +0000 (01:50 +0530)]
CRM-14758 fixes for 4.4

----------------------------------------
* CRM-14758: API ( contact, create ) does not always create related membership
  https://issues.civicrm.org/jira/browse/CRM-14758

10 years agoMerge pull request #3615 from jmcclelland/prev-next-page-10
Kurund Jalmi [Mon, 7 Jul 2014 15:45:06 +0000 (21:15 +0530)]
Merge pull request #3615 from jmcclelland/prev-next-page-10

CRM-14939 - ensure proper pagination of search results past page 10.

10 years agoCRM-14939 - ensure proper pagination of search results past page 10.
Jamie McClelland [Mon, 7 Jul 2014 15:00:30 +0000 (11:00 -0400)]
CRM-14939 - ensure proper pagination of search results past page 10.

----------------------------------------
* CRM-14939: unpredictable behavior with pagination of search results with duplicates
  https://issues.civicrm.org/jira/browse/CRM-14939

10 years agoMerge pull request #3610 from kurund/CRM-14782
Kurund Jalmi [Sat, 5 Jul 2014 14:51:05 +0000 (20:21 +0530)]
Merge pull request #3610 from kurund/CRM-14782

notice fixes, CRM-14782

10 years agonotice fixes, CRM-14782
kurund [Sat, 5 Jul 2014 14:50:20 +0000 (20:20 +0530)]
notice fixes, CRM-14782

----------------------------------------
* CRM-14782: unable to import 0/no/false values
  https://issues.civicrm.org/jira/browse/CRM-14782

10 years agoMerge pull request #3605 from monishdeb/CRM-14505
Dave Greenberg [Thu, 3 Jul 2014 17:58:10 +0000 (10:58 -0700)]
Merge pull request #3605 from monishdeb/CRM-14505

CRM-14505 fix - CiviCRM api contact dedupe check wrong rule type

10 years agoMerge pull request #3604 from monishdeb/CRM-14913
Dave Greenberg [Thu, 3 Jul 2014 17:19:09 +0000 (10:19 -0700)]
Merge pull request #3604 from monishdeb/CRM-14913

CRM-14913 fix - merging contacts does not change contact_id in financial...

10 years agoCRM-14505 fix - CiviCRM api contact dedupe check wrong rule type
monishdeb [Thu, 3 Jul 2014 16:40:50 +0000 (22:10 +0530)]
CRM-14505 fix - CiviCRM api contact dedupe check wrong rule type

https://issues.civicrm.org/jira/browse/CRM-14505

10 years agoCRM-14913 fix - merging contacts does not change contact_id in financial_item table.
monishdeb [Thu, 3 Jul 2014 16:13:05 +0000 (21:43 +0530)]
CRM-14913 fix - merging contacts does not change contact_id in financial_item table.

https://issues.civicrm.org/jira/browse/CRM-14913

10 years agoMerge pull request #3594 from civicrm/4.4.6.x
Tim Otten [Wed, 2 Jul 2014 07:13:39 +0000 (00:13 -0700)]
Merge pull request #3594 from civicrm/4.4.6.x

Merge forward (4.4.6.x => 4.4)

10 years agoUpdate version to 4.4.7
CiviCRM [Wed, 2 Jul 2014 07:12:58 +0000 (00:12 -0700)]
Update version to 4.4.7

10 years agoMerge pull request #3558 from atif-shaikh/CRM-14782-fix
Kurund Jalmi [Tue, 1 Jul 2014 11:38:47 +0000 (17:08 +0530)]
Merge pull request #3558 from atif-shaikh/CRM-14782-fix

CRM-14782 fix

10 years agoMerge pull request #3580 from monishdeb/CRM-14701
Dave Greenberg [Sat, 28 Jun 2014 22:54:48 +0000 (15:54 -0700)]
Merge pull request #3580 from monishdeb/CRM-14701

CRM-14701 QA fix

10 years agominor fix
monishdeb [Sat, 28 Jun 2014 19:41:34 +0000 (01:11 +0530)]
minor fix

10 years agoCRM-14701 fixes - Form data not retained subsequent to contribution page on behalf...
monishdeb [Sat, 28 Jun 2014 19:30:04 +0000 (01:00 +0530)]
CRM-14701 fixes - Form data not retained subsequent to contribution page on behalf of fix

https://issues.civicrm.org/jira/browse/CRM-14701

10 years agoCRM-14701 QA fix
monishdeb [Fri, 27 Jun 2014 17:21:48 +0000 (22:51 +0530)]
CRM-14701 QA fix

----------------------------------------
* CRM-14701: Form data not retained subsequent to contribution page on behalf of fix
  https://issues.civicrm.org/jira/browse/CRM-14701

10 years agoAdditional QA Fixes
atif-shaikh [Thu, 26 Jun 2014 15:12:31 +0000 (20:42 +0530)]
Additional QA Fixes

10 years agoQA fixes
atif-shaikh [Wed, 25 Jun 2014 16:06:42 +0000 (21:36 +0530)]
QA fixes

10 years agoFurther Changes
atif-shaikh [Tue, 24 Jun 2014 15:16:24 +0000 (20:46 +0530)]
Further Changes

10 years agoAdditional notice fixes and comments
atif-shaikh [Tue, 24 Jun 2014 15:08:39 +0000 (20:38 +0530)]
Additional notice fixes and comments

10 years agoCRM-14782 fix
atif-shaikh [Tue, 24 Jun 2014 14:36:31 +0000 (20:06 +0530)]
CRM-14782 fix

10 years agoMerge pull request #3554 from eileenmcnaughton/4.4
Dave Greenberg [Wed, 25 Jun 2014 21:11:30 +0000 (14:11 -0700)]
Merge pull request #3554 from eileenmcnaughton/4.4

CRM-14900 use INSERT ignore for states - this is primarily about copy & ...

10 years agoMerge pull request #3559 from davecivicrm/CRM-14908
Dave Greenberg [Tue, 24 Jun 2014 17:58:07 +0000 (10:58 -0700)]
Merge pull request #3559 from davecivicrm/CRM-14908

CRM-14908 - Do not hide payment options just because a $0 price option i...

10 years agoCRM-14908 - Do not hide payment options just because a $0 price option is selected...
Dave Greenberg [Tue, 24 Jun 2014 17:56:49 +0000 (10:56 -0700)]
CRM-14908 - Do not hide payment options just because a $0 price option is selected if total is != $0.

----------------------------------------
* CRM-14908:
  https://issues.civicrm.org/jira/browse/CRM-14908

10 years agoMerge pull request #3555 from totten/4.4-14856-regr
Tim Otten [Tue, 24 Jun 2014 03:35:44 +0000 (20:35 -0700)]
Merge pull request #3555 from totten/4.4-14856-regr

CRM-14856 - Fix regressions in Drupal-Profile integration

10 years agoCRM-14856 - CRM_Profile_Form - Restore behavior of add_to_group_id when there are...
Tim Otten [Tue, 24 Jun 2014 03:14:09 +0000 (20:14 -0700)]
CRM-14856 - CRM_Profile_Form - Restore behavior of add_to_group_id when there are multiple profiles

The behavior is to scan a combined list of UFFields, see if each UFField's
parent UFGroup has "add_to_group", and use it if found.  If multiple
UFGroups define "add_to_group", then the value of the last UFField wins.

I don't see this as good behavior -- just compatible behavior.

10 years agoCRM-14856 - Fix regression with Drupal-Profile integration
Tim Otten [Tue, 24 Jun 2014 02:59:06 +0000 (19:59 -0700)]
CRM-14856 - Fix regression with Drupal-Profile integration

10 years agoCRM-14900 use INSERT ignore for states - this is primarily about copy & paste protection
Eileen McNaughton [Tue, 24 Jun 2014 02:20:12 +0000 (14:20 +1200)]
CRM-14900 use INSERT ignore for states - this is primarily about copy & paste protection

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