Brian Shaughnessy [Mon, 17 Jun 2013 13:15:29 +0000 (09:15 -0400)]
CRM-12814 optimize mailing tab opened/click calculations
Brian Shaughnessy [Wed, 12 Jun 2013 18:45:26 +0000 (14:45 -0400)]
CRM-12802 case report date display
Brian Shaughnessy [Wed, 12 Jun 2013 14:54:00 +0000 (10:54 -0400)]
CRM-12798 contact detail report date filter
deepak-srivastava [Wed, 22 May 2013 13:33:56 +0000 (06:33 -0700)]
Merge pull request #826 from deepak-srivastava/hr
notice fixes towards CRM-12623
Deepak Srivastava [Wed, 22 May 2013 13:25:24 +0000 (18:55 +0530)]
notice fixes towards CRM-12623
----------------------------------------
* CRM-12623: Create CiviHR Report Template
http://issues.civicrm.org/jira/browse/CRM-12623
Kurund Jalmi [Tue, 21 May 2013 19:56:15 +0000 (12:56 -0700)]
Merge pull request #819 from mlutfy/mkdrupaltest3
Always symlink to civicrm, since source directory may have another name, ex: civicrm43
Kurund Jalmi [Tue, 21 May 2013 18:40:33 +0000 (14:40 -0400)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-05-21-13-15-18
Conflicts:
.gitignore
CRM/Financial/Form/FinancialAccount.php
CRM/Financial/Form/FinancialTypeAccount.php
CRM/Grant/Controller/PaymentSearch.php
CRM/Grant/Page/GrantProgram.php
CRM/Grant/Page/Payment.php
CRM/Grant/Selector/PaymentSearch.php
CRM/Report/Form/Event/ParticipantListCount.php
CRM/Utils/Migrate/Export.php
CRM/Utils/Migrate/ExportJSON.php
sql/civicrm_generated.mysql
templates/CRM/Admin/Form/Preferences/Display.tpl
templates/CRM/Financial/Form/FinancialTypeAccount.tpl
templates/CRM/Grant/Form/Search.tpl
Mathieu Lutfy [Tue, 21 May 2013 14:25:02 +0000 (10:25 -0400)]
Always symlink to civicrm, since source directory may have another name, ex: civicrm43
deepak-srivastava [Tue, 21 May 2013 13:34:14 +0000 (06:34 -0700)]
Merge pull request #818 from mlutfy/mkdrupaltest2
mk-drupal-test-site: added help text, option to restore .sql dump, and do not send welcome e-mail
Mathieu Lutfy [Tue, 21 May 2013 13:29:02 +0000 (09:29 -0400)]
Do not send the drupal welcome e-mail on site-install
Mathieu Lutfy [Tue, 21 May 2013 13:28:39 +0000 (09:28 -0400)]
Added help function, a bit more error checking, and allow to restore a .sql to be used on the test site.
Kurund Jalmi [Tue, 21 May 2013 04:12:13 +0000 (21:12 -0700)]
Merge pull request #816 from kurund/pradpnayak-CRM-12470
manually merging https://github.com/civicrm/civicrm-core/pull/802
Kurund Jalmi [Tue, 21 May 2013 03:42:27 +0000 (23:42 -0400)]
Merge branch 'CRM-12470' of git://github.com/pradpnayak/civicrm-core into pradpnayak-CRM-12470
Conflicts:
CRM/Upgrade/Incremental/sql/4.3.4.mysql.tpl
Kurund Jalmi [Tue, 21 May 2013 03:22:54 +0000 (20:22 -0700)]
Merge pull request #815 from kurund/CRM-12466
CRM-12466, add configuration for displaying smart groups in Contact Summary > Groups tab
Kurund Jalmi [Tue, 21 May 2013 03:21:17 +0000 (20:21 -0700)]
Merge pull request #803 from pratik-joshi/CRM-11310
fix for CRM-11310 : applied patch
Kurund Jalmi [Tue, 21 May 2013 03:20:51 +0000 (20:20 -0700)]
Merge pull request #811 from davecivicrm/CRM-12510
CRM-12510. There were no webtests for copying a contribution page or cop...
Kurund Jalmi [Tue, 21 May 2013 03:19:56 +0000 (20:19 -0700)]
Merge pull request #807 from pradpnayak/CRM-12665
-- worked on CRM-12665
Pradeep Nayak [Thu, 30 May 2013 15:49:28 +0000 (21:19 +0530)]
-- worked on CRM-12665
----------------------------------------
* CRM-12665: Remove unwanted files in Grant
http://issues.civicrm.org/jira/browse/CRM-12665
Kurund Jalmi [Tue, 21 May 2013 03:19:05 +0000 (20:19 -0700)]
Merge pull request #812 from dlobo/NoticeFixes
fix more php5.3 notices
Kurund Jalmi [Tue, 21 May 2013 03:18:41 +0000 (20:18 -0700)]
Merge pull request #813 from dlobo/CRM-12646
CRM-12646
Kurund Jalmi [Tue, 21 May 2013 01:53:04 +0000 (21:53 -0400)]
CRM-12466, upgrade related fixes
Kurund Jalmi [Tue, 21 May 2013 01:34:17 +0000 (21:34 -0400)]
CRM-12466, re-generate data for changes in civicrm_data.tpl
Kurund Jalmi [Tue, 21 May 2013 00:45:02 +0000 (20:45 -0400)]
CRM-12466, added smart group pane
Kurund Jalmi [Mon, 20 May 2013 04:07:52 +0000 (00:07 -0400)]
more work on CRM-12466
Kurund Jalmi [Mon, 20 May 2013 03:53:46 +0000 (23:53 -0400)]
more work on CRM-12466, added new files for contact smart group
Kurund Jalmi [Sun, 19 May 2013 02:33:03 +0000 (22:33 -0400)]
template cleanip
Kurund Jalmi [Fri, 17 May 2013 20:55:32 +0000 (16:55 -0400)]
remove obsolete code
Kurund Jalmi [Fri, 17 May 2013 06:09:38 +0000 (02:09 -0400)]
CRM-12466, layout fix and added inline help
Kurund Jalmi [Fri, 17 May 2013 06:01:08 +0000 (02:01 -0400)]
CRM-12466 fixed default option for new installs
Kurund Jalmi [Fri, 17 May 2013 05:35:22 +0000 (01:35 -0400)]
CRM-12466, fixed saving of radio options
Kurund Jalmi [Fri, 17 May 2013 05:31:34 +0000 (01:31 -0400)]
CRM-12466, worked on form building
Kurund Jalmi [Fri, 17 May 2013 05:22:31 +0000 (01:22 -0400)]
tempalate cleanup
Kurund Jalmi [Fri, 17 May 2013 05:14:51 +0000 (01:14 -0400)]
CRM-12466, added option group and values for contact smart group view options
Kurund Jalmi [Fri, 17 May 2013 04:33:56 +0000 (00:33 -0400)]
code cleanup
Dave Greenberg [Mon, 20 May 2013 21:12:39 +0000 (14:12 -0700)]
Merge pull request #804 from pradpnayak/CRM-12498
--fixed for CRM-12498, added condition to check valid contribution statu...
Ran the complete api v3 Contribution unit test w/o errors after applying this patch.
Donald A. Lobo [Mon, 20 May 2013 21:02:35 +0000 (14:02 -0700)]
CRM-12646
----------------------------------------
* CRM-12646: Suppress the ability to edit custom data unless the user has edit rights on the contact.
http://issues.civicrm.org/jira/browse/CRM-12646
Dave Greenberg [Mon, 20 May 2013 20:39:50 +0000 (13:39 -0700)]
Merge pull request #795 from colemanw/is_test
Fix for contributions only CRM-12610
Donald A. Lobo [Mon, 20 May 2013 20:39:30 +0000 (13:39 -0700)]
fix more php5.3 notices
Dave Greenberg [Mon, 20 May 2013 20:22:18 +0000 (13:22 -0700)]
CRM-12510. There were no webtests for copying a contribution page or copying an event. Adding them.
----------------------------------------
* CRM-12510: Copy Contribution Page does not copy associated quick-config price set
http://issues.civicrm.org/jira/browse/CRM-12510
Kurund Jalmi [Mon, 20 May 2013 19:49:25 +0000 (12:49 -0700)]
Merge pull request #808 from dlobo/NoticeFixes
handle global variable $language not being set, restructure code a bit
dlobo [Mon, 20 May 2013 18:08:38 +0000 (11:08 -0700)]
Merge pull request #809 from dlobo/CRM-12667
CRM-12667
Donald A. Lobo [Mon, 20 May 2013 18:07:52 +0000 (11:07 -0700)]
CRM-12667
----------------------------------------
* CRM-12667: Tell a Friend causes error: "You do not have permission to access this page"
http://issues.civicrm.org/jira/browse/CRM-12667
Donald A. Lobo [Mon, 20 May 2013 17:57:32 +0000 (10:57 -0700)]
CRM-12667
----------------------------------------
* CRM-12667: Tell a Friend causes error: "You do not have permission to access this page"
http://issues.civicrm.org/jira/browse/CRM-12667
Donald A. Lobo [Mon, 20 May 2013 16:04:26 +0000 (09:04 -0700)]
handle global variable $language not being set, restructure code a bit
dlobo [Mon, 20 May 2013 14:04:21 +0000 (07:04 -0700)]
Merge pull request #805 from Edzelopez/CRM-12664
CRM-12664 --Fix for Grant Delete notification
Edsel [Mon, 20 May 2013 12:29:03 +0000 (17:59 +0530)]
CRM-12664 --Fix for Grant Delete notification
Pradeep Nayak [Mon, 20 May 2013 10:59:34 +0000 (16:29 +0530)]
--fixed for CRM-12498, added condition to check valid contribution status change and throw error if invalid
----------------------------------------
* CRM-12498: API contribution.create/update DB Error: constraint violation
http://issues.civicrm.org/jira/browse/CRM-12498
Pratik Joshi [Mon, 20 May 2013 08:54:14 +0000 (14:24 +0530)]
fix for CRM-11310 : applied patch
Pradeep Nayak [Mon, 20 May 2013 08:11:42 +0000 (13:41 +0530)]
--fixed webtest, crm test and upgrade script for CRM-12470
----------------------------------------
* CRM-12470: Creating new financial type without AR account leads to unbalanced transactions
http://issues.civicrm.org/jira/browse/CRM-12470
Tim Otten [Mon, 20 May 2013 04:53:08 +0000 (21:53 -0700)]
Merge pull request #801 from totten/migrate-tweaks
CRM-12621 - Migrate tweaks
Tim Otten [Mon, 20 May 2013 04:35:50 +0000 (00:35 -0400)]
CRM_Utils_Migrate_Import - Extract runXmlElement() for use with dynamic XML. Add docs.
Tim Otten [Mon, 20 May 2013 03:32:13 +0000 (23:32 -0400)]
CRM_Utils_Migrate_Import - Fix static warning
Tim Otten [Mon, 20 May 2013 01:57:53 +0000 (21:57 -0400)]
CRM_Utils_Migrate_Export - Allow cherry-picking of CustomGroups for export
Kurund Jalmi [Sun, 19 May 2013 23:52:48 +0000 (16:52 -0700)]
Merge pull request #797 from dlobo/CRM-12172
CRM-12172
Kurund Jalmi [Sun, 19 May 2013 23:51:17 +0000 (16:51 -0700)]
Merge pull request #798 from pradpnayak/CRM-12510
-- fixed for CRM-12510
Pradeep Nayak [Sun, 19 May 2013 19:42:39 +0000 (01:12 +0530)]
-- fixed for CRM-12510
----------------------------------------
* CRM-12510: Copy Contribution Page does not copy associated quick-config price set
http://issues.civicrm.org/jira/browse/CRM-12510
Donald A. Lobo [Sun, 19 May 2013 16:53:22 +0000 (09:53 -0700)]
CRM-12172
----------------------------------------
* CRM-12172: Use preg_replace_callback() in CRM_Utils_Token
http://issues.civicrm.org/jira/browse/CRM-12172
Kurund Jalmi [Sun, 19 May 2013 05:52:36 +0000 (22:52 -0700)]
Merge pull request #796 from kurund/CRM-12589
reverted bad merge
cb9721555f0f1f044ca688c66461ab59b69bbe41
Kurund Jalmi [Sun, 19 May 2013 05:50:52 +0000 (01:50 -0400)]
Kurund Jalmi [Sun, 19 May 2013 05:32:33 +0000 (22:32 -0700)]
Merge pull request #794 from colemanw/tinymce
Possible fix for CRM-12589
Coleman Watts [Sat, 18 May 2013 23:26:40 +0000 (18:26 -0500)]
Fix for contributions only CRM-12610
Coleman Watts [Sat, 18 May 2013 22:55:47 +0000 (17:55 -0500)]
Possible fix for CRM-12589
Kurund Jalmi [Sat, 18 May 2013 13:47:13 +0000 (06:47 -0700)]
Merge pull request #789 from davecivicrm/CRM-12643
CRM-12643 Add instance of renamed Contribuition Aggregate Report to meta...
Kurund Jalmi [Sat, 18 May 2013 13:46:00 +0000 (06:46 -0700)]
Merge pull request #791 from dlobo/CRM-9855
CRM-9855
Donald A. Lobo [Sat, 18 May 2013 00:55:33 +0000 (17:55 -0700)]
CRM-9855
----------------------------------------
* CRM-9855: CiviMail sets X-header "X-CiviMail-Bounce" on outbound bulk email, but does not use it to identify an inbound bounce
http://issues.civicrm.org/jira/browse/CRM-9855
dlobo [Sat, 18 May 2013 00:53:49 +0000 (17:53 -0700)]
Merge pull request #790 from JoeMurray/CRM-12657
fix crmaccordions to crmAccordions
Joe Murray [Sat, 18 May 2013 00:47:45 +0000 (20:47 -0400)]
fix crmaccordions to crmAccordions
----------------------------------------
* CRM-12657: fix crmAccordions in Grant Search
http://issues.civicrm.org/jira/browse/CRM-12657
Dave Greenberg [Fri, 17 May 2013 23:26:41 +0000 (16:26 -0700)]
CRM-12643 Add instance of renamed Contribuition Aggregate Report to meta-data, renamed report template, rebuilt civicrm_generated.mysql.
----------------------------------------
* CRM-12643: Add instance of "Contribution Aggregate by Relationship" report to new installs
http://issues.civicrm.org/jira/browse/CRM-12643
Kurund Jalmi [Fri, 17 May 2013 20:26:27 +0000 (13:26 -0700)]
Merge pull request #787 from eileenmcnaughton/whitespacelimited
Whitespacelimited
eileen [Mon, 13 May 2013 02:30:59 +0000 (14:30 +1200)]
CRM-12595 fix formatting in remaing files
eileen [Mon, 13 May 2013 02:30:03 +0000 (14:30 +1200)]
CRM-12595 fix formatting in CRM/P* files
eileen [Mon, 13 May 2013 02:29:32 +0000 (14:29 +1200)]
CRM-12595 fix formatting in CRM/Report files
eileen [Mon, 13 May 2013 02:29:08 +0000 (14:29 +1200)]
CRM-12595 fix formatting in CRM/Upgrade files
eileen [Mon, 13 May 2013 02:28:58 +0000 (14:28 +1200)]
CRM-12595 fix formatting in CRM/Utils files
eileen [Mon, 13 May 2013 02:28:28 +0000 (14:28 +1200)]
CRM-12595 fix formatting in bin files
eileen [Mon, 13 May 2013 02:28:19 +0000 (14:28 +1200)]
CRM-12595 fix formatting in api files
eileen [Mon, 13 May 2013 02:28:03 +0000 (14:28 +1200)]
CRM-12595 fix formatting in js files
eileen [Mon, 13 May 2013 02:27:45 +0000 (14:27 +1200)]
CRM-12595 fix formatting in sql files
eileen [Mon, 13 May 2013 02:27:31 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (R)
eileen [Mon, 13 May 2013 02:27:23 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (P)
eileen [Mon, 13 May 2013 02:27:01 +0000 (14:27 +1200)]
CRM-12595 fix formatting in templates files (G)
eileen [Mon, 13 May 2013 02:26:52 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (F)
eileen [Mon, 13 May 2013 02:26:44 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (E)
eileen [Mon, 13 May 2013 02:26:25 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (C)
eileen [Mon, 13 May 2013 02:26:17 +0000 (14:26 +1200)]
CRM-12595 fix formatting in templates files (B)
eileen [Mon, 13 May 2013 02:25:45 +0000 (14:25 +1200)]
CRM-12595 fix formatting in templates files (A)
eileen [Mon, 13 May 2013 02:24:31 +0000 (14:24 +1200)]
CRM-12595 fix formatting in tools files
eileen [Mon, 13 May 2013 02:23:19 +0000 (14:23 +1200)]
CRM-12595 fix formatting in tests files
eileen [Mon, 13 May 2013 02:23:02 +0000 (14:23 +1200)]
CRM-12595 fix formatting in xml files
Kurund Jalmi [Fri, 17 May 2013 19:17:30 +0000 (12:17 -0700)]
Merge pull request #786 from davecivicrm/CRM-12654
CRM-12654 unset invalid and non-relevant contribution statuses in Batch ...
Dave Greenberg [Fri, 17 May 2013 17:43:49 +0000 (10:43 -0700)]
CRM-12654 unset invalid and non-relevant contribution statuses in Batch Entry status dropdown. Array now matches New Contribution form.
----------------------------------------
* CRM-12654: Invalid contribution statuses are include in Batch Data Entry dropdown
http://issues.civicrm.org/jira/browse/CRM-12654
Kurund Jalmi [Fri, 17 May 2013 17:35:33 +0000 (10:35 -0700)]
Merge pull request #783 from dlobo/CRM-12648
CRM 12648
Kurund Jalmi [Fri, 17 May 2013 17:34:41 +0000 (10:34 -0700)]
Merge pull request #784 from ravishnair/CRM-10397
CRM-10397 Pay Later Improvements
Kurund Jalmi [Fri, 17 May 2013 17:15:28 +0000 (10:15 -0700)]
Merge pull request #785 from yashodha/4.3
CRM-12583
yashodha [Fri, 17 May 2013 14:56:20 +0000 (20:26 +0530)]
CRM-12583
Ravish Nair [Fri, 17 May 2013 08:53:24 +0000 (14:23 +0530)]
-- CRM-10397 Updated Description of Pay Later Label
Ravish Nair [Fri, 17 May 2013 08:42:11 +0000 (14:12 +0530)]
-- CRM-10397 Pay Later Improvements
Kurund Jalmi [Fri, 17 May 2013 03:49:49 +0000 (20:49 -0700)]
Merge pull request #781 from totten/decouple-fix-exporter
CRM-12647 - Fix XML encoding; decouple exporter and XML encoder
Donald A. Lobo [Fri, 17 May 2013 01:10:37 +0000 (18:10 -0700)]
CRM-12648
----------------------------------------
* CRM-12648: CiviCRM mailing (or other scheduled jobs) do not seem to fire when triggered via wget
http://issues.civicrm.org/jira/browse/CRM-12648
Donald A. Lobo [Fri, 17 May 2013 00:55:52 +0000 (17:55 -0700)]
CRM-12648
----------------------------------------
* CRM-12648: CiviCRM mailing (or other scheduled jobs) do not seem to fire when triggered via wget
http://issues.civicrm.org/jira/browse/CRM-12648
projects / civicrm-core.git / log