vcs.fsf.org Git - civicrm-core.git/log

Tim Otten [Thu, 23 May 2013 04:44:22 +0000 (00:44 -0400)]

CRM-12683 - Fix URL path for the "vendor" directory

----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683

commit | commitdiff | tree

Kurund Jalmi [Thu, 23 May 2013 04:36:43 +0000 (21:36 -0700)]

Merge pull request #837 from totten/vendors-extdir

CRM-12683 - Load extensions in "vendor" directory

commit | commitdiff | tree

Tim Otten [Thu, 23 May 2013 01:06:48 +0000 (21:06 -0400)]

CRM-12683 - Fix NPE when an extension container disappears

----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683

commit | commitdiff | tree

Tim Otten [Thu, 23 May 2013 01:06:10 +0000 (21:06 -0400)]

CRM-12683 - Load extensions in "vendor" directory

----------------------------------------
* CRM-12683: Load extensions in "vendor" directory
http://issues.civicrm.org/jira/browse/CRM-12683

commit | commitdiff | tree

Kurund Jalmi [Wed, 22 May 2013 23:47:28 +0000 (16:47 -0700)]

Merge pull request #594 from colemanw/v2api

Remove ApiV2 and other cruft

commit | commitdiff | tree

Coleman Watts [Wed, 22 May 2013 22:41:07 +0000 (17:41 -0500)]

Remove NYSS module CRM-9794

----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794

commit | commitdiff | tree

Coleman Watts [Wed, 22 May 2013 22:40:07 +0000 (17:40 -0500)]

Remove ICIRR module CRM-9794

----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794

commit | commitdiff | tree

Coleman Watts [Wed, 22 May 2013 22:38:44 +0000 (17:38 -0500)]

Remove giftaid CRM-9794

----------------------------------------
* CRM-9794:
http://issues.civicrm.org/jira/browse/CRM-9794

commit | commitdiff | tree

Coleman Watts [Wed, 1 May 2013 00:12:18 +0000 (17:12 -0700)]

Remove van module CRM-9794

----------------------------------------
* CRM-9794: Remove API v2
http://issues.civicrm.org/jira/browse/CRM-9794

commit | commitdiff | tree

Coleman Watts [Wed, 1 May 2013 00:11:42 +0000 (17:11 -0700)]

Remove v2 api CRM-9794

----------------------------------------
* CRM-9794: Remove API v2
http://issues.civicrm.org/jira/browse/CRM-9794

commit | commitdiff | tree

Tim Otten [Wed, 22 May 2013 21:39:49 +0000 (14:39 -0700)]

Merge pull request #836 from mlutfy/mkdrupaltest4

Remove patch to disable mails from PHP/drush

commit | commitdiff | tree

Mathieu Lutfy [Wed, 22 May 2013 21:29:16 +0000 (17:29 -0400)]

Remove patch to disable mails from PHP/drush, instead rely that the host will have a php.ini directive disabling sendmail. See: https://test.civicrm.org/job/CiviCRM-master-git/108/LABEL=debian6,SUITE=api_v3_AllTests/

commit | commitdiff | tree

dlobo [Wed, 22 May 2013 21:13:30 +0000 (14:13 -0700)]

Merge pull request #835 from dlobo/CRM-12197

CRM-12197 - fix notice

commit | commitdiff | tree

Donald A. Lobo [Wed, 22 May 2013 21:12:55 +0000 (14:12 -0700)]

CRM-12197 - fix notice

----------------------------------------
* CRM-12197: Overactive IDS causes test failure
http://issues.civicrm.org/jira/browse/CRM-12197

commit | commitdiff | tree

colemanw [Wed, 22 May 2013 20:15:18 +0000 (13:15 -0700)]

Merge pull request #833 from dlobo/CRM-12197

CRM-12197 - add skip IDS check permission

commit | commitdiff | tree

Donald A. Lobo [Wed, 22 May 2013 19:21:38 +0000 (12:21 -0700)]

CRM-12197 - add skip IDS check permission

----------------------------------------
* CRM-12197: Overactive IDS causes test failure
http://issues.civicrm.org/jira/browse/CRM-12197

commit | commitdiff | tree

dlobo [Wed, 22 May 2013 16:09:11 +0000 (09:09 -0700)]

Merge pull request #830 from dlobo/CRM-10935

CRM-10935 - fix typo in xml

commit | commitdiff | tree

Donald A. Lobo [Wed, 22 May 2013 16:07:32 +0000 (09:07 -0700)]

CRM-10935

----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935

commit | commitdiff | tree

Kurund Jalmi [Wed, 22 May 2013 16:04:10 +0000 (09:04 -0700)]

Merge pull request #829 from dlobo/CRM-10935

CRM-10935

commit | commitdiff | tree

Kurund Jalmi [Wed, 22 May 2013 15:44:08 +0000 (08:44 -0700)]

Merge pull request #827 from lcdservices/CRM12417

CRM-12417 format activity date during import

commit | commitdiff | tree

Brian Shaughnessy [Wed, 22 May 2013 14:07:14 +0000 (10:07 -0400)]

CRM-12417 format activity date during import

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Donald A. Lobo [Tue, 21 May 2013 23:03:14 +0000 (16:03 -0700)]

