deepak-srivastava [Wed, 6 Nov 2013 08:06:50 +0000 (00:06 -0800)]
Merge pull request #1881 from agh1/pagebreak-reports
CRM-13682 option for page breaks before report section headers
dlobo [Tue, 5 Nov 2013 23:40:11 +0000 (15:40 -0800)]
Merge pull request #1909 from kenwest/CRM-13690-unittest
CRM-13690 added unit test for html2text and token
Ken West [Tue, 5 Nov 2013 23:30:20 +0000 (10:30 +1100)]
CRM-13690 added unit test for html2text and token
Kurund Jalmi [Mon, 4 Nov 2013 11:27:32 +0000 (03:27 -0800)]
Merge pull request #1890 from NileemaJadhav/CRM-HR-211
--HR-211 Change in Ajax function for organization search on sub types And Modification to webtest to add subtype while creating organization contact
Kurund Jalmi [Mon, 4 Nov 2013 11:26:42 +0000 (03:26 -0800)]
Merge pull request #1892 from kenwest/CRM-13690
CRM-13690 - CiviMail - prevent html2text treating mailing tokens as relative URLs
kurund [Sun, 3 Nov 2013 12:02:33 +0000 (17:32 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-11-03-17-31-47
Conflicts:
sql/civicrm_generated.mysql
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
dlobo [Sun, 3 Nov 2013 01:41:25 +0000 (18:41 -0700)]
Merge pull request #1893 from kenwest/Topic-30462
Forum topic 30462 - cli - set $_SERVER['HTTP_HOST'] from CIVICRM_UF_BASEURL
Ken West [Sat, 2 Nov 2013 10:30:38 +0000 (21:30 +1100)]
Forum topic 30462 - set $_SERVER['HTTP_HOST'] from CIVICRM_UF_BASEURL
Ken West [Sat, 2 Nov 2013 09:06:47 +0000 (20:06 +1100)]
CRM-13690 - prevent html2text treating mailing tokens as relative URLs
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 20:45:04 +0000 (13:45 -0700)]
CRM-13669 - Upgrade sql - Add literal tags
Nileema [Fri, 1 Nov 2013 13:06:17 +0000 (18:36 +0530)]
--HR-211 Change in Ajax function for organization search on sub types And Modification to webtest to add subtype while creating organization contact
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
Andrew Hunt [Wed, 30 Oct 2013 22:17:48 +0000 (18:17 -0400)]
minor goof of checkbox id
Andrew Hunt [Wed, 30 Oct 2013 22:10:26 +0000 (18:10 -0400)]
disable page break box if section header not checked
Andrew Hunt [Wed, 30 Oct 2013 17:08:30 +0000 (13:08 -0400)]
option for page breaks before report section headers
dlobo [Wed, 30 Oct 2013 15:39:38 +0000 (08:39 -0700)]
Merge pull request #1880 from dlobo/CRM-13434
CRM-13434 - use empty instead of Array::value
Donald A. Lobo [Wed, 30 Oct 2013 15:38:48 +0000 (08:38 -0700)]
CRM-13434 - use empty instead of Array::value
----------------------------------------
* CRM-13434: Send more through hook_civicrm_links
http://issues.civicrm.org/jira/browse/CRM-13434
dlobo [Wed, 30 Oct 2013 15:32:53 +0000 (08:32 -0700)]
Merge pull request #1873 from agh1/hook-civicrm-links-full
CRM-13434 make create.new.shorcuts work for name or title
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
Andrew Hunt [Tue, 29 Oct 2013 16:28:18 +0000 (12:28 -0400)]
make create.new.shorcuts work for name or title
Tim Otten [Tue, 29 Oct 2013 16:17:41 +0000 (09:17 -0700)]
Merge pull request #1872 from totten/master-hooktest-fix
CRM_Utils_HookTest - Fix regression due to new runHooks() signature
Tim Otten [Tue, 29 Oct 2013 16:16:18 +0000 (09:16 -0700)]
CRM_Utils_HookTest - Fix regression due to new runHooks() signature
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:38:27 +0000 (15:08 +0530)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2013-10-28-15-02-34
Conflicts:
CRM/Admin/Form/ScheduleReminders.php
sql/civicrm_generated.mysql
xml/version.xml
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 23:59:52 +0000 (16:59 -0700)]
Merge pull request #1851 from agh1/hook-civicrm-links-full
CRM-13434 Send more through hook_civicrm_links
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
Tim Otten [Sun, 27 Oct 2013 14:54:36 +0000 (07:54 -0700)]
CRM-13655 - WordReplacement.xml - Update UNIQUE key for new installations
----------------------------------------
* 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 14:44:00 +0000 (07:44 -0700)]
CRM-13655 - GenCode - Allow overriding COLLATE for specific columns
----------------------------------------
* CRM-13655: WordReplacement - Uniqueness key should allow different cases and domains
http://issues.civicrm.org/jira/browse/CRM-13655
dlobo [Sat, 26 Oct 2013 21:26:43 +0000 (14:26 -0700)]
Merge pull request #1838 from eileenmcnaughton/CRM-13600
CRM-13600 CiviMail form - allow CiviMails from advanced search for users...
dlobo [Fri, 25 Oct 2013 20:01:47 +0000 (13:01 -0700)]
Merge pull request #1858 from dlobo/CRM-13648
CRM-13648 - Mailing BAO typo
Donald A. Lobo [Fri, 25 Oct 2013 20:00:25 +0000 (13:00 -0700)]
CRM-13648 - Mailing BAO typo
http://issues.civicrm.org/jira/browse/CRM-13648
dlobo [Fri, 25 Oct 2013 19:59:10 +0000 (12:59 -0700)]
Merge pull request #1857 from lcdservices/CRM-13648
CRM-13648 mailing BAO typo
Brian Shaughnessy [Fri, 25 Oct 2013 19:00:01 +0000 (15:00 -0400)]
CRM-13648 mailing BAO typo
dlobo [Fri, 25 Oct 2013 16:18:43 +0000 (09:18 -0700)]
Merge pull request #1856 from dlobo/NoticeFixe
Fix notice reported via forums
Donald A. Lobo [Fri, 25 Oct 2013 16:17:56 +0000 (09:17 -0700)]
Fix notice reported via forums
Kurund Jalmi [Fri, 25 Oct 2013 15:08:40 +0000 (08:08 -0700)]
Merge pull request #1855 from ravishnair/badgeUpgradeFix
CRM-13327 handled upgrade for missing name badge formats
Deepak Srivastava [Fri, 25 Oct 2013 14:11:10 +0000 (19:41 +0530)]
CRM-13467 - generalizing select-clause building and appending temp table
Ravish Nair [Fri, 25 Oct 2013 11:37:32 +0000 (17:07 +0530)]
-- CRM-13327 handled upgrade
Kurund Jalmi [Fri, 25 Oct 2013 06:36:24 +0000 (23:36 -0700)]
Merge pull request #1847 from eileenmcnaughton/CRM-9683
CRM-9683 - add timezone functions (doesn't close) , CRM-13593 minore api fix (closes)
Kurund Jalmi [Fri, 25 Oct 2013 06:32:45 +0000 (23:32 -0700)]
Merge pull request #1848 from monishdeb/CRM-13625
CRM-13625 : Ommit urlencode modifier to escape:'url' to fix CRM tests
Kurund Jalmi [Fri, 25 Oct 2013 06:32:11 +0000 (23:32 -0700)]
Merge pull request #1850 from pratik-joshi/HR-201_core_changes
HR-201 : core changes for this issue (introduction of new url argument ctype for case type menu items in hrcase extension)
Kurund Jalmi [Fri, 25 Oct 2013 06:30:10 +0000 (23:30 -0700)]
Merge pull request #1852 from dlobo/CRM-13644
CRM-13644 - make the acl code common across all 3 CMS. Keep DrupalBase as an empty class shell
Kurund Jalmi [Fri, 25 Oct 2013 06:29:21 +0000 (23:29 -0700)]
Merge pull request #1853 from totten/4.4-upgrade-warning
CRM_Core_DAO - Fix static warning that appears during upgrade
Kurund Jalmi [Fri, 25 Oct 2013 06:28:39 +0000 (23:28 -0700)]
Merge pull request #1854 from kurund/CRM-13327
CRM-13327, event badge fixes
Tim Otten [Thu, 24 Oct 2013 23:14:01 +0000 (16:14 -0700)]
CRM_Core_DAO - Fix static warning that appears during upgrade
dlobo [Thu, 24 Oct 2013 21:43:30 +0000 (14:43 -0700)]
Merge pull request #1849 from pratik-joshi/CRM-13638
CRM-13638 : verified and applied patch, just a minor modification done
projects / civicrm-core.git / log