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 [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...
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()
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...
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.
dlobo [Wed, 15 Jan 2014 18:29:32 +0000 (10:29 -0800)]
Merge pull request #2346 from jmcclelland/county-field-should-populate-with-counties
CRM-14077 - contact/address - county field should populate with counties...
Jamie McClelland [Wed, 15 Jan 2014 16:34:12 +0000 (11:34 -0500)]
CRM-14077 - contact/address - county field should populate with counties not countries
----------------------------------------
* CRM-14077: County drop down is populated with countries instead
http://issues.civicrm.org/jira/browse/CRM-14077
Kurund Jalmi [Wed, 15 Jan 2014 06:11:03 +0000 (22:11 -0800)]
Merge pull request #2335 from yashodha/CRM-14066
CRM-14066: fix zero amount for discounted option
colemanw [Wed, 15 Jan 2014 05:48:55 +0000 (21:48 -0800)]
Merge pull request #2343 from colemanw/locationTypeExport
CRM-14076 - Export - fix label to work as the query object expects
Coleman Watts [Wed, 15 Jan 2014 05:47:23 +0000 (21:47 -0800)]
CRM-14076 - Export - fix label to work as the query object expects
pratik-joshi [Wed, 15 Jan 2014 04:44:40 +0000 (20:44 -0800)]
Merge pull request #2325 from mepps/joomla-css-fix
Stopped .crm-container fieldset label from floating left in Joomla edit ...
Tim Otten [Wed, 15 Jan 2014 04:34:28 +0000 (20:34 -0800)]
setup.conf.txt - Add suggestions about CIVICRM_GENCODE_DIGEST
Tim Otten [Wed, 15 Jan 2014 04:10:48 +0000 (20:10 -0800)]
GenCode - Cleanup
Coleman Watts [Wed, 15 Jan 2014 04:09:08 +0000 (20:09 -0800)]
CRM-13810 - Display campaign name on search builder
Tim Otten [Wed, 15 Jan 2014 03:52:16 +0000 (19:52 -0800)]
GenCode - Add an optional caching mode.
If CIVICRM_GENCODE_DIGEST is set, then GenCode will write out a digest of
all its inputs & templates. If someone tries to rerun with the same inputs,
then GenCode will do nothing.
Tim Otten [Wed, 15 Jan 2014 01:12:32 +0000 (17:12 -0800)]
Merge pull request #2339 from totten/4.4-test-mysqlport
tests/phpunit - Fix for running with MySQL on alternative port
Tim Otten [Sat, 4 Jan 2014 02:24:04 +0000 (18:24 -0800)]
tests/phpunit - Fix for running with MySQL on alternative port
Dave Greenberg [Tue, 14 Jan 2014 23:07:59 +0000 (15:07 -0800)]
Merge pull request #2330 from colemanw/CRM-14059
CRM-14059 - Contribution form - Fix onbehalf profile ajax load
Kurund Jalmi [Tue, 14 Jan 2014 22:57:01 +0000 (14:57 -0800)]
Merge pull request #2338 from kurund/CRM-14064
fixes for CRM-14064
kurund [Tue, 14 Jan 2014 22:55:44 +0000 (14:55 -0800)]
fixes for CRM-14064
----------------------------------------
* CRM-14064: Uploading content for mailing results in empty message text and subject line
http://issues.civicrm.org/jira/browse/CRM-14064
Maggie [Tue, 14 Jan 2014 14:35:44 +0000 (09:35 -0500)]
Removed repeated line
Maggie [Tue, 14 Jan 2014 14:33:29 +0000 (09:33 -0500)]
Remade change of adding float:none
Nileema [Tue, 14 Jan 2014 11:29:52 +0000 (16:59 +0530)]
-- HR-235 Import multi-value custom data
deepak-srivastava [Tue, 14 Jan 2014 11:05:32 +0000 (03:05 -0800)]
Merge pull request #2336 from deepak-srivastava/CRM-14057
CRM-14057 - contact logging detail report may have missing/wrong altered...
Deepak Srivastava [Tue, 14 Jan 2014 11:00:50 +0000 (16:30 +0530)]
CRM-14057 - contact logging detail report may have missing/wrong altered and altered by name
----------------------------------------
* CRM-14057: contact logging detail report may have missing/wrong altered and altered by name
http://issues.civicrm.org/jira/browse/CRM-14057
yashodha [Tue, 14 Jan 2014 09:46:46 +0000 (15:16 +0530)]
CRM-14066: fix zero amount for discounted option
Kurund Jalmi [Tue, 14 Jan 2014 06:54:50 +0000 (22:54 -0800)]
Merge pull request #2324 from yashodha/4.4
CRM-13947: fix where clause condition
Tim Otten [Tue, 14 Jan 2014 06:54:44 +0000 (22:54 -0800)]
Merge pull request #2334 from totten/4.4-14046-undefvar
CRM-14046 - CRM_Extension_Manager - Fix undefined variable references
Tim Otten [Sun, 5 Jan 2014 00:16:13 +0000 (16:16 -0800)]
CRM-14046 - CRM_Extension_Manager - Fix undefined variable references
Tim Otten [Tue, 14 Jan 2014 06:48:41 +0000 (22:48 -0800)]
Merge pull request #2171 from lcdservices/CRM-13909
CRM-13909 also rebuild word replacement when clearing cache
Dave Greenberg [Tue, 14 Jan 2014 02:51:42 +0000 (18:51 -0800)]
Merge pull request #2333 from davecivicrm/CRM-10043
CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs...
Dave Greenberg [Tue, 14 Jan 2014 02:50:41 +0000 (18:50 -0800)]
CRM-10043 - one more fatal fix - ts w/o array.
Dave Greenberg [Tue, 14 Jan 2014 02:26:20 +0000 (18:26 -0800)]
CRM-10043 - merge in changes to Activity.tpl and splitting of ActivityJs.tpl with the follow-up assignee changes.
Coleman Watts [Tue, 14 Jan 2014 00:51:23 +0000 (16:51 -0800)]
CRM-13996 - Search views - hack to fix prefix, gender, suffix
Coleman Watts [Mon, 13 Jan 2014 23:31:55 +0000 (15:31 -0800)]
CRM-14059 - Contribution form - Fix onbehalf profile ajax load
Dave Greenberg [Mon, 13 Jan 2014 21:37:22 +0000 (13:37 -0800)]
Merge pull request #2287 from pradpnayak/CRM-13848
--CRM-13848, used UX pattern for financial type to allow multiple accoun...
Dave Greenberg [Mon, 13 Jan 2014 20:29:50 +0000 (12:29 -0800)]
Merge pull request #2329 from davecivicrm/CRM-13726
CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaug...
Dave Greenberg [Mon, 13 Jan 2014 20:27:54 +0000 (12:27 -0800)]
CRM-13726 includes PR 1934 plus fix from https://github.com/eileenmcnaughton/civicrm-core/commit/
c1622a21afb8fa86f92be8dc90879ad5aed7e3f5
----------------------------------------
* CRM-13726: Only show 'billing addres is same as above' checkbox if there is an address above
http://issues.civicrm.org/jira/browse/CRM-13726
kurund [Mon, 13 Jan 2014 20:07:24 +0000 (12:07 -0800)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-13-11-57-38
Conflicts:
CRM/Core/Form/Tag.php
colemanw [Sat, 11 Jan 2014 04:36:04 +0000 (20:36 -0800)]
Merge pull request #2327 from colemanw/4.4
Edit activity date warning broken
Coleman Watts [Sat, 11 Jan 2014 04:32:58 +0000 (20:32 -0800)]
CRM-14065 - Activity Form - Fix activityStatus js function
Maggie [Fri, 10 Jan 2014 21:58:32 +0000 (16:58 -0500)]
Stopped .crm-container fieldset label from floating left in Joomla edit default template view
Dave Greenberg [Fri, 10 Jan 2014 20:29:26 +0000 (12:29 -0800)]
Merge pull request #2321 from lcdservices/CRM-14062
CRM-14062 support passing name to group API
Kurund Jalmi [Fri, 10 Jan 2014 20:06:23 +0000 (12:06 -0800)]
Merge pull request #2320 from kurund/CRM-14052
delete tags that belongs to tagset, CRM-14052
projects / civicrm-core.git / log