CRM-10935 - tweak so we dont display other tabs in summary if no access CiviCRM

----------------------------------------
* CRM-10935: Create new Core Permission - CiviCRM: Access own Contact or both "CiviCRM: View own Contact" and "CiviCRM: Edit own Contact"
http://issues.civicrm.org/jira/browse/CRM-10935

commit | commitdiff | tree

Donald A. Lobo [Tue, 21 May 2013 22:45:49 +0000 (15:45 -0700)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Lutfy [Tue, 21 May 2013 13:29:02 +0000 (09:29 -0400)]

Do not send the drupal welcome e-mail on site-install

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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...

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Tue, 21 May 2013 03:18:41 +0000 (20:18 -0700)]

Merge pull request #813 from dlobo/CRM-12646

CRM-12646

commit | commitdiff | tree

Kurund Jalmi [Tue, 21 May 2013 01:53:04 +0000 (21:53 -0400)]

CRM-12466, upgrade related fixes

commit | commitdiff | tree

Kurund Jalmi [Tue, 21 May 2013 01:34:17 +0000 (21:34 -0400)]

CRM-12466, re-generate data for changes in civicrm_data.tpl

commit | commitdiff | tree

Kurund Jalmi [Tue, 21 May 2013 00:45:02 +0000 (20:45 -0400)]

CRM-12466, added smart group pane

commit | commitdiff | tree

Kurund Jalmi [Mon, 20 May 2013 04:07:52 +0000 (00:07 -0400)]

more work on CRM-12466

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Sun, 19 May 2013 02:33:03 +0000 (22:33 -0400)]

template cleanip

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 20:55:32 +0000 (16:55 -0400)]

remove obsolete code

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 06:09:38 +0000 (02:09 -0400)]

CRM-12466, layout fix and added inline help

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 06:01:08 +0000 (02:01 -0400)]

CRM-12466 fixed default option for new installs

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 05:35:22 +0000 (01:35 -0400)]

CRM-12466, fixed saving of radio options

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 05:31:34 +0000 (01:31 -0400)]

CRM-12466, worked on form building

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 05:22:31 +0000 (01:22 -0400)]

tempalate cleanup

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 04:33:56 +0000 (00:33 -0400)]

code cleanup

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Donald A. Lobo [Mon, 20 May 2013 20:39:30 +0000 (13:39 -0700)]

fix more php5.3 notices

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

dlobo [Mon, 20 May 2013 18:08:38 +0000 (11:08 -0700)]

Merge pull request #809 from dlobo/CRM-12667

CRM-12667

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Edsel [Mon, 20 May 2013 12:29:03 +0000 (17:59 +0530)]

CRM-12664 --Fix for Grant Delete notification

commit | commitdiff | tree

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

commit | commitdiff | tree

Pratik Joshi [Mon, 20 May 2013 08:54:14 +0000 (14:24 +0530)]

fix for CRM-11310 : applied patch

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Tim Otten [Mon, 20 May 2013 03:32:13 +0000 (23:32 -0400)]

CRM_Utils_Migrate_Import - Fix static warning

commit | commitdiff | tree

Tim Otten [Mon, 20 May 2013 01:57:53 +0000 (21:57 -0400)]

CRM_Utils_Migrate_Export - Allow cherry-picking of CustomGroups for export

commit | commitdiff | tree

Kurund Jalmi [Sun, 19 May 2013 23:52:48 +0000 (16:52 -0700)]

Merge pull request #797 from dlobo/CRM-12172

CRM-12172

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Sun, 19 May 2013 05:50:52 +0000 (01:50 -0400)]

revert bad merge cb9721555f0f1f044ca688c66461ab59b69bbe41

commit | commitdiff | tree

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

commit | commitdiff | tree

Coleman Watts [Sat, 18 May 2013 23:26:40 +0000 (18:26 -0500)]

Fix for contributions only CRM-12610

commit | commitdiff | tree

Coleman Watts [Sat, 18 May 2013 22:55:47 +0000 (17:55 -0500)]

Possible fix for CRM-12589

commit | commitdiff | tree

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...

commit | commitdiff | tree

Kurund Jalmi [Sat, 18 May 2013 13:46:00 +0000 (06:46 -0700)]

Merge pull request #791 from dlobo/CRM-9855

CRM-9855

commit | commitdiff | tree

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

commit | commitdiff | tree

dlobo [Sat, 18 May 2013 00:53:49 +0000 (17:53 -0700)]

Merge pull request #790 from JoeMurray/CRM-12657

fix crmaccordions to crmAccordions

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Kurund Jalmi [Fri, 17 May 2013 20:26:27 +0000 (13:26 -0700)]

Merge pull request #787 from eileenmcnaughton/whitespacelimited

Whitespacelimited

commit | commitdiff | tree

eileen [Mon, 13 May 2013 02:30:59 +0000 (14:30 +1200)]

CRM-12595 fix formatting in remaing files

commit | commitdiff | tree

eileen [Mon, 13 May 2013 02:30:03 +0000 (14:30 +1200)]

CRM-12595 fix formatting in CRM/P* files

commit | commitdiff | tree

eileen [Mon, 13 May 2013 02:29:32 +0000 (14:29 +1200)]

CRM-12595 fix formatting in CRM/Report files