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...
Arjan Mossel [Thu, 31 Oct 2013 10:34:19 +0000 (11:34 +0100)]
CRM-13687: update email-system-configuration documentation urls
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
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
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 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
Donald A. Lobo [Thu, 24 Oct 2013 21:40:47 +0000 (14:40 -0700)]
CRM-13644 - make the acl code common across all 3 CMS. Keep DrupalBase as an empty class shell
----------------------------------------
* CRM-13644: ACL does not protect mailing groups in civiMail in Joomla
http://issues.civicrm.org/jira/browse/CRM-13644
kurund [Thu, 24 Oct 2013 15:39:57 +0000 (21:09 +0530)]
fixed generated data, CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
kurund [Thu, 24 Oct 2013 15:23:19 +0000 (20:53 +0530)]
fixed name badge settings, CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
kurund [Thu, 24 Oct 2013 15:14:30 +0000 (20:44 +0530)]
fixes for barcode display CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
kurund [Thu, 24 Oct 2013 15:09:20 +0000 (20:39 +0530)]
fixes for qrcode display CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
Pratik Joshi [Thu, 24 Oct 2013 10:14:47 +0000 (15:44 +0530)]
HR-201 : core changes for this issue (introduction of new url argument ctype for case type menu items in hrcase extension)
kurund [Thu, 24 Oct 2013 09:15:39 +0000 (14:45 +0530)]
code cleanup CRM-13327
----------------------------------------
* CRM-13327: Add support for 3 additional event badge formats AND remove Name Badge labels from Label Formats admin
http://issues.civicrm.org/jira/browse/CRM-13327
Pratik Joshi [Thu, 24 Oct 2013 08:31:09 +0000 (14:01 +0530)]
CRM-13638 : verified and applied patch, just a minor modification done
----------------------------------------
* CRM-13638: Saving an Activity record from Search causes "With Contact" field value to be deleted
http://issues.civicrm.org/jira/browse/CRM-13638
monishdeb [Thu, 24 Oct 2013 08:29:04 +0000 (13:59 +0530)]
Ommit urlencode modifier to escape:'url' to fix CRM tests
Eileen [Thu, 24 Oct 2013 07:13:27 +0000 (20:13 +1300)]
CRM-13593 api chaining - fix mulitple entity chainging
----------------------------------------
* CRM-13593: chaining multiple object with the API is broken
http://issues.civicrm.org/jira/browse/CRM-13593
Eileen [Thu, 24 Oct 2013 07:04:25 +0000 (20:04 +1300)]
CRM-9683 add functions to set timezone in mysql based on UF, note that this is not currently called but anticipate it will be called from the drupal integration code (civicrm_initialize)
----------------------------------------
* CRM-9683: Implement timezone support for CiviMail
http://issues.civicrm.org/jira/browse/CRM-9683
CiviCRM [Wed, 23 Oct 2013 21:22:00 +0000 (14:22 -0700)]
Update version to 4.4.1
Coleman Watts [Wed, 23 Oct 2013 20:47:32 +0000 (13:47 -0700)]
Update version to 4.4.0
colemanw [Wed, 23 Oct 2013 20:44:04 +0000 (13:44 -0700)]
CRM-13625 - Revert commit due to failing tests
colemanw [Wed, 23 Oct 2013 20:04:36 +0000 (13:04 -0700)]
API - Utils.php - Fix accidental deletion during merge
Line was deleted accidentally in
13c1cf9
Dave Greenberg [Wed, 23 Oct 2013 19:58:54 +0000 (12:58 -0700)]
Merge pull request #1845 from kurund/CRM-13635
notice fixes as mentioned in CRM-13635
dlobo [Wed, 23 Oct 2013 18:58:18 +0000 (11:58 -0700)]
Merge pull request #1846 from dlobo/NoticeFixes
Fix notice when using acls to restrict mailing groups
Donald A. Lobo [Wed, 23 Oct 2013 18:56:39 +0000 (11:56 -0700)]
Fix notice when using acls to restrict mailing groups
dlobo [Wed, 23 Oct 2013 16:02:23 +0000 (09:02 -0700)]
Merge pull request #1836 from eileenmcnaughton/CRM-13632
CRM-13632 relationship update functions, call pre, post hooks on enable,...
kurund [Wed, 23 Oct 2013 14:10:44 +0000 (19:40 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-23-19-26-23
Conflicts:
CRM/Upgrade/Incremental/php/FourThree.php
api/v2/Contact.php
api/v2/Contribution.php
api/v2/Event.php
api/v2/Participant.php
api/v2/Pledge.php
api/v2/PledgePayment.php
api/v3/utils.php
templates/CRM/common/SocialNetwork.tpl
Deepak Srivastava [Wed, 23 Oct 2013 13:31:38 +0000 (19:01 +0530)]
CRM-13467 - using temp table for multiple inner joined queries
kurund [Wed, 23 Oct 2013 13:19:40 +0000 (18:49 +0530)]
notice fixes as mentioned in CRM-13635
----------------------------------------
* CRM-13635: Notices when saving back-office event registrations
http://issues.civicrm.org/jira/browse/CRM-13635
Kurund Jalmi [Wed, 23 Oct 2013 07:26:16 +0000 (00:26 -0700)]
Merge pull request #1839 from dlobo/CRM-13633
CRM-13633 - Undefined property in CRM Mailing Event
Kurund Jalmi [Wed, 23 Oct 2013 06:48:04 +0000 (23:48 -0700)]
Merge pull request #1842 from pratik-joshi/CRM-13490
CRM-13490 : fix for warning mentioned by dgg in issue comment (CRM-13490?#comment-53786), also code some improvement
Pratik Joshi [Wed, 23 Oct 2013 06:38:17 +0000 (12:08 +0530)]
CRM-13490 : fix for warning mentioned by dgg in issue comment (CRM-13490?#comment-53786), also code some improvement
----------------------------------------
* CRM-13490: Addresses with required custom fields can't be deleted from the Edit screen
http://issues.civicrm.org/jira/browse/CRM-13490
colemanw [Tue, 22 Oct 2013 23:55:13 +0000 (16:55 -0700)]
Merge pull request #1841 from colemanw/4.4
CRM-13397 - Contribte - Add submitOnce behavior to contribute button when confirmation page is disabled
Coleman Watts [Tue, 22 Oct 2013 23:52:04 +0000 (16:52 -0700)]
CRM-13634 - WP - Workaround for contribution page js bug
----------------------------------------
* CRM-13634: Non-frontend CRM pages in WP cannot modify html-header
http://issues.civicrm.org/jira/browse/CRM-13634
Coleman Watts [Tue, 22 Oct 2013 22:17:45 +0000 (15:17 -0700)]
CRM-13397 - Contribte - Add submitOnce behavior to contribute button when confirmation page is disabled
----------------------------------------
* CRM-13397: Protection against multiple submits on contributions page doesn't work when confirmation page is turned off
http://issues.civicrm.org/jira/browse/CRM-13397
Dave Greenberg [Tue, 22 Oct 2013 22:42:46 +0000 (15:42 -0700)]
Merge pull request #1837 from dlobo/CRM-13621
CRM-13621
dlobo [Tue, 22 Oct 2013 21:20:00 +0000 (14:20 -0700)]
Merge pull request #1840 from dlobo/CRM-13575
CRM-13575 - Elavon Payment Processor requires changes to conform to requirements
Donald A. Lobo [Tue, 22 Oct 2013 21:19:21 +0000 (14:19 -0700)]
CRM-13575 - Elavon Payment Processor requires changes to conform to requirements
http://issues.civicrm.org/jira/browse/CRM-13575
Donald A. Lobo [Tue, 22 Oct 2013 21:10:10 +0000 (14:10 -0700)]
CRM-13633 - Undefined property in CRM Mailing Event
http://issues.civicrm.org/jira/browse/CRM-13633
Donald A. Lobo [Tue, 22 Oct 2013 20:49:29 +0000 (13:49 -0700)]
CRM-13621 - fix error messages
----------------------------------------
* CRM-13621: Handle invalid session errors especially for public pages in a nicer manner
http://issues.civicrm.org/jira/browse/CRM-13621
Eileen [Tue, 22 Oct 2013 20:38:50 +0000 (09:38 +1300)]
CRM-13600 CiviMail form - allow CiviMails from advanced search for users with no group view permissions (ACL hook based permissions)
----------------------------------------
* CRM-13600: Contacts with access to no mailing groups cannot do search based CiviMails
http://issues.civicrm.org/jira/browse/CRM-13600
projects / civicrm-core.git / log