Dave Greenberg [Tue, 20 Aug 2013 00:32:57 +0000 (17:32 -0700)]
Merge pull request #1445 from eileenmcnaughton/CRM-13179-auto
Crm 13179 allow users with permission to see other users and either access civicrm or access ajax api
See comment for remaining unresolved issues:
http://issues.civicrm.org/jira/browse/CRM-13179?focusedCommentId=52614&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-52614
Eileen McNaughton [Mon, 19 Aug 2013 22:37:10 +0000 (10:37 +1200)]
undo permission change to getquick
While the logic of the change should still stand (getquick is already permissioned at the acl level) this change is not required for this PR
Kurund Jalmi [Mon, 19 Aug 2013 11:48:11 +0000 (04:48 -0700)]
Merge pull request #1460 from monishdeb/CRM-13225-QA-fix
CRM-13225 related fix for Membership Import during update
monishdeb [Mon, 19 Aug 2013 11:04:34 +0000 (16:34 +0530)]
CRM-13225 related fix for Membership Import during update
----------------------------------------
* CRM-13225: Activity/Participant/Membership import is broken due to import resturcturing
http://issues.civicrm.org/jira/browse/CRM-13225
Kurund Jalmi [Mon, 19 Aug 2013 06:29:02 +0000 (23:29 -0700)]
Merge pull request #1459 from colemanw/import
Fix import classes CRM-11254/CRM-13225
Kurund Jalmi [Mon, 19 Aug 2013 06:28:16 +0000 (23:28 -0700)]
Merge pull request #1458 from colemanw/contactTypeSearch
Fix contact type search builder CRM-13242
Kurund Jalmi [Mon, 19 Aug 2013 06:23:06 +0000 (23:23 -0700)]
Merge pull request #1453 from davecivicrm/CRM-13176
Crm 13176
Coleman Watts [Mon, 19 Aug 2013 05:15:26 +0000 (22:15 -0700)]
Update controller params to DataSource instead of UploadFile CRM-13225 CRM-11254
----------------------------------------
* CRM-13225: Activity/Participant/Membership import is broken due to import resturcturing
http://issues.civicrm.org/jira/browse/CRM-13225
* CRM-11254: Create parent class for import
http://issues.civicrm.org/jira/browse/CRM-11254
Coleman Watts [Sun, 18 Aug 2013 22:07:01 +0000 (15:07 -0700)]
Rename help files to match new tpl names CRM-13225 CRM-11254
----------------------------------------
* CRM-13225: Activity/Participant/Membership import is broken due to import resturcturing
http://issues.civicrm.org/jira/browse/CRM-13225
Coleman Watts [Sun, 18 Aug 2013 21:25:52 +0000 (14:25 -0700)]
Fix contact type search builder CRM-13242
Dave Greenberg [Sun, 18 Aug 2013 15:14:08 +0000 (08:14 -0700)]
Merge pull request #1455 from totten/master-crmdoc
CRMDOC - Change various CRMDOCxx links to plain CRMDOC
eileen [Sun, 18 Aug 2013 09:02:50 +0000 (21:02 +1200)]
CRM-13179 minor style fixes
eileen [Sun, 18 Aug 2013 09:00:42 +0000 (21:00 +1200)]
CRM-13179 minor test addition
eileen [Sun, 18 Aug 2013 08:20:12 +0000 (20:20 +1200)]
CRM-13179 wrap entire block in if clause to prevent empty div showing
eileen [Sun, 18 Aug 2013 08:16:34 +0000 (20:16 +1200)]
CRM-13179 add status class
eileen [Sun, 18 Aug 2013 08:13:56 +0000 (20:13 +1200)]
CRM-13179 move js file per feedback, wording tweaks
eileen [Sun, 18 Aug 2013 08:12:40 +0000 (20:12 +1200)]
CRM-13179 minor wording fixes
eileen [Sun, 18 Aug 2013 08:06:55 +0000 (20:06 +1200)]
CRM-13179 add a few extra fields to billing profile get (middle_name, state_province, postal_code)
eileen [Sun, 18 Aug 2013 05:18:28 +0000 (17:18 +1200)]
CRM-13179 add postal code to address fields on billing pseudoprofile
eileen [Sun, 18 Aug 2013 04:57:20 +0000 (16:57 +1200)]
CRM-13179 per Dave's comment I agree that this is a bogus error. Removing this check means that on a mixed profile (e.g. event) the correct data for the relevant contact is returned which seems appropriate
eileen [Wed, 14 Aug 2013 12:46:16 +0000 (00:46 +1200)]
CRM-13179 a few fixes lost in gitting re-instated
eileen [Wed, 14 Aug 2013 12:21:44 +0000 (00:21 +1200)]
CRM-13179 fix event to 'listen' to contact id as set
eileen [Wed, 14 Aug 2013 06:14:14 +0000 (18:14 +1200)]
CRM-13179 make autoselect available for logged in users
eileen [Wed, 14 Aug 2013 06:13:13 +0000 (18:13 +1200)]
CRM-13179 make profile get api respect contact & profile permissions
eileen [Wed, 14 Aug 2013 06:12:15 +0000 (18:12 +1200)]
enotice fix
Tim Otten [Sun, 18 Aug 2013 03:52:58 +0000 (20:52 -0700)]
Merge pull request #1456 from totten/master-migrate-test
CRM-12845 - Add unit tests for CRM_Utils_Migrate_*
Tim Otten [Sun, 18 Aug 2013 03:47:52 +0000 (20:47 -0700)]
CRM-12845 - Change name of test-class to reflect dual purpose
----------------------------------------
* CRM-12845: CRM_Utils_Migrate - Handle CustomGroup subtypes
http://issues.civicrm.org/jira/browse/CRM-12845
Tim Otten [Sun, 18 Aug 2013 03:45:49 +0000 (20:45 -0700)]
CRM-12845 - CRM_Utils_Migrate_Import - Add test
----------------------------------------
* CRM-12845: CRM_Utils_Migrate - Handle CustomGroup subtypes
http://issues.civicrm.org/jira/browse/CRM-12845
Tim Otten [Sun, 18 Aug 2013 02:55:39 +0000 (19:55 -0700)]
CRM-12845 - CRM_Utils_Migrate_Export - Add test
----------------------------------------
* CRM-12845: CRM_Utils_Migrate - Handle CustomGroup subtypes
http://issues.civicrm.org/jira/browse/CRM-12845
Tim Otten [Sat, 17 Aug 2013 23:41:54 +0000 (16:41 -0700)]
CRMDOC - Change various CRMDOCxx links to plain CRMDOC
Most of the source comments with documentation links should reflect current version.
For the "incremental upgrade" messages, I left the CRMDOCxx URLs in tact
because these messages could actually be version specific.
Dave Greenberg [Fri, 16 Aug 2013 22:44:38 +0000 (15:44 -0700)]
Change Birth date labels to Birth Date to match title case used in other labels.
Dave Greenberg [Fri, 16 Aug 2013 22:37:21 +0000 (15:37 -0700)]
Set class to disabled for contact summary tabs which have 0 items in them.
Dave Greenberg [Fri, 16 Aug 2013 22:18:16 +0000 (15:18 -0700)]
Merge pull request #1452 from davecivicrm/CRM-13217
CRM-13217 typo fixes
Dave Greenberg [Fri, 16 Aug 2013 22:13:09 +0000 (15:13 -0700)]
CRM-13217 typo fixes
----------------------------------------
* CRM-13217: UI help wrong text
http://issues.civicrm.org/jira/browse/CRM-13217
Dave Greenberg [Fri, 16 Aug 2013 20:28:13 +0000 (13:28 -0700)]
Merge pull request #1449 from erawat/master
CRM-12826 - MessageTemplatesTest and examples
Kurund Jalmi [Fri, 16 Aug 2013 18:52:17 +0000 (11:52 -0700)]
Merge pull request #1450 from davecivicrm/CRM-13218
CRM-13218 Total Fee on first page adjusts based on number of participant...
Erawat Chamanont [Fri, 16 Aug 2013 08:50:13 +0000 (09:50 +0100)]
removed var_dump()
Coleman Watts [Thu, 15 Aug 2013 23:13:35 +0000 (16:13 -0700)]
Get CRM.help working on non-civicrm pages
Dave Greenberg [Thu, 15 Aug 2013 22:36:24 +0000 (15:36 -0700)]
CRM-13218 Total Fee on first page adjusts based on number of participants selected.
----------------------------------------
* CRM-13218:
http://issues.civicrm.org/jira/browse/CRM-13218
Coleman Watts [Thu, 15 Aug 2013 18:16:22 +0000 (11:16 -0700)]
Update contribution.sendconfirmation api
Erawat Chamanont [Thu, 15 Aug 2013 13:48:22 +0000 (14:48 +0100)]
CRM-12826 - Implement MessageTemplatesTest for testing MessageTemplates APIs
CiviCRM [Thu, 15 Aug 2013 00:34:14 +0000 (17:34 -0700)]
Update version to 4.4.alpha2
Coleman Watts [Thu, 15 Aug 2013 00:07:49 +0000 (17:07 -0700)]
Update version numbers to 4.4 and lint php
Coleman Watts [Wed, 14 Aug 2013 23:56:16 +0000 (16:56 -0700)]
Fix undefined var
colemanw [Wed, 14 Aug 2013 20:42:56 +0000 (13:42 -0700)]
Merge pull request #1447 from colemanw/master
Add client-side money formatting
Coleman Watts [Wed, 14 Aug 2013 20:28:48 +0000 (13:28 -0700)]
Add client-side money formatting
colemanw [Wed, 14 Aug 2013 17:30:38 +0000 (10:30 -0700)]
Merge pull request #1446 from colemanw/pcm
Fix api preferred_communication_method CRM-12548
Coleman Watts [Wed, 14 Aug 2013 03:59:10 +0000 (20:59 -0700)]
Fix api preferred_communication_method CRM-12548
----------------------------------------
* CRM-12548: API not saving preferred_communication_method
http://issues.civicrm.org/jira/browse/CRM-12548
deepak-srivastava [Wed, 14 Aug 2013 12:20:30 +0000 (05:20 -0700)]
Merge pull request #1444 from deepak-srivastava/logrev
CRM-12910 - logDetail extension for job tables, via report hook query ob...
Kurund Jalmi [Wed, 14 Aug 2013 12:06:51 +0000 (05:06 -0700)]
Merge pull request #1443 from kurund/CRM-13223
fixed CRM-13223
kurund [Wed, 14 Aug 2013 12:05:45 +0000 (17:35 +0530)]
fixed CRM-13223
----------------------------------------
* CRM-13223: Include phone entity fields in Contact get spec
http://issues.civicrm.org/jira/browse/CRM-13223
Kurund Jalmi [Wed, 14 Aug 2013 12:00:16 +0000 (05:00 -0700)]
Merge pull request #1442 from kurund/CRM-13221
fixes for CRM-13221
Deepak Srivastava [Wed, 14 Aug 2013 12:00:02 +0000 (17:30 +0530)]
CRM-12910 - logDetail extension for job tables, via report hook query objects
kurund [Wed, 14 Aug 2013 11:59:40 +0000 (17:29 +0530)]
fixes for CRM-13221
----------------------------------------
* CRM-13221: postProcess hook doesn't fire when creating an event
http://issues.civicrm.org/jira/browse/CRM-13221
Kurund Jalmi [Wed, 14 Aug 2013 11:01:12 +0000 (04:01 -0700)]
Merge pull request #1441 from pratik-joshi/test-fixes-v44
minor bug fix : when we edit a membership and change its membership type...
Pratik Joshi [Wed, 14 Aug 2013 10:34:43 +0000 (16:04 +0530)]
minor bug fix : when we edit a membership and change its membership type - instead of 'change membership type' activity, 'change membership status' activity was getting recorded
Kurund Jalmi [Wed, 14 Aug 2013 08:55:02 +0000 (01:55 -0700)]
Merge pull request #1439 from yashodha/webtest-fixes
fix Contribution Aggregate by Relationship report
Kurund Jalmi [Wed, 14 Aug 2013 08:54:30 +0000 (01:54 -0700)]
Merge pull request #1440 from kurund/webtest-fixes
Webtest fixes
yashodha [Wed, 14 Aug 2013 08:39:21 +0000 (14:09 +0530)]
fix Contribution Aggregate by Relationship report
Kurund Jalmi [Wed, 14 Aug 2013 08:30:53 +0000 (01:30 -0700)]
Merge pull request #1437 from yashodha/webtest-fixes
fixed contribute PCP webtest
kurund [Wed, 14 Aug 2013 08:20:56 +0000 (13:50 +0530)]
notice fixes and whitespace cleanup
kurund [Wed, 14 Aug 2013 08:07:38 +0000 (13:37 +0530)]
fixed --filter=testBatchAddMembership WebTest_Contribute_AddBatchesTest
kurund [Wed, 14 Aug 2013 08:04:29 +0000 (13:34 +0530)]
notice fixes
kurund [Wed, 14 Aug 2013 08:03:07 +0000 (13:33 +0530)]
notice fixes
kurund [Wed, 14 Aug 2013 07:59:02 +0000 (13:29 +0530)]
fixed --filter=testCreateCampaign WebTest_Campaign_OnlineEventRegistrationTest
Kurund Jalmi [Wed, 14 Aug 2013 07:46:02 +0000 (00:46 -0700)]
Merge pull request #1438 from pratik-joshi/test-fixes-v44
WebTest_Profile_MultiRecordProfileAddTest webtest fix
kurund [Wed, 14 Aug 2013 07:44:19 +0000 (13:14 +0530)]
fixes for --filter=testContributionPageSeparatePaymentPayLater WebTest_Contribute_ContributionPageAddTest
Pratik Joshi [Wed, 14 Aug 2013 07:40:23 +0000 (13:10 +0530)]
WebTest_Profile_MultiRecordProfileAddTest webtest fix
yashodha [Wed, 14 Aug 2013 07:32:37 +0000 (13:02 +0530)]
fixed contribute PCP webtest
kurund [Wed, 14 Aug 2013 07:07:52 +0000 (12:37 +0530)]
fixes WebTest_Profile_ProfileGroupSubscriptionTest
kurund [Wed, 14 Aug 2013 07:01:37 +0000 (12:31 +0530)]
notice fixes
kurund [Wed, 14 Aug 2013 06:36:10 +0000 (12:06 +0530)]
fixed --filter=testCheckDescAndCreatedIdFields WebTest_Profile_ProfileAddTest
deepak-srivastava [Wed, 14 Aug 2013 06:23:44 +0000 (23:23 -0700)]
Merge pull request #1399 from ravishnair/CRM-12845
CRM-12845 CRM_Utils_Migrate - Handle CustomGroup subtypes
kurund [Wed, 14 Aug 2013 06:01:32 +0000 (11:31 +0530)]
fixed timeouts WebTest_Profile_BatchUpdateTest
kurund [Wed, 14 Aug 2013 05:49:18 +0000 (11:19 +0530)]
whitespace fixes
kurund [Wed, 14 Aug 2013 05:40:33 +0000 (11:10 +0530)]
much cleaner fix --filter=testEventDashboard WebTest_Generic_GeneralClickAroundTest
Kurund Jalmi [Wed, 14 Aug 2013 06:13:07 +0000 (23:13 -0700)]
Merge pull request #1436 from kurund/CRM-13201
CRM-13201, fixed profile search
kurund [Wed, 14 Aug 2013 06:12:14 +0000 (11:42 +0530)]
CRM-13201, fixed profile search
----------------------------------------
* CRM-13201: Add alterTemplateFile hook
http://issues.civicrm.org/jira/browse/CRM-13201
Kurund Jalmi [Wed, 14 Aug 2013 05:30:58 +0000 (22:30 -0700)]
Merge pull request #1434 from totten/master-tabs-warning
CRM_Event_Page_ManageEvent - Fix static warning
Kurund Jalmi [Wed, 14 Aug 2013 05:30:05 +0000 (22:30 -0700)]
Merge pull request #1435 from davecivicrm/profileWebtestFixes
Profile web test fixes.
Dave Greenberg [Wed, 14 Aug 2013 04:45:20 +0000 (21:45 -0700)]
Profile web test fixes.
Tim Otten [Wed, 14 Aug 2013 01:29:25 +0000 (18:29 -0700)]
CRM_Event_Page_ManageEvent - Fix static warning
Also: Preventively fix bad cache logic
colemanw [Tue, 13 Aug 2013 23:54:54 +0000 (16:54 -0700)]
Merge pull request #1433 from totten/master-validate-messages
CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting
Tim Otten [Tue, 13 Aug 2013 23:51:10 +0000 (16:51 -0700)]
CRM-12892 - CRM/Form/validate.tpl - Don't put messages in CRM.validate defaults
----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
http://issues.civicrm.org/jira/browse/CRM-12892
Tim Otten [Tue, 13 Aug 2013 23:45:30 +0000 (16:45 -0700)]
CRM-12892 - CRM/Form/validate.tpl - Clarify error about date formatting
Also: Fix loading of custom error messages
----------------------------------------
* CRM-12892: CiviHR - Entity - Job Positions & Roles
http://issues.civicrm.org/jira/browse/CRM-12892
Dave Greenberg [Tue, 13 Aug 2013 23:36:23 +0000 (16:36 -0700)]
Merge pull request #1430 from kurund/event-ical-fixes
CRM-13220, event were not listed in ical/html feed due to ACL caching bug
Tested HTML, rss and ical listings including w/ event type filter (type=N). Note that I did NOT test if the functionality implemented by Adam Wight which caused this regression is affected by these changes.
Dave Greenberg [Tue, 13 Aug 2013 23:28:29 +0000 (16:28 -0700)]
Merge pull request #1432 from davecivicrm/extraPeriod
Remove extraneous period in activity postProcess status msg
Dave Greenberg [Tue, 13 Aug 2013 23:26:32 +0000 (16:26 -0700)]
Remove extraneous period in activity postProcess status msg
kurund [Tue, 13 Aug 2013 23:21:40 +0000 (04:51 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-14-04-44-13
Conflicts:
CRM/Contribute/PseudoConstant.php
CRM/Upgrade/Incremental/php/FourThree.php
Kurund Jalmi [Tue, 13 Aug 2013 22:47:56 +0000 (15:47 -0700)]
Merge pull request #1431 from kurund/webtest-fixes
Webtest fixes
kurund [Tue, 13 Aug 2013 22:46:44 +0000 (04:16 +0530)]
notices fixes and whitespace fixes
kurund [Tue, 13 Aug 2013 22:42:11 +0000 (04:12 +0530)]
notice fixes
kurund [Tue, 13 Aug 2013 22:39:30 +0000 (04:09 +0530)]
fixes for WebTest_Event_PricesetMaxCountTest
kurund [Tue, 13 Aug 2013 22:28:40 +0000 (03:58 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 22:22:12 +0000 (03:52 +0530)]
fixes for WebTest_Event_ParticipantCountTest
kurund [Tue, 13 Aug 2013 22:02:08 +0000 (03:32 +0530)]
white space fixes
kurund [Tue, 13 Aug 2013 21:54:01 +0000 (03:24 +0530)]
fixes for WebTest_Event_MultiprofileEventTest
kurund [Tue, 13 Aug 2013 21:31:39 +0000 (03:01 +0530)]
whitespace fixes
kurund [Tue, 13 Aug 2013 21:30:30 +0000 (03:00 +0530)]
fixes for WebTest_Event_EventWaitListTest
kurund [Tue, 13 Aug 2013 21:16:50 +0000 (02:46 +0530)]
fixes for CRM-13220
----------------------------------------
* CRM-13220: Events listing ( html ) is broken
http://issues.civicrm.org/jira/browse/CRM-13220
projects / civicrm-core.git / log