kurund [Tue, 21 Jan 2014 03:00:20 +0000 (19:00 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-20-19-00-14
Kurund Jalmi [Tue, 21 Jan 2014 02:38:34 +0000 (18:38 -0800)]
Merge pull request #2385 from kurund/CRM-13964
CRM-13964 CRM-13965 CRM-13973
kurund [Tue, 21 Jan 2014 02:10:59 +0000 (18:10 -0800)]
Merge branch 'CRM-13964' of git://github.com/pratik-joshi/civicrm-core into CRM-13964
Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
sql/civicrm_generated.mysql
----------------------------------------
* CRM-13964: New Event Registration with partial payment
http://issues.civicrm.org/jira/browse/CRM-13964
Kurund Jalmi [Tue, 21 Jan 2014 01:50:56 +0000 (17:50 -0800)]
Merge pull request #2367 from kurund/CRM-14082
preserve sorting for task actions, CRM-14082
Kurund Jalmi [Tue, 21 Jan 2014 01:48:36 +0000 (17:48 -0800)]
Merge pull request #2383 from kurund/CRM-13981
CRM-13981, generated data fixes and reverted bad commit
kurund [Mon, 20 Jan 2014 23:34:46 +0000 (15:34 -0800)]
Revert "CRM-13981, handling profile selector for mixed profile types in Edit and Copy case"
This reverts commit
13e4fbdd8df6c355ebb40e1ae63734ff6a5da10f.
kurund [Mon, 20 Jan 2014 22:52:07 +0000 (14:52 -0800)]
CRM-13981, default data fixes
----------------------------------------
* CRM-13981:
http://issues.civicrm.org/jira/browse/CRM-13981
Tim Otten [Mon, 20 Jan 2014 22:37:48 +0000 (14:37 -0800)]
Merge pull request #2382 from eileenmcnaughton/failing-test
Failing test
Eileen McNaughton [Mon, 20 Jan 2014 19:07:49 +0000 (08:07 +1300)]
Additional test on return.address_name
Dave Greenberg [Mon, 20 Jan 2014 16:32:28 +0000 (08:32 -0800)]
Merge pull request #2377 from ErichBSchulz/patch-2
vague words on record_type_id
Eileen McNaughton [Mon, 20 Jan 2014 11:55:20 +0000 (00:55 +1300)]
fix failing profile api test by preventing double-adding of same alias
Eileen McNaughton [Mon, 20 Jan 2014 11:28:02 +0000 (00:28 +1300)]
updated examples
Tim Otten [Mon, 20 Jan 2014 11:27:04 +0000 (03:27 -0800)]
Merge pull request #2381 from totten/4.4-absence-data-helpers
HR-226 - Add misc helpers
Tim Otten [Mon, 20 Jan 2014 11:22:10 +0000 (03:22 -0800)]
crm.backbone.js - Dial-down the delay on propagating changes from crmCriteriaModel to the collection
Eileen McNaughton [Mon, 20 Jan 2014 10:44:46 +0000 (23:44 +1300)]
fix failing test, check contribution creating with default date of now
colemanw [Mon, 20 Jan 2014 05:26:09 +0000 (21:26 -0800)]
Merge pull request #2379 from colemanw/api3
CRM-14093 - add CRM.api3 to rest.js
Coleman Watts [Mon, 20 Jan 2014 04:31:53 +0000 (20:31 -0800)]
CRM-14093 - add php & js unit tests for mutiple api call syntax
Coleman Watts [Mon, 20 Jan 2014 01:14:59 +0000 (17:14 -0800)]
CRM-14093 - prefetch searchBuilder options in bulk using CRM.api3
Coleman Watts [Mon, 20 Jan 2014 00:48:00 +0000 (16:48 -0800)]
CRM-13817 - CRM.status - hide if no endMsg
Coleman Watts [Mon, 20 Jan 2014 00:43:37 +0000 (16:43 -0800)]
CRM-14093 - CRM-13817 - Tag js - convert to use CRM.api3 and CRM.status
Coleman Watts [Mon, 20 Jan 2014 00:12:43 +0000 (16:12 -0800)]
CRM-14093 - add CRM.api3 to rest.js
Tim Otten [Mon, 20 Jan 2014 01:00:13 +0000 (17:00 -0800)]
Merge pull request #2378 from totten/4.4-absence-data-helpers
HR-238 - Helpers
Tim Otten [Mon, 20 Jan 2014 00:30:41 +0000 (16:30 -0800)]
crm.backbone.js - Allow collections to fetch records with alternative API actions
Tim Otten [Mon, 20 Jan 2014 00:29:58 +0000 (16:29 -0800)]
CRM_Utils_Array::product() - Helper to generate Cartesian products
Erich [Sun, 19 Jan 2014 09:54:41 +0000 (19:54 +1000)]
vague words on record_type_id
as discussed with Eileen [here](http://forum.civicrm.org/index.php/topic,31282.0.html)
Tim Otten [Sun, 19 Jan 2014 07:02:42 +0000 (23:02 -0800)]
Merge pull request #2376 from colemanw/removeOldTestCase
This file appears to be unused
Coleman Watts [Sun, 19 Jan 2014 06:09:50 +0000 (22:09 -0800)]
This file appears to be unused
colemanw [Sun, 19 Jan 2014 06:07:02 +0000 (22:07 -0800)]
Merge pull request #2375 from colemanw/master
Css fix for notifications
Coleman Watts [Sun, 19 Jan 2014 06:06:24 +0000 (22:06 -0800)]
Css fix for notifications
Tim Otten [Sun, 19 Jan 2014 01:20:23 +0000 (17:20 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-18-17-02-24
Conflicts:
CRM/Contribute/Form/Contribution/Main.php
api/v3/Generic/Setvalue.php
templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl
Tim Otten [Sun, 19 Jan 2014 00:57:48 +0000 (16:57 -0800)]
Merge pull request #2374 from totten/4.4-entitytype
--HR-224 Reinitialize entity cache during installation
Nileema [Fri, 17 Jan 2014 14:35:08 +0000 (20:05 +0530)]
--HR-224 Reinitialize entity cache during installation
Kurund Jalmi [Sat, 18 Jan 2014 00:20:50 +0000 (16:20 -0800)]
Merge pull request #2337 from NileemaJadhav/HR-235
-- HR-235 Import multi-value custom data
Kurund Jalmi [Sat, 18 Jan 2014 00:18:01 +0000 (16:18 -0800)]
Merge pull request #2373 from kurund/CRM-14070
CRM-14070, fixes - Suppress 'limit_to' drop down when Entity is 'Activit...
yashodha [Wed, 15 Jan 2014 10:23:08 +0000 (15:53 +0530)]
CRM-14070, fixes - Suppress 'limit_to' drop down when Entity is 'Activity'
http://issues.civicrm.org/jira/browse/CRM-14070
Kurund Jalmi [Fri, 17 Jan 2014 23:43:11 +0000 (15:43 -0800)]
Merge pull request #2372 from kurund/CRM-13981
CRM-13981, Migrate "In Honor of" to Soft Credits
monishdeb [Sat, 18 Jan 2014 20:19:54 +0000 (01:49 +0530)]
CRM-13981, handling profile selector for mixed profile types in Edit and Copy case
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
monishdeb [Thu, 16 Jan 2014 16:14:52 +0000 (21:44 +0530)]
Extended profileSelector and regen run generated data
monishdeb [Wed, 15 Jan 2014 13:20:34 +0000 (18:50 +0530)]
remove debug from ProfileContact
monishdeb [Wed, 15 Jan 2014 13:00:34 +0000 (18:30 +0530)]
CRM-13981 fix - Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
Conflicts:
CRM/Upgrade/Incremental/sql/4.5.alpha1.mysql.tpl
templates/CRM/Contribute/Form/SoftCredit.js
----------------------------------------
* CRM-13981: Migrate "In Honor of" to Soft Credits
http://issues.civicrm.org/jira/browse/CRM-13981
colemanw [Fri, 17 Jan 2014 21:54:51 +0000 (13:54 -0800)]
Merge pull request #2371 from mepps/add-softcredit-js-fix
CRM-14088:Fixed selector to show lines to add more softcredits in new co...
Maggie [Fri, 17 Jan 2014 21:26:28 +0000 (16:26 -0500)]
CRM-14088:Fixed selector to show lines to add more softcredits in new contribution screen
Dave Greenberg [Fri, 17 Jan 2014 20:02:49 +0000 (12:02 -0800)]
Merge pull request #2369 from davecivicrm/CRM-13998
CRM-13998 - upgrade checks for missing report_instance columns.
Dave Greenberg [Fri, 17 Jan 2014 19:59:01 +0000 (11:59 -0800)]
CRM-13998 - upgrade checks for missing report_instance columns.
----------------------------------------
* CRM-13998: Upgrade is missing alter statements for civicrm_report_instance
http://issues.civicrm.org/jira/browse/CRM-13998
colemanw [Fri, 17 Jan 2014 18:15:14 +0000 (10:15 -0800)]
Merge pull request #2360 from davecivicrm/CRM-14081
CRM-14081 - Alternate approach preserves useful focus behavior by defaul...
kurund [Fri, 17 Jan 2014 18:14:21 +0000 (10:14 -0800)]
preserve sorting for task actions, CRM-14082
----------------------------------------
* CRM-14082: Sort order is no longer honored by search actions
http://issues.civicrm.org/jira/browse/CRM-14082
Dave Greenberg [Fri, 17 Jan 2014 18:02:10 +0000 (10:02 -0800)]
Merge pull request #2365 from eileenmcnaughton/CRM-14080
CRM-14080 default to now
Nileema [Fri, 17 Jan 2014 07:13:13 +0000 (12:43 +0530)]
--HR-235 Modification for formrule warning
Tim Otten [Fri, 17 Jan 2014 06:20:04 +0000 (22:20 -0800)]
Merge pull request #2362 from totten/4.4-sync-redirect
CRM-14086 - CMSUser::synchronize - Allow execution of sync routine without redirect
deepak-srivastava [Fri, 17 Jan 2014 06:08:00 +0000 (22:08 -0800)]
Merge pull request #2289 from eileenmcnaughton/CRM-13918
CRM-13918 report_template.getrows api - add limit & offset per Deepak's comments
Tim Otten [Fri, 17 Jan 2014 05:42:00 +0000 (21:42 -0800)]
CRM-14086 - CMSUser::synchronize - Allow execution of sync routine without an HTTP redirect
colemanw [Fri, 17 Jan 2014 05:33:51 +0000 (21:33 -0800)]
Merge pull request #2361 from colemanw/status
CRM-13817 - Move logout menu item and add CRM.status()
Coleman Watts [Fri, 17 Jan 2014 05:30:26 +0000 (21:30 -0800)]
CRM-13817 - Move logout menu item and add CRM.status()
Pratik Joshi [Fri, 17 Jan 2014 04:57:53 +0000 (10:27 +0530)]
CRM-13973 : client side behavior improvement
Dave Greenberg [Fri, 17 Jan 2014 02:45:02 +0000 (18:45 -0800)]
CRM-14081 - Alternate approach preserves useful focus behavior by default and eliminates for soft credit block via new focus param for NewContact.tpl.
----------------------------------------
* CRM-14081: Create Contribution screen initially scrolls to and puts cursor in "Soft Credit" field
http://issues.civicrm.org/jira/browse/CRM-14081
Tim Otten [Fri, 17 Jan 2014 02:35:51 +0000 (18:35 -0800)]
Merge pull request #2359 from totten/4.4-dashboardcontactapi
CRM-13889 - api/v3/DashboardContact - Remove exemption for SyntaxConform...
Tim Otten [Fri, 17 Jan 2014 02:10:21 +0000 (18:10 -0800)]
CRM-13889 - api/v3/DashboardContact - Remove exemption for SyntaxConformanceTest. Fix bugs.
dlobo [Thu, 16 Jan 2014 21:42:50 +0000 (13:42 -0800)]
Merge pull request #2358 from dlobo/CRM-12882
CRM-12882 - Payment Processor passwords should be better hidden
Donald A. Lobo [Thu, 16 Jan 2014 21:41:38 +0000 (13:41 -0800)]
CRM-12882 - Payment Processor passwords should be better hidden
http://issues.civicrm.org/jira/browse/CRM-12882
dlobo [Thu, 16 Jan 2014 21:38:23 +0000 (13:38 -0800)]
Merge pull request #2311 from yashodha/sms-reminder
CRM-13912: added sms support for scheduled reminders
colemanw [Thu, 16 Jan 2014 17:57:07 +0000 (09:57 -0800)]
Merge pull request #2356 from colemanw/4.4
CRM-14028 - Workaround the number 0 == empty() php bug
Coleman Watts [Thu, 16 Jan 2014 17:56:28 +0000 (09:56 -0800)]
CRM-14028 - Workaround the number 0 == empty() php bug
colemanw [Thu, 16 Jan 2014 17:29:53 +0000 (09:29 -0800)]
Merge pull request #2350 from eileenmcnaughton/CRM-14012
CRM-14012 - Contribution total values incorrect for permissioned users i...
Pratik Joshi [Thu, 16 Jan 2014 12:41:29 +0000 (18:11 +0530)]
CRM-13973 : worked on fee selection change UI and meta data changes
Pratik Joshi [Thu, 16 Jan 2014 08:09:00 +0000 (13:39 +0530)]
CRM-13973
Pratik Joshi [Thu, 16 Jan 2014 01:45:01 +0000 (07:15 +0530)]
CRM-13973 - work on the UI implementation, CRM-13965 - improvements to BAOs
Pratik Joshi [Tue, 14 Jan 2014 07:02:43 +0000 (12:32 +0530)]
CRM-13965 : expose 'record payment' link
Pratik Joshi [Mon, 13 Jan 2014 14:19:58 +0000 (19:49 +0530)]
CRM-13965
Pratik Joshi [Mon, 13 Jan 2014 14:15:49 +0000 (19:45 +0530)]
CRM-13965 : view transactions popup, payment information block
Pratik Joshi [Sat, 11 Jan 2014 05:46:07 +0000 (11:16 +0530)]
CRM-13965, CRM-13964 : improvements and proper redirections
Pratik Joshi [Fri, 10 Jan 2014 13:35:20 +0000 (19:05 +0530)]
CRM-13965 : credit card additional payment
Pratik Joshi [Fri, 10 Jan 2014 04:49:27 +0000 (10:19 +0530)]
CRM-13965 : activity creation code and email sending
Pratik Joshi [Thu, 9 Jan 2014 06:59:49 +0000 (12:29 +0530)]
CRM-13965 : financial item status update after completion of partial payment
Pratik Joshi [Wed, 8 Jan 2014 17:44:02 +0000 (23:14 +0530)]
CRM-13964 minor improvement and CRM-13965 partial fix
Pratik Joshi [Mon, 30 Dec 2013 07:30:15 +0000 (13:00 +0530)]
CRM-13964 : commenting code
Pratik Joshi [Mon, 30 Dec 2013 07:22:28 +0000 (12:52 +0530)]
CRM-13964 : minor query fix in bao function for fetching balance amount
Pratik Joshi [Tue, 24 Dec 2013 14:04:42 +0000 (19:34 +0530)]
CRM-13964 : post process handling and improvement
Pratik Joshi [Mon, 23 Dec 2013 15:31:20 +0000 (21:01 +0530)]
CRM-13964 : post process working
Pratik Joshi [Fri, 20 Dec 2013 12:30:36 +0000 (18:00 +0530)]
CRM-13964 : JQUERY part and new status creation
colemanw [Thu, 16 Jan 2014 01:03:24 +0000 (17:03 -0800)]
Merge pull request #2352 from colemanw/4.4
Fix search builder participant/member options
Tim Otten [Thu, 16 Jan 2014 00:11:13 +0000 (16:11 -0800)]
Merge pull request #2354 from totten/4.4-dashboard-api
CRM-13889 - CRM_Core_BAO_Dashboard - Fix test failure.
Tim Otten [Thu, 16 Jan 2014 00:01:39 +0000 (16:01 -0800)]
CRM-13889 - Autoformat
Tim Otten [Wed, 15 Jan 2014 23:58:24 +0000 (15:58 -0800)]
CRM-13889 - CRM_Core_BAO_Dashboard - Fix test failure. Report error better.
Note: It looks like there was a merge error because some of the relevant
code was badly duplicated.
Coleman Watts [Wed, 15 Jan 2014 23:23:18 +0000 (15:23 -0800)]
CRM-13810 - Fix search builder member_campaign options
Tim Otten [Wed, 15 Jan 2014 23:20:43 +0000 (15:20 -0800)]
Merge pull request #2353 from totten/master-cache-codegen2
GenCode - Ignore cache/digest if some key files are missing
Tim Otten [Wed, 15 Jan 2014 23:17:59 +0000 (15:17 -0800)]
GenCode - Ignore cache/digest if some key files are missing
Coleman Watts [Wed, 15 Jan 2014 23:14:57 +0000 (15:14 -0800)]
Fix search builder participant options
colemanw [Wed, 15 Jan 2014 23:14:07 +0000 (15:14 -0800)]
Merge pull request #2351 from kurund/CRM-13996
CRM-13996, fixes sorting for search views
kurund [Wed, 15 Jan 2014 23:10:07 +0000 (15:10 -0800)]
CRM-13996, fixes sorting for search views
----------------------------------------
* CRM-13996: Advanced Search; Sorting of Results displayed in a custom profile fails and Advanced Search must be reset
http://issues.civicrm.org/jira/browse/CRM-13996
dlobo [Wed, 15 Jan 2014 23:01:51 +0000 (15:01 -0800)]
Merge pull request #2349 from eileenmcnaughton/CRM-14080
CRM-14080 default to now
Eileen McNaughton [Wed, 15 Jan 2014 22:52:46 +0000 (11:52 +1300)]
CRM-14012 - Contribution total values incorrect for permissioned users in search summary panel
----------------------------------------
* CRM-14012: Contribution total values incorrect on Find Contributions page for permissioned users
http://issues.civicrm.org/jira/browse/CRM-14012
Dave Greenberg [Wed, 15 Jan 2014 22:44:42 +0000 (14:44 -0800)]
Merge pull request #2348 from dlobo/CRM-13278
CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly
Eileen McNaughton [Wed, 15 Jan 2014 22:43:25 +0000 (11:43 +1300)]
CRM-14080 default to now
----------------------------------------
* CRM-14080: Have noticed there is no default on received_date on contribution.create - should default to now
http://issues.civicrm.org/jira/browse/CRM-14080
Donald A. Lobo [Wed, 15 Jan 2014 22:23:59 +0000 (14:23 -0800)]
CRM-13278 - Select fields for export "- related contact info -" fields are not sorted properly
http://issues.civicrm.org/jira/browse/CRM-13278
dlobo [Wed, 15 Jan 2014 22:23:11 +0000 (14:23 -0800)]
Merge pull request #2347 from lcdservices/CRM-14062
CRM-14062 update api tests
Brian Shaughnessy [Wed, 15 Jan 2014 22:16:58 +0000 (17:16 -0500)]
CRM-14062 update api tests
Dave Greenberg [Wed, 15 Jan 2014 21:59:58 +0000 (13:59 -0800)]
Merge pull request #2332 from colemanw/CRM-13996
CRM-13996 - Search views - hack to fix prefix, gender, suffix
Dave Greenberg [Wed, 15 Jan 2014 21:56:26 +0000 (13:56 -0800)]
Merge pull request #2341 from colemanw/campaign_id
CRM-13810 - Display campaign name on search builder
dlobo [Wed, 15 Jan 2014 21:45:57 +0000 (13:45 -0800)]
Merge pull request #2319 from lcdservices/CRM-13252
CRM-13252 exit nested api if getfields/getoptions action
Tim Otten [Wed, 15 Jan 2014 19:54:12 +0000 (11:54 -0800)]
Merge pull request #2340 from totten/master-cache-codegen
GenCode - Add an optional caching mode.
projects / civicrm-core.git / log