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
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
Donald A. Lobo [Tue, 22 Oct 2013 20:36:03 +0000 (13:36 -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
Donald A. Lobo [Tue, 22 Oct 2013 20:22:14 +0000 (13:22 -0700)]
Merge branch '4.4' of github.com:civicrm/civicrm-core into CRM-13621
Dave Greenberg [Tue, 22 Oct 2013 18:46:20 +0000 (11:46 -0700)]
Merge pull request #1835 from deepak-srivastava/event-tabs
CRM-13619 - tab display based on configurations and hook
Eileen [Tue, 22 Oct 2013 18:25:18 +0000 (18:25 +0000)]
CRM-13632 relationship update functions, call pre, post hooks on enable, disable, update correctly from api when id is set
----------------------------------------
* CRM-13632: Post Hook not called when a relationship is disabled via cron
http://issues.civicrm.org/jira/browse/CRM-13632
Kurund Jalmi [Tue, 22 Oct 2013 12:49:03 +0000 (05:49 -0700)]
Merge pull request #1833 from dakshayani/hr-13603
-- CRM-13603 Label modification on manage case screen
Deepak Srivastava [Tue, 22 Oct 2013 12:33:44 +0000 (18:03 +0530)]
CRM-13619 - allow hooks to be able to configure tabs
deepak-srivastava [Tue, 22 Oct 2013 12:29:48 +0000 (05:29 -0700)]
Merge pull request #1832 from ravishnair/CRM-13461-fix
-- fix for CRM-13461
Ravish Nair [Tue, 22 Oct 2013 10:10:25 +0000 (15:40 +0530)]
-- fix for CRM-13461
----------------------------------------
* CRM-13461: Total amount missing from event confirmation mail
http://issues.civicrm.org/jira/browse/CRM-13461
Kurund Jalmi [Tue, 22 Oct 2013 11:57:33 +0000 (04:57 -0700)]
Merge pull request #1824 from dlobo/CRM-13577
CRM-13577 - cleanup vedaconsulting patch and PR - 1821
Kurund Jalmi [Tue, 22 Oct 2013 11:54:49 +0000 (04:54 -0700)]
Merge pull request #1820 from pratik-joshi/CRM-13490
Crm 13490
Kurund Jalmi [Tue, 22 Oct 2013 11:51:47 +0000 (04:51 -0700)]
Merge pull request #1828 from pratik-joshi/CRM-13631
CRM-13631
Kurund Jalmi [Tue, 22 Oct 2013 11:46:25 +0000 (04:46 -0700)]
Merge pull request #1830 from monishdeb/CRM-13625
CRM-13625 fix - Twitter text references thankyou page with session, not ...
Dakshayani Chinchwadkar [Tue, 22 Oct 2013 11:28:54 +0000 (16:58 +0530)]
-- CRM-13603 Label modification on manage case screen
----------------------------------------
* CRM-13603: "Manage Case" uses inconsistent labels
http://issues.civicrm.org/jira/browse/CRM-13603
Deepak Srivastava [Tue, 22 Oct 2013 10:39:13 +0000 (16:09 +0530)]
Merge branch '4.4' into event-tabs
monishdeb [Tue, 22 Oct 2013 10:10:51 +0000 (15:40 +0530)]
CRM-13625 fix - Twitter text references thankyou page with session, not info page
http://issues.civicrm.org/jira/browse/CRM-13625
deepak-srivastava [Tue, 22 Oct 2013 09:50:22 +0000 (02:50 -0700)]
Merge pull request #1829 from deepak-srivastava/CRM-13629
CRM-13629
Deepak Srivastava [Tue, 22 Oct 2013 09:48:45 +0000 (15:18 +0530)]
CRM-13629
Pratik Joshi [Tue, 22 Oct 2013 05:10:42 +0000 (10:40 +0530)]
CRM-13631
----------------------------------------
* CRM-13631: vCard not including organization name
http://issues.civicrm.org/jira/browse/CRM-13631
colemanw [Mon, 21 Oct 2013 23:22:34 +0000 (16:22 -0700)]
Merge pull request #1827 from davecivicrm/CRM-13567
CRM-13567 - Incorporate query fix for contribution detail reports to … … …filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.
Dave Greenberg [Mon, 21 Oct 2013 23:16:41 +0000 (16:16 -0700)]
CRM-13567 - Incorporate query fix for contribution detail reports to filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.
----------------------------------------
* CRM-13567: CiviContribute Detail report fails if you add batch data as a filter
http://issues.civicrm.org/jira/browse/CRM-13567
Dave Greenberg [Mon, 21 Oct 2013 23:00:09 +0000 (16:00 -0700)]
Incorporate query fix for contribution detail reports to filter by Batch + fixing the getBatches BAO to remove unneeded filtering on batch type and batch status. Now we only exclude batches that are still in Data Entry status.
colemanw [Mon, 21 Oct 2013 23:00:00 +0000 (16:00 -0700)]
Merge pull request #1826 from colemanw/4.3
CRM-13550 - API - Port 2nd patch from 4.2
Coleman Watts [Mon, 21 Oct 2013 22:59:04 +0000 (15:59 -0700)]
CRM-13550 - API - apiv2 patch from 4.2
Coleman Watts [Mon, 21 Oct 2013 22:56:34 +0000 (15:56 -0700)]
CRM-13550 - API - Port 2nd patch from 4.2
colemanw [Mon, 21 Oct 2013 22:08:31 +0000 (15:08 -0700)]
Merge pull request #1825 from colemanw/4.3
CRM-13550 - API - Improve validation of options
Coleman Watts [Mon, 21 Oct 2013 22:06:48 +0000 (15:06 -0700)]
CRM-13550 - API - Improve validation of options
Donald A. Lobo [Mon, 21 Oct 2013 20:10:14 +0000 (13:10 -0700)]
CRM-13577 - cleanup vedaconsulting patch and PR - 1821
----------------------------------------
* CRM-13577: Allow Smart Groups in Scheduled Reminders
http://issues.civicrm.org/jira/browse/CRM-13577
dlobo [Mon, 21 Oct 2013 19:57:42 +0000 (12:57 -0700)]
Merge pull request #1823 from lcdservices/CRM-13628
CRM-13628 fix memory leak in note deletion by freeing DAO
Dave Greenberg [Mon, 21 Oct 2013 19:45:29 +0000 (12:45 -0700)]
Update FourThree.php
Typo fix (mising -> missing).
Dave Greenberg [Mon, 21 Oct 2013 19:43:54 +0000 (12:43 -0700)]
Merge pull request #1819 from pradpnayak/CRM-13446
Crm 13446
Brian Shaughnessy [Mon, 21 Oct 2013 19:01:32 +0000 (15:01 -0400)]
CRM-13628 fix memory leak in note deletion by freeing DAO
kurund [Mon, 21 Oct 2013 17:26:16 +0000 (22:56 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-4.4-2013-10-21-22-31-28
Conflicts:
CRM/Report/Form/Contribute/TopDonor.php
sql/civicrm_generated.mysql
templates/CRM/Price/Form/Calculate.tpl
xml/version.xml
Pratik Joshi [Mon, 21 Oct 2013 15:29:52 +0000 (20:59 +0530)]
CRM-13490 : re-framed the logic, used proper error setting methods
----------------------------------------
* CRM-13490: Addresses with required custom fields can't be deleted from the Edit screen
http://issues.civicrm.org/jira/browse/CRM-13490
Pradeep Nayak [Mon, 21 Oct 2013 14:24:38 +0000 (19:54 +0530)]
Update FourThree.php
Pradeep Nayak [Mon, 21 Oct 2013 14:14:52 +0000 (19:44 +0530)]
-- CRM-13446, fixed upgrade if current version is less then 4.3
----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
http://issues.civicrm.org/jira/browse/CRM-13446
Deepak Srivastava [Mon, 21 Oct 2013 14:02:30 +0000 (19:32 +0530)]
CRM-13619 - tab display based on configurations
Pratik Joshi [Mon, 21 Oct 2013 12:55:49 +0000 (18:25 +0530)]
CRM-13490 : the concept used for fixing this is - detach the 'required' form rule for address custom data field, check if the address is filled i.e. intended to be submitted if 'yes' then check for 'required' custom field form rule
----------------------------------------
* CRM-13490: Addresses with required custom fields can't be deleted from the Edit screen
http://issues.civicrm.org/jira/browse/CRM-13490
Kurund Jalmi [Mon, 21 Oct 2013 10:52:28 +0000 (03:52 -0700)]
Merge pull request #1807 from totten/4.3-mk-drupal-test-site-setup-conf
mk-drupal-test-site - When writing out setup.conf, include CIVISOURCEDIR
deepak-srivastava [Mon, 21 Oct 2013 10:51:01 +0000 (03:51 -0700)]
Merge pull request #1810 from monishdeb/CRM-13344
CRM-13344 fix - Unable to import Contact's gender,prefix and suffix in update/fill case
colemanw [Mon, 21 Oct 2013 04:02:43 +0000 (21:02 -0700)]
Merge pull request #1798 from eileenmcnaughton/4.4
CRM-13598 d6 - use drupal mechanism to identify table prefixing
Eileen McNaughton [Sun, 20 Oct 2013 23:23:43 +0000 (12:23 +1300)]
Drupal user fns - colemans' code
Eileen McNaughton [Sun, 20 Oct 2013 22:09:19 +0000 (11:09 +1300)]
Drupal user fns - copy Coleman's code in
https://github.com/civicrm/civicrm-core/pull/1798/files#r7022773
Coleman Watts [Sat, 19 Oct 2013 18:30:21 +0000 (11:30 -0700)]
API - add deprecation tag to constant api
colemanw [Sat, 19 Oct 2013 18:17:43 +0000 (11:17 -0700)]
Merge pull request #1816 from pradpnayak/CRM-13446
CRM-13446
colemanw [Sat, 19 Oct 2013 17:07:54 +0000 (10:07 -0700)]
Merge pull request #1817 from colemanw/4.4
CRM-13608 - API - Support 'sequential' param with getoptions
Coleman Watts [Sat, 19 Oct 2013 15:39:25 +0000 (08:39 -0700)]
CRM-13608 - API - Support 'sequential' param with getoptions
----------------------------------------
* CRM-13608: Api3 'getoptions' ordering doesn't work as JSON
http://issues.civicrm.org/jira/browse/CRM-13608
Donald A. Lobo [Sat, 19 Oct 2013 16:58:00 +0000 (09:58 -0700)]
CRM-13621 - add ability to redirect to main entry point for public pages
----------------------------------------
* CRM-13621: Handle invalid session errors especially for public pages in a nicer manner
http://issues.civicrm.org/jira/browse/CRM-13621
Pradeep Nayak [Sat, 19 Oct 2013 13:17:15 +0000 (18:47 +0530)]
CRM-13446
----------------------------------------
* CRM-13446: Add ON DELETE Options for constraints fails
http://issues.civicrm.org/jira/browse/CRM-13446
dlobo [Fri, 18 Oct 2013 20:20:46 +0000 (13:20 -0700)]
Merge pull request #1814 from dlobo/MiscFixes
Fix notices and formatting for word replacement
Donald A. Lobo [Fri, 18 Oct 2013 20:20:02 +0000 (13:20 -0700)]
Fix notices and formatting for word replacement
Tim Otten [Fri, 18 Oct 2013 11:44:20 +0000 (04:44 -0700)]
Merge pull request #1813 from totten/4.4-mkdrupaltestsite-space
mk-drupal-test-site - Allow space in SQL file name
Tim Otten [Fri, 18 Oct 2013 11:41:59 +0000 (17:11 +0530)]
mk-drupal-test-site - Allow space in SQL file name
Tim Otten [Fri, 18 Oct 2013 11:36:04 +0000 (04:36 -0700)]
Merge pull request #1812 from totten/4.4-setupsh-2
setup.sh - Quote directory names (which may have spaces)
Tim Otten [Fri, 18 Oct 2013 11:34:07 +0000 (17:04 +0530)]
setup.sh - Quote directory names (which may have spaces)
Tim Otten [Fri, 18 Oct 2013 11:16:49 +0000 (04:16 -0700)]
Merge pull request #1811 from totten/4.4-setupsh-escape
setup.sh - Quote directory names (which may have spaces)
Tim Otten [Fri, 18 Oct 2013 11:14:41 +0000 (16:44 +0530)]
setup.sh - Quote directory names (which may have spaces)
monishdeb [Fri, 18 Oct 2013 10:10:37 +0000 (15:40 +0530)]
CRM-13344 fix - Resolve test / schema issues around prefix_id, suffix_id, gender
http://issues.civicrm.org/jira/browse/CRM-13344
dlobo [Thu, 17 Oct 2013 19:47:26 +0000 (12:47 -0700)]
Merge pull request #1804 from davecivicrm/CRM-11245
CRM-11245 - Reworked the patch to use the configured date format.
dlobo [Thu, 17 Oct 2013 19:45:14 +0000 (12:45 -0700)]
Merge pull request #1806 from pratik-joshi/CRM-13604
CRM-13604 fix : update mentioned state provinces for country 'Guatemala'
Tim Otten [Thu, 17 Oct 2013 12:48:25 +0000 (18:18 +0530)]
Merge branch 'hr-130' of git://github.com/dakshayani/civicrm-core into pull-request-1713
Tim Otten [Thu, 17 Oct 2013 12:29:04 +0000 (17:59 +0530)]
mk-drupal-test-site - When writing out setup.conf, include both the old SVNROOT and the new CIVISOURCEDIR
Pratik Joshi [Thu, 17 Oct 2013 09:01:50 +0000 (14:31 +0530)]
CRM-13604 fix : update mentioned state provinces for country 'Guatemala'
----------------------------------------
* CRM-13604: Few Province/State are miss-spelled for country Guatemala
http://issues.civicrm.org/jira/browse/CRM-13604
deepak-srivastava [Thu, 17 Oct 2013 07:59:17 +0000 (00:59 -0700)]
Merge pull request #1805 from deepak-srivastava/upgrade
CRM-13389, CRM-13555 - Upgrade from 4.0.* to 4.4: DB Error: no such tabl...
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
Eileen [Wed, 16 Oct 2013 22:51:19 +0000 (11:51 +1300)]
CRM-13598 d6 user vaauthentication - add comments
----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
http://issues.civicrm.org/jira/browse/CRM-13598
Dave Greenberg [Wed, 16 Oct 2013 22:43:59 +0000 (15:43 -0700)]
CRM-11245 - Reworked the patch to use the configured date format.
----------------------------------------
* CRM-11245: Display more information in the "Event Name" autocomplete when searching
http://issues.civicrm.org/jira/browse/CRM-11245
Eileen [Wed, 16 Oct 2013 22:41:24 +0000 (11:41 +1300)]
CRM-13598 d6 user validation, This commit leaves the PEAR method on authenticate 'untouched' as there 'may' be cases where the bootstrapping is not taking place - although I am not convinced any remain, this remains a gotcha for people with prefixed tables in d6 & d7
----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
http://issues.civicrm.org/jira/browse/CRM-13598
dlobo [Wed, 16 Oct 2013 19:49:34 +0000 (12:49 -0700)]
Merge pull request #1803 from dlobo/CRM-13554
CRM-13554 - Fix typos in mass conversion
Donald A. Lobo [Wed, 16 Oct 2013 19:46:15 +0000 (12:46 -0700)]
Merge branch '4.3' of git://github.com/civicrm/civicrm-core into CRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:45:02 +0000 (12:45 -0700)]
CRM-13554
----------------------------------------
* CRM-13554: Improve string validation in the query engine
http://issues.civicrm.org/jira/browse/CRM-13554
dlobo [Wed, 16 Oct 2013 19:35:42 +0000 (12:35 -0700)]
Merge pull request #1802 from dlobo/CRM-13554
CRM-13554
Donald A. Lobo [Wed, 16 Oct 2013 19:35:06 +0000 (12:35 -0700)]
CRM-13554
----------------------------------------
* CRM-13554: Improve string validation in the query engine
http://issues.civicrm.org/jira/browse/CRM-13554
dlobo [Wed, 16 Oct 2013 15:35:46 +0000 (08:35 -0700)]
Merge pull request #1766 from pratik-joshi/CRM-13551
CRM-13551
dlobo [Wed, 16 Oct 2013 15:33:43 +0000 (08:33 -0700)]
Merge pull request #1800 from monishdeb/CRM-13601
CRM-13601 fix - Multilingual upgrade 4.3.5 to 4.4 beta throws up an err...
monishdeb [Wed, 16 Oct 2013 13:48:47 +0000 (19:18 +0530)]
CRM-13601 fix - Multilingual upgrade 4.3.5 to 4.4 beta throws up an error
http://issues.civicrm.org/jira/browse/CRM-13601
deepak-srivastava [Wed, 16 Oct 2013 08:56:30 +0000 (01:56 -0700)]
Merge pull request #1797 from dlobo/CRM-11794
CRM-11794 - drop all triggers with civicrm_ prefix
Eileen [Wed, 16 Oct 2013 01:54:28 +0000 (14:54 +1300)]
CRM-13598 d6 - use drupal mechanism to identify table prefixing
----------------------------------------
* CRM-13598: User drupal {users} rather than storing name of drupal user table
http://issues.civicrm.org/jira/browse/CRM-13598
Donald A. Lobo [Tue, 15 Oct 2013 19:52:37 +0000 (12:52 -0700)]
CRM-11794 - drop all triggers with civicrm_ prefix
----------------------------------------
* CRM-11794: Drop Trigger IF Exists fatals if custom table too long
http://issues.civicrm.org/jira/browse/CRM-11794
dlobo [Tue, 15 Oct 2013 13:43:51 +0000 (06:43 -0700)]
Merge pull request #1796 from pratik-joshi/CRM-13591
CRM-13591 : fixed condition check for display value returning function for custom fields (i.e used for returning appropriate val for Yes/No fields)
deepak-srivastava [Tue, 15 Oct 2013 12:48:21 +0000 (05:48 -0700)]
Merge pull request #1793 from dlobo/CRM-11794
CRM-11794 - shorten trigger names and add random string to ensure uniqne...
Pratik Joshi [Tue, 15 Oct 2013 08:54:42 +0000 (14:24 +0530)]
CRM-13591 : fixed condition check for display value returning function for custom fields (i.e used for returning appropriate val for Yes/No fields)
----------------------------------------
* CRM-13591: Yes / No fields are not properly displayed in profile view
http://issues.civicrm.org/jira/browse/CRM-13591
Dave Greenberg [Mon, 14 Oct 2013 19:16:35 +0000 (12:16 -0700)]
Merge pull request #1783 from ravishnair/CRM-13557fix
-- CRM-13557 changes as per comment
projects / civicrm-core.git / log