deepak-srivastava [Thu, 9 May 2013 13:22:36 +0000 (06:22 -0700)]
Merge pull request #696 from deepak-srivastava/mastro
CRM-12490 - notice fixes
Deepak Srivastava [Thu, 9 May 2013 11:45:05 +0000 (17:15 +0530)]
CRM-12490 - notice fixes
Kurund Jalmi [Thu, 9 May 2013 05:45:14 +0000 (22:45 -0700)]
Merge pull request #694 from ravishnair/CRM-12528
-- CRM-12528 Added campaign column and filter to reports
Kurund Jalmi [Thu, 9 May 2013 05:44:52 +0000 (22:44 -0700)]
Merge pull request #693 from lcdservices/activity-perms
CRM-12569 permission activity links and tasks more accurately
Ravish Nair [Thu, 9 May 2013 04:57:49 +0000 (10:27 +0530)]
-- CRM-12528 Added campaign column and filter to reports
Brian Shaughnessy [Thu, 9 May 2013 03:50:39 +0000 (23:50 -0400)]
CRM-12569 permission activity links and tasks more accurately
Dave Greenberg [Thu, 9 May 2013 00:39:01 +0000 (17:39 -0700)]
Merge pull request #691 from eileenmcnaughton/datefn
CRM-12053 rationalisation of datefilter functions
Note: I tested this locally earlier today and seems to fix the problems w/ search forms.
Kurund Jalmi [Thu, 9 May 2013 00:10:28 +0000 (17:10 -0700)]
Merge pull request #692 from kurund/CRM-12458
undo last merge:
5a10656d1e6f02ef543375e974b2439c50f3f66d
Kurund Jalmi [Thu, 9 May 2013 00:08:37 +0000 (17:08 -0700)]
undo last merge
eileen [Wed, 8 May 2013 23:52:40 +0000 (11:52 +1200)]
Remove all eval instances where eval is being used to instantiate a new object using a variable as the name
eileen [Fri, 26 Apr 2013 05:58:06 +0000 (17:58 +1200)]
CRM-12432 allow filters to be marked to be skipped by the where clause constructor
eileen [Fri, 26 Apr 2013 05:56:01 +0000 (17:56 +1200)]
CRM-12432 make split out the extracting of where functions from the construction of the where clause
eileen [Wed, 8 May 2013 22:03:49 +0000 (10:03 +1200)]
De-hack additional operators being added for report class only
The buildDate range function is called about 20 times with no additional
operators being added & twice with them being added. But the default
behaviour was to add them. This makes the default behaviour NOT to add
them & makes the one class that does add them take responsibility for
passing them in rather than a round about method of deriving them
eileen [Fri, 26 Apr 2013 05:58:06 +0000 (17:58 +1200)]
CRM-12432 allow filters to be marked to be skipped by the where clause constructor
eileen [Fri, 26 Apr 2013 05:56:01 +0000 (17:56 +1200)]
CRM-12432 make split out the extracting of where functions from the construction of the where clause
Kurund Jalmi [Wed, 8 May 2013 22:13:29 +0000 (15:13 -0700)]
Merge pull request #690 from yashodha/4.3.CRM-12458
CRM-12458
Tim Otten [Wed, 8 May 2013 21:28:31 +0000 (14:28 -0700)]
Merge pull request #689 from totten/phpunit-crash-utils
api/v3/utils - Fix bad variable reference which causes PHPUnit to crash
yashodha [Wed, 8 May 2013 21:13:15 +0000 (02:43 +0530)]
CRM-12458
Tim Otten [Wed, 8 May 2013 21:27:04 +0000 (14:27 -0700)]
api/v3/utils - Fix bad variable reference which causes PHPUnit to crash
Kurund Jalmi [Wed, 8 May 2013 21:12:42 +0000 (14:12 -0700)]
Merge pull request #686 from totten/mktest-mail
mk-drupal-test-site - Write outgoing mails to /dev/null
colemanw [Wed, 8 May 2013 20:51:05 +0000 (13:51 -0700)]
Merge pull request #688 from colemanw/CRM-12471
Look before leaping when flushing pseudoconstants CRM-12471
Coleman Watts [Wed, 8 May 2013 20:48:51 +0000 (13:48 -0700)]
Look before leaping when flushing pseudoconstants CRM-12471
Tim Otten [Wed, 8 May 2013 19:28:15 +0000 (12:28 -0700)]
Merge pull request #687 from totten/http-array-error
HttpClient - Fix bad return format
Tim Otten [Wed, 8 May 2013 19:26:04 +0000 (12:26 -0700)]
HttpClient - Fix bad return format
Tim Otten [Wed, 8 May 2013 18:41:47 +0000 (18:41 +0000)]
mk-drupal-test-site - Write outgoing mails to /dev/null
Kurund Jalmi [Wed, 8 May 2013 18:07:01 +0000 (11:07 -0700)]
Merge pull request #685 from kurund/CRM-12512
removed obsolete code that tried to create duplicate assignee contacts, ...
Kurund Jalmi [Wed, 8 May 2013 18:06:01 +0000 (11:06 -0700)]
removed obsolete code that tried to create duplicate assignee contacts, CRM-12512
Tim Otten [Wed, 8 May 2013 17:19:18 +0000 (10:19 -0700)]
Merge pull request #670 from pratik-joshi/CRM-12503
CRM-12503
Kurund Jalmi [Wed, 8 May 2013 17:19:07 +0000 (10:19 -0700)]
Merge pull request #679 from davecivicrm/CRM-12397
Add back in the NONE option for additional participant profile bottom sl...
Kurund Jalmi [Wed, 8 May 2013 17:14:03 +0000 (10:14 -0700)]
Merge pull request #678 from yashodha/SOFT
Soft
Kurund Jalmi [Wed, 8 May 2013 17:07:39 +0000 (10:07 -0700)]
Merge pull request #682 from kirkatcaat/master
Render line breaks in event registration Note field (CRM-12561)
Kurund Jalmi [Wed, 8 May 2013 16:06:54 +0000 (09:06 -0700)]
Merge pull request #681 from GiantRobot/CRM-12560
Fix CRM-12560 by matching test trxn_ids only which can be incremented.
dlobo [Wed, 8 May 2013 14:09:08 +0000 (07:09 -0700)]
Merge pull request #683 from dlobo/CRM-12558
CRM-12558
Donald A. Lobo [Wed, 8 May 2013 14:07:48 +0000 (07:07 -0700)]
CRM-12558
----------------------------------------
* CRM-12558: Ensure CRM/Utils/DeprecatedUtils.php is required
http://issues.civicrm.org/jira/browse/CRM-12558
deepak-srivastava [Wed, 8 May 2013 14:02:06 +0000 (07:02 -0700)]
Merge pull request #576 from eileenmcnaughton/CRM-12053
CRM-12053 fix operators back to non-static
Kirk Jackson [Wed, 8 May 2013 11:26:01 +0000 (12:26 +0100)]
Render line breaks in event registration Note field. (CRM-12561)
Chris Burgess [Wed, 8 May 2013 02:42:41 +0000 (14:42 +1200)]
Fix CRM-12560 by matching test trxn_ids only which can be incremented.
yashodha [Wed, 8 May 2013 00:30:21 +0000 (06:00 +0530)]
notice fix
dlobo [Wed, 8 May 2013 00:29:07 +0000 (17:29 -0700)]
Merge pull request #514 from adamwight/cache_acl_entityTable
Cache CRM_ACL_BAO_ACL::entityTable per-request
yashodha [Wed, 8 May 2013 00:01:33 +0000 (05:31 +0530)]
more fixes
Dave Greenberg [Wed, 8 May 2013 00:04:50 +0000 (17:04 -0700)]
Add back in the NONE option for additional participant profile bottom slots. The option to NOT have a second profile for additional participants was lost in a regression between 4.1 and 4.2.
Kurund Jalmi [Wed, 8 May 2013 00:01:27 +0000 (17:01 -0700)]
Merge pull request #676 from yashodha/SOFT
final clean up(CRM-12463)
dlobo [Tue, 7 May 2013 23:39:11 +0000 (16:39 -0700)]
Merge pull request #675 from dlobo/CRM-12558
CRM-12558
eileen [Tue, 7 May 2013 23:38:57 +0000 (11:38 +1200)]
CRM-12557 - ACL users cannot see removed , pending groups on contact summary tab
Donald A. Lobo [Tue, 7 May 2013 23:37:56 +0000 (16:37 -0700)]
CRM-12558
----------------------------------------
* CRM-12558: Ensure CRM/Utils/DeprecatedUtils.php is required
http://issues.civicrm.org/jira/browse/CRM-12558
yashodha [Tue, 7 May 2013 23:37:31 +0000 (05:07 +0530)]
final clean up(CRM-12463)
colemanw [Tue, 7 May 2013 22:27:56 +0000 (15:27 -0700)]
Merge pull request #674 from totten/upgrade-messages
CRM-12549 - Restore upgrade message
Tim Otten [Tue, 7 May 2013 22:22:39 +0000 (15:22 -0700)]
CRM_Core_Sessio - Doc tweak
Tim Otten [Tue, 7 May 2013 22:22:04 +0000 (15:22 -0700)]
CRM-12549 - Restore upgrade message
----------------------------------------
* CRM-12549: Upgrade isn't displaying $message on success.tpl
http://issues.civicrm.org/jira/browse/CRM-12549
colemanw [Tue, 7 May 2013 22:14:45 +0000 (15:14 -0700)]
Merge pull request #673 from eileenmcnaughton/4.3
CRM-12550 avoid extraneous log_civicrm_email entries
eileen [Tue, 7 May 2013 21:43:20 +0000 (09:43 +1200)]
CRM-12550 avoid extraneous log_civicrm_email entries
Kurund Jalmi [Tue, 7 May 2013 18:19:21 +0000 (11:19 -0700)]
Merge pull request #672 from kurund/CRM-12515
worked on CRM-12515, fixed the icon button for offiline mode / when bill...
Kurund Jalmi [Tue, 7 May 2013 18:17:18 +0000 (11:17 -0700)]
worked on CRM-12515, fixed the icon button for offiline mode / when billing block is laoded via ajax
Kurund Jalmi [Tue, 7 May 2013 18:10:42 +0000 (11:10 -0700)]
Merge pull request #639 from mlutfy/cc-icons
CRM-12515: improve how credit card types/numbers are handled
Tim Otten [Tue, 7 May 2013 17:00:47 +0000 (10:00 -0700)]
Merge pull request #671 from totten/rest-comments
WebTest_Utils_Rest - Comments
Tim Otten [Tue, 7 May 2013 16:59:47 +0000 (09:59 -0700)]
WebTest_Utils_Rest - Comments
Kurund Jalmi [Tue, 7 May 2013 06:44:51 +0000 (23:44 -0700)]
updated .gitignore
Pratik Joshi [Tue, 7 May 2013 06:36:07 +0000 (12:06 +0530)]
CRM-12503
Kurund Jalmi [Tue, 7 May 2013 05:58:50 +0000 (22:58 -0700)]
Merge pull request #668 from kurund/notice-fixes
notice fixes
Kurund Jalmi [Tue, 7 May 2013 05:55:07 +0000 (22:55 -0700)]
notice fixes
Kurund Jalmi [Tue, 7 May 2013 04:57:42 +0000 (21:57 -0700)]
Merge pull request #666 from totten/pull-request-638
Remove REST code
Kurund Jalmi [Tue, 7 May 2013 04:54:50 +0000 (21:54 -0700)]
Merge pull request #667 from kurund/CRM-12437
patched CRM-12437
Kurund Jalmi [Tue, 7 May 2013 04:54:02 +0000 (21:54 -0700)]
patched CRM-12437
Tim Otten [Tue, 7 May 2013 03:08:13 +0000 (20:08 -0700)]
WebTest_Utils_RestTest - Remove disabled tests
Tim Otten [Tue, 7 May 2013 03:06:18 +0000 (20:06 -0700)]
CRM_Utils_REST - Fix regression of "?q=civicrm/X/Y"
Tim Otten [Tue, 7 May 2013 02:55:23 +0000 (19:55 -0700)]
CRM_Utils_REST - Remove dead code. Allow loadCMSBootstrap to send well-formed errors
Kurund Jalmi [Tue, 7 May 2013 00:40:01 +0000 (17:40 -0700)]
Merge pull request #664 from yashodha/soft-cre
CRM-12463
Tim Otten [Tue, 7 May 2013 00:15:05 +0000 (17:15 -0700)]
extern/rest.php - Refactor (in anticipation of producing better errors during bootstrap)
Tim Otten [Mon, 6 May 2013 23:39:35 +0000 (16:39 -0700)]
CRM_Utils_REST - Fix PHP warning
Tim Otten [Mon, 6 May 2013 23:23:43 +0000 (16:23 -0700)]
Merge pull request #665 from adamwight/groupId_in_CustomFieldTest
fix unit test by... using deprecated param name :p
Adam Roses Wight [Mon, 6 May 2013 23:05:03 +0000 (16:05 -0700)]
fix unit test by... using deprecated param name :p
Chris Doten [Thu, 2 May 2013 22:50:11 +0000 (18:50 -0400)]
Cleanup
Chris Doten [Thu, 2 May 2013 22:09:31 +0000 (18:09 -0400)]
Removed old user/pass login ability for authenticating to API
Chris Doten [Thu, 2 May 2013 21:12:25 +0000 (17:12 -0400)]
minor changes
Debian Live user [Thu, 2 May 2013 21:08:15 +0000 (17:08 -0400)]
Adding comments, playing with REST
yashodha [Mon, 6 May 2013 22:46:44 +0000 (04:16 +0530)]
CRM-12463
Kurund Jalmi [Mon, 6 May 2013 21:02:45 +0000 (14:02 -0700)]
Merge pull request #663 from kurund/CRM-10592
CRM-10592
Kurund Jalmi [Mon, 6 May 2013 20:57:38 +0000 (13:57 -0700)]
manually merged work on CRM-10592, #527
Kurund Jalmi [Mon, 6 May 2013 19:23:46 +0000 (12:23 -0700)]
Merge pull request #660 from pradpnayak/CRM-12478
-- fixed for CRM-12478 and added condition with financial_account_type =...
Pradeep Nayak [Mon, 6 May 2013 18:59:49 +0000 (00:29 +0530)]
-- fixed for CRM-12478 and added condition with financial_account_type = Asset for assigning to_financial_account_id for default
----------------------------------------
* CRM-12478: Default for Financial Account should be per Financial Account Type
http://issues.civicrm.org/jira/browse/CRM-12478
Kurund Jalmi [Mon, 6 May 2013 18:15:40 +0000 (11:15 -0700)]
Merge pull request #581 from eileenmcnaughton/CRM-12472
CRM-12472 - Custom tables being needlessly left joined into reports if they include a date field
Kurund Jalmi [Mon, 6 May 2013 18:11:26 +0000 (11:11 -0700)]
Merge pull request #634 from mmikitka/crm-12399-integrate-official-twilio-library
CRM-12399: Integrate official Twilio PHP library with org.civicrm.sms.twilio
Kurund Jalmi [Mon, 6 May 2013 18:08:37 +0000 (11:08 -0700)]
Merge pull request #641 from yashodha/4.3.IPN
4.3.ipn
Kurund Jalmi [Mon, 6 May 2013 18:02:52 +0000 (11:02 -0700)]
Merge pull request #642 from pradpnayak/CRM-12501
--worked on CRA-12501, changed length/values for tax_rate from 9,8 to 10...
Kurund Jalmi [Mon, 6 May 2013 18:01:24 +0000 (11:01 -0700)]
Merge pull request #646 from pradpnayak/CRM-12511
--fixed for CRM-12511
Kurund Jalmi [Mon, 6 May 2013 17:38:10 +0000 (10:38 -0700)]
Merge pull request #650 from cdoten/CRM-12528
Crm 12528
Kurund Jalmi [Mon, 6 May 2013 17:19:30 +0000 (10:19 -0700)]
Merge pull request #645 from ergonlogic/master
Set full version in Drupal .info files
Kurund Jalmi [Mon, 6 May 2013 17:18:19 +0000 (10:18 -0700)]
Merge pull request #651 from demeritcowboy/misc4.3
CRM-12519
Kurund Jalmi [Mon, 6 May 2013 17:16:03 +0000 (10:16 -0700)]
Merge pull request #652 from dlobo/CRM-12533
CRM-12533
Kurund Jalmi [Mon, 6 May 2013 17:15:40 +0000 (10:15 -0700)]
Merge pull request #653 from dlobo/CRM-12534
CRM-12534
Kurund Jalmi [Mon, 6 May 2013 17:15:19 +0000 (10:15 -0700)]
Merge pull request #654 from dlobo/CRM-12535
CRM-12535
Kurund Jalmi [Mon, 6 May 2013 17:14:51 +0000 (10:14 -0700)]
Merge pull request #655 from dlobo/CRM-12526
CRM-12526
Kurund Jalmi [Mon, 6 May 2013 17:14:10 +0000 (10:14 -0700)]
Merge pull request #656 from dlobo/CRM-12494
CRM-12494
Kurund Jalmi [Mon, 6 May 2013 17:13:15 +0000 (10:13 -0700)]
Merge pull request #657 from dlobo/CRM-12525
CRM-12525
Kurund Jalmi [Mon, 6 May 2013 17:12:05 +0000 (10:12 -0700)]
Merge pull request #649 from yashodha/softCredit
Soft credit
Kurund Jalmi [Mon, 6 May 2013 17:11:10 +0000 (10:11 -0700)]
Merge pull request #658 from yashodha/newSoft
notice fix
Kurund Jalmi [Mon, 6 May 2013 17:10:51 +0000 (10:10 -0700)]
Merge pull request #659 from deepak-srivastava/mastro
Fixes towards CRM-12490, performance improvements, adherence to options ...
Deepak Srivastava [Mon, 6 May 2013 14:44:34 +0000 (20:14 +0530)]
Fixes towards CRM-12490, performance improvements, adherence to options settings
yashodha [Mon, 6 May 2013 05:39:04 +0000 (11:09 +0530)]
notice fix
Donald A. Lobo [Sun, 5 May 2013 16:16:46 +0000 (09:16 -0700)]
CRM-12525
----------------------------------------
* CRM-12525: Hidden smart groups show in Groups view
http://issues.civicrm.org/jira/browse/CRM-12525
projects / civicrm-core.git / log