Donald A. Lobo [Wed, 6 Nov 2013 21:23:37 +0000 (13:23 -0800)]
CRM-13715 - Add custom field column to Contribution Details report crashes
http://issues.civicrm.org/jira/browse/CRM-13715
Kurund Jalmi [Wed, 6 Nov 2013 11:32:50 +0000 (03:32 -0800)]
Merge pull request #1914 from pratik-joshi/CRM-13698-fix
CRM-13698-fix
Pratik Joshi [Wed, 6 Nov 2013 08:12:27 +0000 (13:42 +0530)]
CRM-13698-fix
----------------------------------------
* CRM-13698-fix:
http://issues.civicrm.org/jira/browse/CRM-13698-fix
Kurund Jalmi [Wed, 6 Nov 2013 07:36:06 +0000 (23:36 -0800)]
Merge pull request #1911 from totten/4.4-optiongroup-warnings
CRM_Admin_*_OptionValue - Fix warnings
Kurund Jalmi [Wed, 6 Nov 2013 07:33:22 +0000 (23:33 -0800)]
Merge pull request #1896 from pratik-joshi/CRM-13684
CRM-13684 fix
colemanw [Wed, 6 Nov 2013 03:19:13 +0000 (19:19 -0800)]
Merge pull request #1912 from colemanw/4.4
Locale Settings - Use CRM.alert instead of window.alert
Coleman Watts [Wed, 6 Nov 2013 03:17:15 +0000 (19:17 -0800)]
Locale Settings - Use CRM.alert instead of window.alert
Tim Otten [Wed, 6 Nov 2013 01:57:52 +0000 (17:57 -0800)]
CRM_Admin_*_OptionValue - Fix warnings
colemanw [Wed, 6 Nov 2013 00:39:51 +0000 (16:39 -0800)]
Merge pull request #1910 from colemanw/4.4
CRM-13705 - Add defaultContactCountry setting metadata
Coleman Watts [Wed, 6 Nov 2013 00:38:39 +0000 (16:38 -0800)]
CRM-13705 - Add defaultContactCountry setting metadata
Dave Greenberg [Tue, 5 Nov 2013 21:14:16 +0000 (13:14 -0800)]
Merge pull request #1907 from davecivicrm/fixGenerated
Rebuild generated to fix missing elements.
Dave Greenberg [Tue, 5 Nov 2013 21:13:22 +0000 (13:13 -0800)]
Rebuild generated to fix missing elements.
dlobo [Tue, 5 Nov 2013 17:58:44 +0000 (09:58 -0800)]
Merge pull request #1906 from dlobo/CRM-13704
CRM-13704 - Fatal error prevents deletion of options from custom fields
Donald A. Lobo [Tue, 5 Nov 2013 17:57:10 +0000 (09:57 -0800)]
CRM-13704 - Fatal error prevents deletion of options from custom fields
http://issues.civicrm.org/jira/browse/CRM-13704
dlobo [Tue, 5 Nov 2013 15:06:18 +0000 (07:06 -0800)]
Merge pull request #1897 from davecivicrm/CRM-13696
CRM-13696 - Add missing </div> and fix tab indent to 2 spaces standard.
dlobo [Tue, 5 Nov 2013 15:05:49 +0000 (07:05 -0800)]
Merge pull request #1902 from lcdservices/CRM-13703
CRM-13703 force column rebuild during upgrade
dlobo [Tue, 5 Nov 2013 15:04:38 +0000 (07:04 -0800)]
Merge pull request #1901 from lcdservices/CRM-13702
CRM-13702 specify log table
dlobo [Tue, 5 Nov 2013 15:03:27 +0000 (07:03 -0800)]
Merge pull request #1905 from dlobo/CRM-13644
CRM-13644 - Revert changes made for this issue since it requires a more complete fix.
Donald A. Lobo [Tue, 5 Nov 2013 14:59:43 +0000 (06:59 -0800)]
CRM-13644 - Revert changes made for this issue since it requires a more complete fix
----------------------------------------
* CRM-13644: ACL does not protect mailing groups in civiMail in Joomla
http://issues.civicrm.org/jira/browse/CRM-13644
Pratik Joshi [Tue, 5 Nov 2013 06:42:53 +0000 (12:12 +0530)]
CRM-13684 : added webtest case which covers the fix
----------------------------------------
* CRM-13684: Profile Search using Country, State fails
http://issues.civicrm.org/jira/browse/CRM-13684
Brian Shaughnessy [Tue, 5 Nov 2013 05:17:09 +0000 (00:17 -0500)]
CRM-13703
Pratik Joshi [Mon, 4 Nov 2013 13:46:04 +0000 (19:16 +0530)]
CRM-13684 fix
----------------------------------------
* CRM-13684: Profile Search using
http://issues.civicrm.org/jira/browse/CRM-13684
Brian Shaughnessy [Tue, 5 Nov 2013 03:52:27 +0000 (22:52 -0500)]
CRM-13702 specify log table
colemanw [Tue, 5 Nov 2013 00:36:11 +0000 (16:36 -0800)]
Merge pull request #1900 from colemanw/CRM-13701
CRM-13701 - Date settings - fix config->timeInputFormat
Coleman Watts [Tue, 5 Nov 2013 00:28:11 +0000 (16:28 -0800)]
CRM-13701 - Date settings - fix config->timeInputFormat
dlobo [Tue, 5 Nov 2013 00:01:14 +0000 (16:01 -0800)]
Merge pull request #1899 from dlobo/CRM-13697
CRM-13697 - Avoid php warning
Donald A. Lobo [Tue, 5 Nov 2013 00:00:33 +0000 (16:00 -0800)]
CRM-13697 - Avoid php warning
http://issues.civicrm.org/jira/browse/CRM-13697
dlobo [Mon, 4 Nov 2013 23:57:44 +0000 (15:57 -0800)]
Merge pull request #1898 from dlobo/NoticeFixes
fix notices
Donald A. Lobo [Mon, 4 Nov 2013 23:56:42 +0000 (15:56 -0800)]
fix notices
Dave Greenberg [Mon, 4 Nov 2013 23:29:47 +0000 (15:29 -0800)]
CRM-13696 - Add missing </div> and fix tab indent to 2 spaces standard.
----------------------------------------
* CRM-13696: Tag listing in remove Tag action has an unclosed div
http://issues.civicrm.org/jira/browse/CRM-13696
dlobo [Mon, 4 Nov 2013 20:28:11 +0000 (12:28 -0800)]
Merge pull request #1891 from colemanw/css
CRM-12578 - Add option to disable civicrm.css
Kurund Jalmi [Mon, 4 Nov 2013 16:55:22 +0000 (08:55 -0800)]
Merge pull request #1894 from kurund/CRM-13692
CRM-13692, fixed sql break due to activity restructure for activity batch update via profile
Kurund Jalmi [Sun, 3 Nov 2013 17:57:26 +0000 (09:57 -0800)]
Merge pull request #1895 from kurund/regsite-module
fixes for regsite module
kurund [Sun, 3 Nov 2013 17:56:34 +0000 (23:26 +0530)]
fixes for regsite module
kurund [Sun, 3 Nov 2013 13:11:59 +0000 (18:41 +0530)]
removed source contact field from the list of the available profile fields, CRM-13692
----------------------------------------
* CRM-13692: Unknown column 'civicrm_activity.source_contact_id' when using Batch Profile Update for Activities
http://issues.civicrm.org/jira/browse/CRM-13692
kurund [Sun, 3 Nov 2013 12:46:48 +0000 (18:16 +0530)]
sql fixes CRM-13692
----------------------------------------
* CRM-13692: Unknown column 'civicrm_activity.source_contact_id' when using Batch Profile Update for Activities
http://issues.civicrm.org/jira/browse/CRM-13692
kurund [Sun, 3 Nov 2013 11:59:23 +0000 (17:29 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-11-03-17-29-16
colemanw [Fri, 1 Nov 2013 22:05:07 +0000 (15:05 -0700)]
Merge pull request #1886 from pratik-joshi/CRM-13681
CRM-13681 : fix for event registration as well as contribution, also consists fixes required in cases where we fetch 'billing' location type id with help of seearching 'Billing' (location type name)
Coleman Watts [Fri, 1 Nov 2013 18:43:30 +0000 (11:43 -0700)]
CRM-12578 - Upgrade - Preserve old css override behavior
Coleman Watts [Thu, 31 Oct 2013 22:34:31 +0000 (15:34 -0700)]
CRM-12578 - Template cleanup
Coleman Watts [Thu, 31 Oct 2013 22:29:53 +0000 (15:29 -0700)]
CRM-12578 - sql - run regen.sh
Coleman Watts [Thu, 31 Oct 2013 22:26:41 +0000 (15:26 -0700)]
CRM-12578 - Move setting from url to core to avoid url encoding. Fix naming of url settings.
Coleman Watts [Thu, 31 Oct 2013 20:50:20 +0000 (13:50 -0700)]
CRM-12578 - Add configuration to disable civicrm.css. Deprecate extras.css.
Coleman Watts [Fri, 1 Nov 2013 20:45:04 +0000 (13:45 -0700)]
CRM-13669 - Upgrade sql - Add literal tags
Kurund Jalmi [Fri, 1 Nov 2013 11:53:10 +0000 (04:53 -0700)]
Merge pull request #1889 from monishdeb/CRM-13689
Crm 13689 fix - Print Case Report button (from Manage Case) throws a set of fatal errors in WordPress, but NOT in Drupal
monishdeb [Fri, 1 Nov 2013 10:41:23 +0000 (16:11 +0530)]
CRM-13689 fix - Print Case Report button (from Manage Case) throws a set of fatal errors in WordPress, but NOT in Drupal
http://issues.civicrm.org/jira/browse/CRM-13689
Kurund Jalmi [Thu, 31 Oct 2013 16:56:31 +0000 (09:56 -0700)]
Merge pull request #1888 from davecivicrm/CRM-13669a
CRM-13669 rebuild generated.mysql w/ typo fix for option_value rows.
Dave Greenberg [Thu, 31 Oct 2013 16:05:54 +0000 (09:05 -0700)]
CRM-13669 rebuild generated.mysql w/ typo fix for option_value rows.
----------------------------------------
* CRM-13669: incorrect default holdname name greeting text
http://issues.civicrm.org/jira/browse/CRM-13669
dlobo [Thu, 31 Oct 2013 15:50:22 +0000 (08:50 -0700)]
Merge pull request #1887 from dlobo/FormattingFixes
fix formatting
Donald A. Lobo [Thu, 31 Oct 2013 15:48:17 +0000 (08:48 -0700)]
fix formatting
Kurund Jalmi [Thu, 31 Oct 2013 11:29:01 +0000 (04:29 -0700)]
Merge pull request #1885 from ar-jan/CRM-13687
CRM-13687: update email-system-configuration documentation urls
Kurund Jalmi [Thu, 31 Oct 2013 11:28:32 +0000 (04:28 -0700)]
Merge pull request #1884 from davecivicrm/CRM-13669
CRM-13669 fix typo in civicrm_option_value.name for postal and email gre...
Kurund Jalmi [Thu, 31 Oct 2013 11:26:13 +0000 (04:26 -0700)]
Merge pull request #1882 from totten/4.3-mgext-upg
CRM-13685 - "Manage Extensions" - Fix upgrade check
Arjan Mossel [Thu, 31 Oct 2013 10:34:19 +0000 (11:34 +0100)]
CRM-13687: update email-system-configuration documentation urls
Pratik Joshi [Thu, 31 Oct 2013 10:32:37 +0000 (16:02 +0530)]
CRM-13681 : fix for event registration as well as contribution, also consists fixes required in cases where we fetch 'billing' location type id with help of seearching 'Billing' (location type name)
----------------------------------------
* CRM-13681: Can't register to event, pseudo constant for locationtype translated now
http://issues.civicrm.org/jira/browse/CRM-13681
Dave Greenberg [Thu, 31 Oct 2013 05:42:42 +0000 (22:42 -0700)]
CRM-13669 fix typo in civicrm_option_value.name for postal and email greeting on households. Add fix to upgrade or 4.4.1.
----------------------------------------
* CRM-13669: incorrect default holdname name greeting text
http://issues.civicrm.org/jira/browse/CRM-13669
dlobo [Thu, 31 Oct 2013 01:03:07 +0000 (18:03 -0700)]
Merge pull request #1883 from colemanw/ids
CRM-12197 - Lobo pls review
Coleman Watts [Thu, 31 Oct 2013 00:28:26 +0000 (17:28 -0700)]
CRM-12197 change IDS upgrade msg
Tim Otten [Thu, 31 Oct 2013 00:11:10 +0000 (17:11 -0700)]
CRM-13685 - "Manage Extensions" - Fix upgrade check
----------------------------------------
* CRM-13685: "Manage Extension" screen should use "<" to determine upgradeability
http://issues.civicrm.org/jira/browse/CRM-13685
deepak-srivastava [Wed, 30 Oct 2013 12:59:32 +0000 (05:59 -0700)]
Merge pull request #1879 from ravishnair/CRM-13467QA
-- CRM-13467 QA fixes
Ravish Nair [Wed, 30 Oct 2013 11:43:24 +0000 (17:13 +0530)]
-- CRM-13467 QA fixes
dlobo [Wed, 30 Oct 2013 02:54:45 +0000 (19:54 -0700)]
Merge pull request #1875 from mlutfy/crm13354
CRM-13354: Fix support for locale detection from the domain (in Drupal), when the site is in a sub-directory (base_path() returns the subdirectory).
dlobo [Wed, 30 Oct 2013 02:53:33 +0000 (19:53 -0700)]
Merge pull request #1878 from eileenmcnaughton/4.4
CRM-13675 sort pdfs by sort criteria (closes)
Eileen [Wed, 30 Oct 2013 01:04:24 +0000 (14:04 +1300)]
CRM-13675 sort pdfs by sort name
----------------------------------------
* CRM-13675: Membership activities are unsorted - which is confusing on pdf letters
http://issues.civicrm.org/jira/browse/CRM-13675
dlobo [Wed, 30 Oct 2013 00:03:39 +0000 (17:03 -0700)]
Merge pull request #1877 from colemanw/smarty
CRM-13674 - CRM_Core_* - Add smarty functions
Coleman Watts [Tue, 29 Oct 2013 21:55:22 +0000 (14:55 -0700)]
CRM-13674 - CRM_Core_* - Add smarty functions
colemanw [Tue, 29 Oct 2013 20:28:00 +0000 (13:28 -0700)]
Merge pull request #1876 from colemanw/4.4
CRM-13673 - Activity.tpl - Make swap assignee/target button less obtrusive
Coleman Watts [Tue, 29 Oct 2013 20:26:47 +0000 (13:26 -0700)]
CRM-13673 - Activity.tpl - Make swap assignee/target button less obtrusive
Mathieu Lutfy [Tue, 29 Oct 2013 19:48:15 +0000 (15:48 -0400)]
CRM-13354: Fix support for locale detection from the domain (in Drupal), when the site is in a sub-directory (base_path() returns the subdirectory).
dlobo [Tue, 29 Oct 2013 19:46:32 +0000 (12:46 -0700)]
Merge pull request #1874 from dlobo/CRM-13668
CRM-13668 - membership based tokens are inappropriately applying a return limit
Donald A. Lobo [Tue, 29 Oct 2013 19:45:08 +0000 (12:45 -0700)]
CRM-13668 - membership based tokens are inappropriately applying a return limit
http://issues.civicrm.org/jira/browse/CRM-13668
Kurund Jalmi [Tue, 29 Oct 2013 19:13:48 +0000 (12:13 -0700)]
Merge pull request #1871 from pratik-joshi/CRM-13667
CRM-13667
Pratik Joshi [Tue, 29 Oct 2013 15:05:42 +0000 (20:35 +0530)]
CRM-13667
----------------------------------------
* CRM-13667: WP Sync Users Error
http://issues.civicrm.org/jira/browse/CRM-13667
Kurund Jalmi [Tue, 29 Oct 2013 14:06:06 +0000 (07:06 -0700)]
Merge pull request #1870 from ravishnair/CRM-13220
-- CRM-13220 fix for joomla
Ravish Nair [Tue, 29 Oct 2013 13:52:16 +0000 (19:22 +0530)]
-- CRM-13220 fix for joomla
Kurund Jalmi [Tue, 29 Oct 2013 06:10:18 +0000 (23:10 -0700)]
Merge pull request #1868 from dlobo/CRM-13665
CRM-13665 - Make upgrade fault tolerant for merging activity contacts
Donald A. Lobo [Mon, 28 Oct 2013 22:33:43 +0000 (15:33 -0700)]
CRM-13665 - Make upgrade fault tolerant for merging activity contacts
http://issues.civicrm.org/jira/browse/CRM-13665
colemanw [Mon, 28 Oct 2013 20:52:06 +0000 (13:52 -0700)]
Merge pull request #1867 from fjg-conflux/CRM-13662
CRM-13662
Frank J. Gómez [Mon, 28 Oct 2013 20:48:35 +0000 (16:48 -0400)]
CRM-13662 - Add classes to user dashboard elements.
----------------------------------------
* CRM-13662: Add CSS selectors to dashboard elements
http://issues.civicrm.org/jira/browse/CRM-13662
Frank J. Gómez [Mon, 28 Oct 2013 20:15:17 +0000 (16:15 -0400)]
Whitespace changes only.
Coleman Watts [Mon, 28 Oct 2013 18:32:30 +0000 (11:32 -0700)]
js - add comments for CRM.formatMoney
colemanw [Mon, 28 Oct 2013 17:59:49 +0000 (10:59 -0700)]
Merge pull request #1866 from colemanw/4.4
CRM-13660 - Core Resources - Fix init of CRM.formatMoney
Coleman Watts [Mon, 28 Oct 2013 17:52:37 +0000 (10:52 -0700)]
CRM-13660 - Core Resources - Fix init of CRM.formatMoney
kurund [Mon, 28 Oct 2013 09:24:25 +0000 (14:54 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-28-14-52-15
Conflicts:
templates/CRM/common/SocialNetwork.tpl
Kurund Jalmi [Mon, 28 Oct 2013 09:11:36 +0000 (02:11 -0700)]
Merge pull request #1859 from totten/4.4-wordrep-key
CRM-13655 - civicrm_word_replacement schema fixes
Kurund Jalmi [Mon, 28 Oct 2013 09:10:28 +0000 (02:10 -0700)]
Merge pull request #1862 from pratik-joshi/CRM-13649
CRM-13649 : applied patch
Kurund Jalmi [Mon, 28 Oct 2013 09:09:58 +0000 (02:09 -0700)]
Merge pull request #1864 from ravishnair/CRM-13658
-- CRM-13658 fix
deepak-srivastava [Mon, 28 Oct 2013 08:57:47 +0000 (01:57 -0700)]
Merge pull request #1865 from deepak-srivastava/act-report
CRM-13467 - join with address, and other tables only when required
Ravish Nair [Mon, 28 Oct 2013 08:57:06 +0000 (14:27 +0530)]
-- CRM-13658 fix
Deepak Srivastava [Mon, 28 Oct 2013 08:54:47 +0000 (14:24 +0530)]
CRM-13467 - join with address, and other tables only when required
Kurund Jalmi [Mon, 28 Oct 2013 07:30:00 +0000 (00:30 -0700)]
Merge pull request #1863 from pratik-joshi/CRM-13657
CRM-13657
Pratik Joshi [Mon, 28 Oct 2013 07:21:27 +0000 (12:51 +0530)]
CRM-13657 : more code improvement needed to be done
----------------------------------------
* CRM-13657: Fatal error when accessing civicase
http://issues.civicrm.org/jira/browse/CRM-13657
Pratik Joshi [Mon, 28 Oct 2013 06:52:35 +0000 (12:22 +0530)]
CRM-13657 : code improvement
----------------------------------------
* CRM-13657: Fatal error when accessing civicase
http://issues.civicrm.org/jira/browse/CRM-13657
Pratik Joshi [Mon, 28 Oct 2013 05:23:07 +0000 (10:53 +0530)]
CRM-13649 : applied patch
----------------------------------------
* CRM-13649: Class 'CiviCRM_Exception' not found
http://issues.civicrm.org/jira/browse/CRM-13649
dlobo [Sun, 27 Oct 2013 21:34:46 +0000 (14:34 -0700)]
Merge pull request #1860 from deepak-srivastava/act-report
CRM-13467
Tim Otten [Sun, 27 Oct 2013 18:36:00 +0000 (11:36 -0700)]
Merge pull request #1861 from totten/4.3-setting-warning
CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting
Deepak Srivastava [Thu, 17 Oct 2013 07:51:34 +0000 (13:21 +0530)]
CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such table civicrm_setting
Deepak Srivastava [Sun, 27 Oct 2013 16:18:18 +0000 (21:48 +0530)]
CRM-13467 - cleanup, order-by fixes
Tim Otten [Sun, 27 Oct 2013 16:05:40 +0000 (09:05 -0700)]
CRM-13655 - Upgrade/.../FourFour.php - Setup correct schema for civicrm_word_replacement (4.4.0 => 4.4.1)
----------------------------------------
* CRM-13655: WordReplacement - Uniqueness key should allow different cases and domains
http://issues.civicrm.org/jira/browse/CRM-13655
Tim Otten [Sun, 27 Oct 2013 15:06:04 +0000 (08:06 -0700)]
CRM-13655 - Upgrade/.../FourFour.php - Setup correct schema for civicrm_word_replacement (4.3.x => 4.4.1)
----------------------------------------
* CRM-13655: WordReplacement - Uniqueness key should allow different cases and domains
http://issues.civicrm.org/jira/browse/CRM-13655
projects / civicrm-core.git / log