dlobo [Mon, 17 Feb 2014 01:02:03 +0000 (17:02 -0800)]
Merge pull request #2528 from fuzionnz/CRM-14228
CRM-14228. Correct spelling of Waikato.
Chris Burgess [Sun, 16 Feb 2014 02:26:33 +0000 (15:26 +1300)]
CRM-14228. Correct spelling of Waikato.
dlobo [Fri, 14 Feb 2014 19:42:50 +0000 (11:42 -0800)]
Merge pull request #2525 from mattrenner/payexpress-dps-strict-compatibility
CRM-14221 - Improving Payment Express/DPS payment processor strict stand...
Matt Renner [Fri, 14 Feb 2014 03:49:50 +0000 (16:49 +1300)]
CRM-14221 - Improving Payment Express/DPS payment processor strict standards compatibility
I'm running a fairly recent version of PHP, and have strict standards turned on.. so the Payment Express component was spewing warnings and errors about non-static functions being called statically and the singleton function not being compatible with its parent.
The solution, make the CRM_Core_Payment_PaymentExpressUtils functions static, and change the definition of the CRM_Core_Payment_PaymentExpress and CRM_Core_Payment_PaymentExpressIPN singleton() functions to match that in CRM_Core_Payment
I also discovered an undefined CURL option in CRM_Core_Payment_PaymentExpressUtils that was being set - This doesn't do anything and causes a warning so I removed it.
colemanw [Fri, 14 Feb 2014 02:50:50 +0000 (18:50 -0800)]
Merge pull request #2524 from colemanw/multiEntityRef
Autocomplete work
Coleman Watts [Fri, 14 Feb 2014 01:06:59 +0000 (17:06 -0800)]
CRM-13929 Add contact icon to autocomplete results
Coleman Watts [Fri, 14 Feb 2014 00:37:06 +0000 (16:37 -0800)]
CRM-13929 Fix add new js
Coleman Watts [Fri, 14 Feb 2014 00:26:03 +0000 (16:26 -0800)]
Actvity tpl cleanup
Coleman Watts [Fri, 14 Feb 2014 00:19:29 +0000 (16:19 -0800)]
Fix icon positioning - should all be multiples of 16
Coleman Watts [Fri, 14 Feb 2014 00:03:13 +0000 (16:03 -0800)]
CRM-13929 Decouple entityRef field rendering from CRM_Core_Form
Coleman Watts [Thu, 13 Feb 2014 23:54:46 +0000 (15:54 -0800)]
CRM-13929 Refactor activity form contactRef fields
Kurund Jalmi [Thu, 13 Feb 2014 21:52:11 +0000 (13:52 -0800)]
Merge pull request #2518 from PoonamNalawade/test-master
--Added contact_type parameter for ajax autocomplete field
Kurund Jalmi [Thu, 13 Feb 2014 21:51:13 +0000 (13:51 -0800)]
Merge pull request #2515 from colemanw/ac3
CRM-14165 - HR-221 Further abstract options editing to work with civiHR
Kurund Jalmi [Thu, 13 Feb 2014 21:32:16 +0000 (13:32 -0800)]
Merge pull request #2521 from kurund/CRM-14181
CRM-14181, migrate enum to varchar
kurund [Thu, 13 Feb 2014 21:28:13 +0000 (13:28 -0800)]
CRM-14181, more clean and fixes to support callback
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Dave Greenberg [Thu, 13 Feb 2014 21:24:23 +0000 (13:24 -0800)]
Merge pull request #2520 from davecivicrm/CRM-14193
CRM-14193 - Add CiviMail component setting to control Dedupe Mailings op...
Dave Greenberg [Thu, 13 Feb 2014 21:21:11 +0000 (13:21 -0800)]
CRM-14193 - Add CiviMail component setting to control Dedupe Mailings option. This PR replaces PR 2497 which had fatal syntax error (missing comma) in Mailing.setting.php
----------------------------------------
* CRM-14193: Add option to default Civimail "dedupe e-mail" setting to true
http://issues.civicrm.org/jira/browse/CRM-14193
kurund [Thu, 13 Feb 2014 20:35:04 +0000 (12:35 -0800)]
CRM-14181, gencode fixes to generate correct DAO and modified pseudoconstant to handle callback
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Thu, 13 Feb 2014 19:43:36 +0000 (11:43 -0800)]
CRM-13929 Update contactRef renderer
Kurund Jalmi [Thu, 13 Feb 2014 18:11:15 +0000 (10:11 -0800)]
Merge pull request #2519 from jitendrapurohit/CRM-13833
Removal of copy icon and is_default expose in edit form of Soft Credit t...
jitendrapurohit [Thu, 13 Feb 2014 12:58:46 +0000 (18:28 +0530)]
Removal of copy icon and is_default expose in edit form of Soft Credit type
Coleman Watts [Thu, 13 Feb 2014 07:06:11 +0000 (23:06 -0800)]
CRM-13929 - Develop entityRef create mode
Coleman Watts [Thu, 13 Feb 2014 07:03:06 +0000 (23:03 -0800)]
Update campaign field labels
Poonam [Thu, 13 Feb 2014 06:00:35 +0000 (11:30 +0530)]
--Added contact_type parameter for ajax autocomplete field
kurund [Thu, 13 Feb 2014 05:53:36 +0000 (21:53 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Thu, 13 Feb 2014 05:06:41 +0000 (21:06 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Dave Greenberg [Thu, 13 Feb 2014 01:48:16 +0000 (17:48 -0800)]
Merge pull request #2516 from davecivicrm/CRM-13965
CRM-13965 - label, status and display changes for AdditionalPayment form...
Dave Greenberg [Thu, 13 Feb 2014 01:47:26 +0000 (17:47 -0800)]
CRM-13965 - label, status and display changes for AdditionalPayment form.
----------------------------------------
* CRM-13965: Record additional payments or refunds for pending-pay later OR partially paid event registrations
http://issues.civicrm.org/jira/browse/CRM-13965
Coleman Watts [Wed, 12 Feb 2014 23:47:30 +0000 (15:47 -0800)]
CRM-14165 - HR-221 Further abstract options editing to work with civiHR
colemanw [Wed, 12 Feb 2014 19:41:59 +0000 (11:41 -0800)]
Merge pull request #2514 from colemanw/ac2
CRM-13966 - Work on autocomplete refactoring
Coleman Watts [Wed, 12 Feb 2014 19:00:25 +0000 (11:00 -0800)]
CRM-13966 - Refactor group org autocomplete
Kurund Jalmi [Wed, 12 Feb 2014 14:38:44 +0000 (06:38 -0800)]
Merge pull request #2513 from jitendrapurohit/CRM-14183
CRM-14183
jitendrapurohit [Wed, 12 Feb 2014 08:18:27 +0000 (13:48 +0530)]
CRM-14183
Coleman Watts [Wed, 12 Feb 2014 00:55:39 +0000 (16:55 -0800)]
CRM-13966 - default size for entityRef fields
Coleman Watts [Wed, 12 Feb 2014 00:49:17 +0000 (16:49 -0800)]
CRM-13966 - Refactor member org autocomplete
kurund [Tue, 11 Feb 2014 22:55:36 +0000 (14:55 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Tue, 11 Feb 2014 22:45:13 +0000 (14:45 -0800)]
CRM-14181, add callback function, so that enums are accessible via api etc
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Dave Greenberg [Tue, 11 Feb 2014 22:16:49 +0000 (14:16 -0800)]
Merge pull request #2507 from lcdservices/CRM-14204
CRM-14204 fix schedule reminder subject tokens
Dave Greenberg [Tue, 11 Feb 2014 22:08:53 +0000 (14:08 -0800)]
Merge pull request #2505 from lcdservices/CRM-14202
CRM-14202 allow scheduled reminder to be set for today
Coleman Watts [Tue, 11 Feb 2014 19:56:37 +0000 (11:56 -0800)]
CRM-13966 - Style select2 results with description field
Brian Shaughnessy [Tue, 11 Feb 2014 18:52:52 +0000 (13:52 -0500)]
CRM-14204 fix schedule reminder subject tokens
Coleman Watts [Tue, 11 Feb 2014 17:40:53 +0000 (09:40 -0800)]
CRM-13966 - Wire up contact api to getlist api
Brian Shaughnessy [Tue, 11 Feb 2014 16:26:10 +0000 (11:26 -0500)]
CRM-14202 allow scheduled reminder to be set for today
Tim Otten [Tue, 11 Feb 2014 16:20:30 +0000 (08:20 -0800)]
Merge pull request #2504 from donquixote/donquixote
Docblock improvements and more in CRM_Core_Config and other classes.
Andreas Hennings [Tue, 11 Feb 2014 15:32:24 +0000 (16:32 +0100)]
Mark a possible bug in CRM_Utils_Hook.
Andreas Hennings [Tue, 11 Feb 2014 15:31:58 +0000 (16:31 +0100)]
Eliminate unnecessary local variable $userSystem.
Andreas Hennings [Tue, 11 Feb 2014 15:31:20 +0000 (16:31 +0100)]
Docblock and newline improvements in CRM_Core_Config and CRM_Utils_Hook. The IDE likes it.
Andreas Hennings [Tue, 11 Feb 2014 14:43:37 +0000 (15:43 +0100)]
Add undeclared property CRM_Core_Config::\customPHPPathDir
Andreas Hennings [Tue, 11 Feb 2014 14:29:46 +0000 (15:29 +0100)]
Docblock fix in CRM_Core_Config: type hint for $userSystem should be CRM_Utils_System_Base. TODO: Introduce an interface.
Andreas Hennings [Tue, 11 Feb 2014 14:21:03 +0000 (15:21 +0100)]
Replace fancy $$varname with actual varnames, to be nice to the IDE.
Coleman Watts [Tue, 11 Feb 2014 04:23:06 +0000 (20:23 -0800)]
CRM-13966 - Wire up getlist api to entityRef fields
kurund [Mon, 10 Feb 2014 18:52:32 +0000 (10:52 -0800)]
CRM-14181, remove special handing for enums
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Mon, 10 Feb 2014 18:25:07 +0000 (10:25 -0800)]
CRM-13929 - Fix date range clear links
Coleman Watts [Mon, 10 Feb 2014 18:18:28 +0000 (10:18 -0800)]
CRM-13966 - Form cleanup
Coleman Watts [Mon, 10 Feb 2014 18:01:57 +0000 (10:01 -0800)]
CRM-13966 CRM-14165 - cleanup CRM_Core_Form::addSelect function
Coleman Watts [Mon, 10 Feb 2014 04:07:17 +0000 (20:07 -0800)]
CRM-13966 - select2 improvements
Coleman Watts [Sun, 9 Feb 2014 22:35:29 +0000 (14:35 -0800)]
CRM-13966 - Add select2 to grant, participant forms
Coleman Watts [Sun, 9 Feb 2014 21:41:40 +0000 (13:41 -0800)]
Add api generic getlist
Coleman Watts [Sun, 9 Feb 2014 21:36:47 +0000 (13:36 -0800)]
Remove old deprecated fn alias
Kurund Jalmi [Sun, 9 Feb 2014 23:10:29 +0000 (15:10 -0800)]
Merge pull request #2498 from kurund/CRM-14181
CRM-14181, fixed generated data
kurund [Sun, 9 Feb 2014 23:07:50 +0000 (15:07 -0800)]
CRM-14181, fixed generated data
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Kurund Jalmi [Sun, 9 Feb 2014 22:31:52 +0000 (14:31 -0800)]
Merge pull request #2496 from kurund/CRM-14181
CRM-14181, migrate enum to varchar
Coleman Watts [Sun, 9 Feb 2014 21:40:51 +0000 (13:40 -0800)]
Code cleanup
kurund [Sun, 9 Feb 2014 09:09:55 +0000 (01:09 -0800)]
CRM-14181 fixes, deleted addDisplayEnums() and code fixes
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
colemanw [Sun, 9 Feb 2014 05:22:11 +0000 (21:22 -0800)]
Merge pull request #2492 from colemanw/ac
Work on js widgets
Coleman Watts [Sun, 9 Feb 2014 02:02:58 +0000 (18:02 -0800)]
CRM-13966 - select2 for survey/campaign forms
Coleman Watts [Sun, 9 Feb 2014 01:25:11 +0000 (17:25 -0800)]
CRM-13966 - select2 for more forms
colemanw [Sun, 9 Feb 2014 01:22:06 +0000 (17:22 -0800)]
Merge pull request #2495 from civicrm/4.4
Merge branch 4.4 into master
colemanw [Sun, 9 Feb 2014 01:21:29 +0000 (17:21 -0800)]
Merge pull request #2494 from colemanw/4.4
Add missing metadata
Coleman Watts [Sun, 9 Feb 2014 01:16:30 +0000 (17:16 -0800)]
Add missing metadata
kurund [Sat, 8 Feb 2014 20:26:38 +0000 (12:26 -0800)]
CRM-14181 fixes, deleted tsEnum() and code fixes
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Sat, 8 Feb 2014 19:58:43 +0000 (11:58 -0800)]
CRM-14181 fixes, deleted unused getEnums()
----------------------------------------
* CRM-14181: migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Sat, 8 Feb 2014 19:49:59 +0000 (11:49 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Sat, 8 Feb 2014 19:16:36 +0000 (11:16 -0800)]
CRM-13929 - Improve calendar clear button
kurund [Sat, 8 Feb 2014 19:15:03 +0000 (11:15 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Sat, 8 Feb 2014 06:54:41 +0000 (22:54 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Sat, 8 Feb 2014 05:39:18 +0000 (21:39 -0800)]
CRM-13966 - CRM-14165 - Add select2 & popup links for custom fields
Coleman Watts [Sat, 8 Feb 2014 04:23:23 +0000 (20:23 -0800)]
CRM-13970 - Option form url fix & test cleanup
Coleman Watts [Sat, 8 Feb 2014 00:17:42 +0000 (16:17 -0800)]
CRM-13966 - select2 style tweaks
Coleman Watts [Fri, 7 Feb 2014 22:23:43 +0000 (14:23 -0800)]
Remove overlay.tpl
Coleman Watts [Fri, 7 Feb 2014 21:57:11 +0000 (13:57 -0800)]
CRM-13966 CRM-14165 - Use $form->addSelect for contact edit fields
kurund [Sat, 8 Feb 2014 01:05:08 +0000 (17:05 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Sat, 8 Feb 2014 01:02:41 +0000 (17:02 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
kurund [Sat, 8 Feb 2014 00:41:18 +0000 (16:41 -0800)]
CRM-14181 fixes - migrate enums to varchar in schema for all tables
http://issues.civicrm.org/jira/browse/CRM-14181
Coleman Watts [Fri, 7 Feb 2014 21:42:16 +0000 (13:42 -0800)]
CRM-13966 - Use select2 for date range
Coleman Watts [Fri, 7 Feb 2014 21:31:14 +0000 (13:31 -0800)]
CRM-13929 - Parameterize radio clear widget
Coleman Watts [Fri, 7 Feb 2014 18:38:02 +0000 (10:38 -0800)]
CRM-13966 - Style regular selects to more or less match select2
Coleman Watts [Fri, 7 Feb 2014 17:36:47 +0000 (09:36 -0800)]
Add documentation link to code comments
Coleman Watts [Fri, 7 Feb 2014 17:10:50 +0000 (09:10 -0800)]
CRM-13929 - Centralize and simplify radio clear widget
Coleman Watts [Fri, 7 Feb 2014 00:56:18 +0000 (16:56 -0800)]
CRM-14165 - Improve lookup and styling of options edit link
Coleman Watts [Thu, 6 Feb 2014 22:42:53 +0000 (14:42 -0800)]
Fix api wrapper to fetch metadata from getoptions request
Coleman Watts [Fri, 7 Feb 2014 22:07:27 +0000 (14:07 -0800)]
Merge branch '4.4' of https://github.com/civicrm/civicrm-core
Conflicts:
sql/civicrm_generated.mysql
templates/CRM/Activity/Form/Task/AddToTag.tpl
xml/version.xml
Coleman Watts [Fri, 7 Feb 2014 21:49:41 +0000 (13:49 -0800)]
IM.xml - Add missing metadata
CiviCRM [Fri, 7 Feb 2014 03:34:59 +0000 (19:34 -0800)]
Update version to 4.4.5
Kurund Jalmi [Fri, 7 Feb 2014 03:21:58 +0000 (19:21 -0800)]
Merge pull request #2466 from totten/4.4-dashboard-api-fix
CRM-13889 - api_v3_DashboardContact - Fix validation
Tim Otten [Fri, 7 Feb 2014 03:20:06 +0000 (19:20 -0800)]
Merge pull request #2489 from totten/4.4-restrictBrowsing-defensive
CRM-14092 - restrictBrowsing - Defensive programming
Kurund Jalmi [Fri, 7 Feb 2014 03:12:36 +0000 (19:12 -0800)]
Merge pull request #2491 from kurund/CRM-13958
CRM-13958, fixed indentation for DAO's
kurund [Fri, 7 Feb 2014 03:07:50 +0000 (19:07 -0800)]
CRM-13958, fixed indentation for DAO's
----------------------------------------
* CRM-13958: DAO's generated are not indented correctly
http://issues.civicrm.org/jira/browse/CRM-13958
colemanw [Fri, 7 Feb 2014 01:20:31 +0000 (17:20 -0800)]
Merge pull request #2490 from colemanw/4.4
CRM-10466 - Ensure token hooks are always called
Coleman Watts [Fri, 7 Feb 2014 01:14:23 +0000 (17:14 -0800)]
CRM-10466 - Ensure token hooks are always called
projects / civicrm-core.git / log