dlobo [Wed, 29 May 2013 16:15:15 +0000 (09:15 -0700)]
Merge pull request #901 from dlobo/CRM-12674
CRM-12674
Donald A. Lobo [Wed, 29 May 2013 16:13:47 +0000 (09:13 -0700)]
CRM-12674
----------------------------------------
* CRM-12674:
http://issues.civicrm.org/jira/browse/CRM-12674
Donald A. Lobo [Wed, 29 May 2013 15:07:42 +0000 (08:07 -0700)]
CRM-10682 - move wpBasePage to setting object, cache in config
----------------------------------------
* CRM-10682: Let frontend WordPress pages use template other than home page
http://issues.civicrm.org/jira/browse/CRM-10682
Kurund Jalmi [Wed, 29 May 2013 14:37:10 +0000 (07:37 -0700)]
Merge pull request #897 from pratik-joshi/CRM-12684
CRM-12684 fix: if custom data's profile field weight order is against to the order of its creation then the issue replicates
Pratik Joshi [Wed, 29 May 2013 14:21:20 +0000 (19:51 +0530)]
CRM-12684: indentation fix
Pratik Joshi [Wed, 29 May 2013 14:13:04 +0000 (19:43 +0530)]
CRM-12684 fix: if custom data's profile field weight order is against to the order of its creation then the issue replicates
Kurund Jalmi [Wed, 29 May 2013 13:45:11 +0000 (06:45 -0700)]
Merge pull request #896 from totten/httpclient-test
CRM_Utils_HttpClientTest - Fix regression
Tim Otten [Wed, 29 May 2013 13:21:31 +0000 (09:21 -0400)]
CRM_Utils_HttpClientTest - Fix regression
Kurund Jalmi [Wed, 29 May 2013 13:20:05 +0000 (06:20 -0700)]
Merge pull request #894 from ravishnair/CRM-12719
-- CRM-12719 applied patch and improved it.
Kurund Jalmi [Wed, 29 May 2013 13:02:39 +0000 (06:02 -0700)]
Merge pull request #895 from kurund/CRM-12709
CRM-12709 fixed display of formatting field in profile
Kurund Jalmi [Wed, 29 May 2013 13:00:50 +0000 (18:30 +0530)]
more work on CRM-12709, fixed profile preview
Ravish Nair [Wed, 29 May 2013 10:59:47 +0000 (16:29 +0530)]
-- CRM-12719 applied patch and improved it.
Kurund Jalmi [Wed, 29 May 2013 10:53:53 +0000 (16:23 +0530)]
worked on CRM-12709
Kurund Jalmi [Wed, 29 May 2013 09:38:38 +0000 (02:38 -0700)]
Merge pull request #891 from pradpnayak/CRM-12470
-- fixed table reference checks for financial_type_id before deleting, CRM-12470
Kurund Jalmi [Wed, 29 May 2013 09:38:10 +0000 (02:38 -0700)]
Merge pull request #892 from kurund/multiple-buttons
do not repeat custom data edit button for custom data with multiple values
Kurund Jalmi [Wed, 29 May 2013 09:36:28 +0000 (15:06 +0530)]
do not repeat custom data edit button for custom data with multiple values
Kurund Jalmi [Wed, 29 May 2013 09:34:12 +0000 (15:04 +0530)]
more template cleanup
Kurund Jalmi [Wed, 29 May 2013 09:27:12 +0000 (14:57 +0530)]
template cleanup
Pradeep Nayak [Wed, 29 May 2013 09:22:01 +0000 (14:52 +0530)]
-- fixed db reference checks for financial_type_id, CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Kurund Jalmi [Wed, 29 May 2013 08:53:58 +0000 (01:53 -0700)]
Merge pull request #858 from colemanw/tinymce
Fix tinymce when jQuery not present CRM-12589
Kurund Jalmi [Wed, 29 May 2013 08:43:40 +0000 (01:43 -0700)]
Merge pull request #889 from kurund/CRM-12711
CRM-12711, few notice fixes that broke ajax reposnse
Kurund Jalmi [Wed, 29 May 2013 08:20:01 +0000 (13:50 +0530)]
worked on CRM-12711
Kurund Jalmi [Wed, 29 May 2013 08:15:23 +0000 (13:45 +0530)]
notice fixes
Kurund Jalmi [Wed, 29 May 2013 07:39:45 +0000 (00:39 -0700)]
Merge pull request #882 from ddoligalski/CRM-12710
modification to eliminate extra page on label/badge
Kurund Jalmi [Wed, 29 May 2013 05:50:10 +0000 (22:50 -0700)]
Merge pull request #881 from pradpnayak/CRM-12699
Crm 12699
Kurund Jalmi [Wed, 29 May 2013 05:48:45 +0000 (22:48 -0700)]
Merge pull request #883 from JoeMurray/patch-1
Removing extraneous & before function call that was producing PHP warnin...
Kurund Jalmi [Wed, 29 May 2013 05:48:19 +0000 (22:48 -0700)]
Merge pull request #885 from davecivicrm/CRM-12714
CRM-12714 Add is_test to params passed to CRM_Event_BAO_Event::eventTota...
Dave Greenberg [Wed, 29 May 2013 03:24:12 +0000 (20:24 -0700)]
CRM-12714 Add is_test to params passed to CRM_Event_BAO_Event::eventTotalSeats to prevent erroneous display of Actual participant count in Find Participants search results summary.
----------------------------------------
* CRM-12714: Actual Participants count on Find Participants is mistakenly displayed when search test participant records are present
http://issues.civicrm.org/jira/browse/CRM-12714
Dave Greenberg [Wed, 29 May 2013 02:43:46 +0000 (19:43 -0700)]
CRM-12691 remove references to Create PCP URL from help files since the page id was not available. Add this info inline to the forms, and generically to the Manage PCP page. Also added the example URL for WordPress, which was missing.
----------------------------------------
* CRM-12691: Create PCP link is hard to discover and link in user guide is incomplete
http://issues.civicrm.org/jira/browse/CRM-12691
JoeMurray [Wed, 29 May 2013 00:12:22 +0000 (20:12 -0400)]
Removing extraneous & before function call that was producing PHP warning
David Doligalski [Tue, 28 May 2013 21:24:20 +0000 (17:24 -0400)]
----------------------------------------
* CRM-12710: Eliminate extra blank page from end of PDF labels (badges)
http://issues.civicrm.org/jira/browse/CRM-12710
Pradeep Nayak [Tue, 28 May 2013 20:54:10 +0000 (02:24 +0530)]
-- fixed to set payment_instrument_id, for CRM-12699
----------------------------------------
* CRM-12699: Total_Amount field is incorrectly recorded as 0 for repeating credit card contribs.
http://issues.civicrm.org/jira/browse/CRM-12699
Pradeep Nayak [Tue, 28 May 2013 20:39:45 +0000 (02:09 +0530)]
-- fixed for CRM-12699
----------------------------------------
* CRM-12699: Total_Amount field is incorrectly recorded as 0 for repeating credit card contribs.
http://issues.civicrm.org/jira/browse/CRM-12699
Kurund Jalmi [Tue, 28 May 2013 19:08:26 +0000 (12:08 -0700)]
Merge pull request #880 from pradpnayak/CRM-12470
-- added upgrade script to add default account relationships for financi...
Kurund Jalmi [Tue, 28 May 2013 19:07:40 +0000 (12:07 -0700)]
Merge pull request #879 from pradpnayak/CRM-12649
--fixed for CRM-12649
dlobo [Tue, 28 May 2013 16:45:37 +0000 (09:45 -0700)]
Merge pull request #877 from dlobo/MiscFixes
improve mail log comment
Donald A. Lobo [Tue, 28 May 2013 16:44:32 +0000 (09:44 -0700)]
improve mail log comment
Pradeep Nayak [Tue, 28 May 2013 16:28:55 +0000 (21:58 +0530)]
--fixed for CRM-12649
----------------------------------------
* CRM-12649: Restore the Select Discount Set option for back-office event registration when event has Discounts by Signup Date
http://issues.civicrm.org/jira/browse/CRM-12649
dlobo [Tue, 28 May 2013 16:28:32 +0000 (09:28 -0700)]
Merge pull request #876 from dlobo/MiscFixes
fix formatting and tabs
Donald A. Lobo [Tue, 28 May 2013 16:27:32 +0000 (09:27 -0700)]
fix formatting and tabs
Pradeep Nayak [Tue, 28 May 2013 12:28:52 +0000 (17:58 +0530)]
-- added upgrade script to add default account relationships for financial type, worked on CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Kurund Jalmi [Tue, 28 May 2013 07:41:27 +0000 (00:41 -0700)]
Merge pull request #868 from kurund/CRM-12681
worked on CRM-12681, fixed display of copy checkbox when billing block i...
Kurund Jalmi [Tue, 28 May 2013 07:36:39 +0000 (00:36 -0700)]
Merge pull request #871 from colemanw/versionAlert
Add versionAlert setting CRM-12701
Kurund Jalmi [Tue, 28 May 2013 07:29:03 +0000 (00:29 -0700)]
Merge pull request #874 from kurund/CRM-12705
applied patch for CRM-12705
Kurund Jalmi [Tue, 28 May 2013 07:28:30 +0000 (12:58 +0530)]
applied patch for CRM-12705
Coleman Watts [Tue, 28 May 2013 03:06:47 +0000 (20:06 -0700)]
Add versionAlert setting CRM-12701
Kurund Jalmi [Mon, 27 May 2013 15:14:39 +0000 (20:44 +0530)]
worked on CRM-12681, fixed display of copy checkbox when billing block is build without ajax
Kurund Jalmi [Mon, 27 May 2013 11:53:15 +0000 (04:53 -0700)]
Merge pull request #867 from pradpnayak/CRM-12665
-- removed cruft data for grant, worked on CRM-12665
Pradeep Nayak [Mon, 27 May 2013 10:12:28 +0000 (15:42 +0530)]
-- removed cruft data for grant, worked on CRM-12665
----------------------------------------
* CRM-12665: Remove unwanted files in Grant
http://issues.civicrm.org/jira/browse/CRM-12665
Kurund Jalmi [Mon, 27 May 2013 06:21:52 +0000 (23:21 -0700)]
Merge pull request #866 from kurund/CRM-12673
applied patch for CRM-12673
Kurund Jalmi [Mon, 27 May 2013 05:47:14 +0000 (11:17 +0530)]
applied patch for CRM-12673
dlobo [Sun, 26 May 2013 19:52:57 +0000 (12:52 -0700)]
Merge pull request #864 from eileenmcnaughton/CRM-12160
Crm 12160 -fix navigation upgrade errors
dlobo [Sun, 26 May 2013 19:50:13 +0000 (12:50 -0700)]
Merge pull request #857 from colemanw/is_test
Automatically filter test records on forced searches CRM-12610
dlobo [Sun, 26 May 2013 19:43:10 +0000 (12:43 -0700)]
Merge pull request #860 from yashodha/CRM-12688
CRM-12688
Tim Otten [Sun, 26 May 2013 17:01:24 +0000 (10:01 -0700)]
Merge pull request #863 from eileenmcnaughton/CRM-11320
Crm 11320 - make api stable for 4.3
eileen [Sun, 26 May 2013 10:37:54 +0000 (22:37 +1200)]
CRM-12160 menu fixes for 4.3
eileen [Wed, 20 Mar 2013 00:36:09 +0000 (13:36 +1300)]
CRM-12160 Fix domain on navigation inserts
Conflicts:
CRM/Upgrade/Incremental/sql/4.2.3.mysql.tpl
CRM/Upgrade/Incremental/sql/4.2.alpha1.mysql.tpl
eileen [Wed, 15 May 2013 21:35:32 +0000 (09:35 +1200)]
CRM-11320 fix error in test
eileen [Wed, 15 May 2013 14:02:41 +0000 (02:02 +1200)]
CRM-11320 this makes the api stable from 4.2 to 4.3
Conflicts:
api/v3/Contribution.php
yashodha [Sun, 26 May 2013 05:53:11 +0000 (11:23 +0530)]
CRM-12688
dlobo [Sun, 26 May 2013 00:52:33 +0000 (17:52 -0700)]
Merge pull request #862 from dlobo/CRM-10682
CRM-10692 - commit andrew hunt patch. rework in next commit
Donald A. Lobo [Sun, 26 May 2013 00:51:37 +0000 (17:51 -0700)]
CRM-10692 - commit andrew hunt patch. rework in next commit
----------------------------------------
* CRM-10692: unable to override /CRM/Core/Utils.php from extension
http://issues.civicrm.org/jira/browse/CRM-10692
yashodha [Sat, 25 May 2013 02:08:37 +0000 (07:38 +0530)]
CRM-12688
Coleman Watts [Sat, 25 May 2013 00:54:32 +0000 (20:54 -0400)]
Fix tinymce when jQuery not present CRM-12589
Coleman Watts [Fri, 24 May 2013 22:58:42 +0000 (18:58 -0400)]
Automatically filter test records on forced searches CRM-12610
dlobo [Fri, 24 May 2013 20:57:47 +0000 (13:57 -0700)]
Merge pull request #856 from dlobo/CRM-12594
CRM-12594 - Fix typo in warning message
Donald A. Lobo [Fri, 24 May 2013 20:57:01 +0000 (13:57 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Donald A. Lobo [Fri, 24 May 2013 20:54:39 +0000 (13:54 -0700)]
CRM-12594
----------------------------------------
* CRM-12594: Wrong texts in UI
http://issues.civicrm.org/jira/browse/CRM-12594
Dave Greenberg [Fri, 24 May 2013 16:33:30 +0000 (09:33 -0700)]
Merge pull request #854 from yashodha/CRM-12688
CRM-12688
Yash - the help needs to be clearer, since I "think" you said the behavior is that reminders are limited to participants who have the selected status(es) AND meet the Limit Recipients criteria. Maybe something like "Only send reminders to participants with the status(es) selected above AND who match this criteria. If you select Manual Recipients - only those people will receive the reminder (AND only if they are ALSO participants with the selected status)."
yashodha [Fri, 24 May 2013 10:55:19 +0000 (16:25 +0530)]
CRM-12688
yashodha [Fri, 24 May 2013 10:21:17 +0000 (15:51 +0530)]
CRM-12688
dlobo [Thu, 23 May 2013 22:27:18 +0000 (15:27 -0700)]
Merge pull request #850 from dlobo/CRM-12685
CRM-12685 - Fix Pakistan state names
Donald A. Lobo [Thu, 23 May 2013 22:25:54 +0000 (15:25 -0700)]
CRM-12685 - Fix Pakistan state names
----------------------------------------
* CRM-12685: Incorrect list for States in Pakistan
http://issues.civicrm.org/jira/browse/CRM-12685
Dave Greenberg [Thu, 23 May 2013 21:15:52 +0000 (14:15 -0700)]
Merge pull request #848 from davecivicrm/CRM-12655-generated
CRM-12655 removed inline escape chars for single quotes. Rebuilt civicrm...
Dave Greenberg [Thu, 23 May 2013 21:10:51 +0000 (14:10 -0700)]
CRM-12655 removed inline escape chars for single quotes. Rebuilt civicrm_generated.mysql.
----------------------------------------
* CRM-12655: Translatable report instance titles
http://issues.civicrm.org/jira/browse/CRM-12655
Kurund Jalmi [Thu, 23 May 2013 20:28:27 +0000 (13:28 -0700)]
Merge pull request #843 from pradpnayak/CRM-12680
-- fixed for CRM-12680, line items were not created properly when trying...
Kurund Jalmi [Thu, 23 May 2013 20:28:00 +0000 (13:28 -0700)]
Merge pull request #846 from pradpnayak/CRM-12498
--reverting code since regression issue faced on online contribution page...
Pradeep Nayak [Thu, 23 May 2013 19:47:10 +0000 (01:17 +0530)]
--everting code since regression issue faced on online contribution page for payment processor, CRM-12498
----------------------------------------
* CRM-12498: API contribution.create/update DB Error: constraint violation
http://issues.civicrm.org/jira/browse/CRM-12498
Dave Greenberg [Thu, 23 May 2013 19:34:26 +0000 (12:34 -0700)]
Merge pull request #810 from hbergin/CRM-12655
CRM-12655: Add translation wrappers to report instance title and description.
Also need to rebuild generated.mysql and remove \ inline ecsaping of single quotes - I will add this as a separate PR.
dlobo [Thu, 23 May 2013 17:15:12 +0000 (10:15 -0700)]
Merge pull request #838 from colemanw/CRM-10573
Restore timezone handling CRM-10573
dlobo [Thu, 23 May 2013 17:03:44 +0000 (10:03 -0700)]
Merge pull request #840 from colemanw/is_test
Fix searching for test records CRM-12610
Pradeep Nayak [Thu, 23 May 2013 14:19:12 +0000 (19:49 +0530)]
-- fixed for CRM-12680, line items were not created properly when trying to submit credit card contribution
----------------------------------------
* CRM-12680: Contribution of multiple financial types in single field creates unbalanced transaction
http://issues.civicrm.org/jira/browse/CRM-12680
Kurund Jalmi [Thu, 23 May 2013 13:29:42 +0000 (06:29 -0700)]
Merge pull request #842 from pratik-joshi/api-test-fixes
minor api test fixes WRT https://test.civicrm.org/job/CiviCRM-4.3-git/LABEL=...
Pratik Joshi [Thu, 23 May 2013 09:51:13 +0000 (15:21 +0530)]
minor test fixes WRT https://test.civicrm.org/job/CiviCRM-4.3-git/LABEL=debian6,SUITE=api_v3_AllTests/lastCompletedBuild/testReport/ failure result
Kurund Jalmi [Thu, 23 May 2013 04:37:01 +0000 (21:37 -0700)]
Merge pull request #834 from totten/hasReachedMaxLimit-warning
CRM_Core_BAO_CustomGroup::hasReachedMaxLimit - Fix warning
Coleman Watts [Thu, 23 May 2013 03:10:11 +0000 (22:10 -0500)]
Fix the same thing in 4 other places CRM-12610
Coleman Watts [Thu, 23 May 2013 02:43:34 +0000 (21:43 -0500)]
Fix assumption about test records CRM-12610
colemanw [Thu, 23 May 2013 02:05:15 +0000 (19:05 -0700)]
Merge pull request #839 from colemanw/CRM-12670
Fix image CRM-12670
Coleman Watts [Thu, 23 May 2013 02:03:13 +0000 (21:03 -0500)]
Fix image CRM-12670
Coleman Watts [Thu, 23 May 2013 01:12:56 +0000 (20:12 -0500)]
Restore timezone handling CRM-10573
Tim Otten [Wed, 22 May 2013 20:24:05 +0000 (16:24 -0400)]
CRM_Core_BAO_CustomGroup::hasReachedMaxLimit - Fix warning
dlobo [Wed, 22 May 2013 18:32:57 +0000 (11:32 -0700)]
Merge pull request #832 from dlobo/MiscFixes
Suppress WP Access Control link from admin pages in all CMS
Donald A. Lobo [Wed, 22 May 2013 18:31:58 +0000 (11:31 -0700)]
Suppress WP Access Control link from admin pages in all CMS
dlobo [Wed, 22 May 2013 18:21:33 +0000 (11:21 -0700)]
Merge pull request #831 from dlobo/CRM-12594
CRM-12594 - Fix references to menu items
Kurund Jalmi [Wed, 22 May 2013 16:11:51 +0000 (09:11 -0700)]
Merge pull request #828 from dlobo/CRM-12678
CRM-12678
Donald A. Lobo [Wed, 22 May 2013 15:53:55 +0000 (08:53 -0700)]
CRM-12678
----------------------------------------
* CRM-12678: PseudoConstant.php on line 122 returns value not reference
http://issues.civicrm.org/jira/browse/CRM-12678
Kurund Jalmi [Tue, 21 May 2013 21:18:09 +0000 (14:18 -0700)]
Merge pull request #821 from dlobo/CRM-12674
CRM-12674
Kurund Jalmi [Tue, 21 May 2013 21:12:21 +0000 (17:12 -0400)]
CRM-12466, layout fixes
Donald A. Lobo [Tue, 21 May 2013 21:10:21 +0000 (14:10 -0700)]
CRM-12674
----------------------------------------
* CRM-12674: WordPress updateConfigBackend is confused about URL
http://issues.civicrm.org/jira/browse/CRM-12674
Kurund Jalmi [Tue, 21 May 2013 19:56:40 +0000 (12:56 -0700)]
Merge pull request #817 from pradpnayak/CRM-12470
-- fixed notice errors for CRM-12470
projects / civicrm-core.git / log