atif-shaikh [Tue, 24 Jun 2014 15:16:24 +0000 (20:46 +0530)]
Further Changes
atif-shaikh [Tue, 24 Jun 2014 15:08:39 +0000 (20:38 +0530)]
Additional notice fixes and comments
atif-shaikh [Tue, 24 Jun 2014 14:36:31 +0000 (20:06 +0530)]
CRM-14782 fix
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 & ...
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...
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
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
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.
Tim Otten [Tue, 24 Jun 2014 02:59:06 +0000 (19:59 -0700)]
CRM-14856 - Fix regression with Drupal-Profile integration
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
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
Eileen McNaughton [Tue, 24 Jun 2014 01:44:28 +0000 (13:44 +1200)]
CRM-14903 fix REGEX to RLIKE
Tim Otten [Tue, 24 Jun 2014 01:23:01 +0000 (18:23 -0700)]
Merge pull request #3540 from totten/4.4-distmaker
distmaker cleanup
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...
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
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
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
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)
totten@civicrm.org [Sat, 21 Jun 2014 12:31:20 +0000 (05:31 -0700)]
distmaker - Demindfuckify joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 12:05:11 +0000 (05:05 -0700)]
distmaker - Reduce noise in joomla_php5.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:58:14 +0000 (04:58 -0700)]
distmaker - Extract function dm_reset_dirs(). Reduce noise.
totten@civicrm.org [Sat, 21 Jun 2014 11:46:55 +0000 (04:46 -0700)]
distmaker - Simplify l10n.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
totten@civicrm.org [Sat, 21 Jun 2014 11:36:29 +0000 (04:36 -0700)]
distmaker - Extract function dm_install_wordpress()
totten@civicrm.org [Sat, 21 Jun 2014 11:25:17 +0000 (04:25 -0700)]
distmaker - Reduce noise in dists/*.sh
totten@civicrm.org [Sat, 21 Jun 2014 11:15:00 +0000 (04:15 -0700)]
distmaker - Remove dead code. Shift comments.
totten@civicrm.org [Sat, 21 Jun 2014 11:10:55 +0000 (04:10 -0700)]
distmaker - Extract function dm_install_l10n()
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