deepak-srivastava [Thu, 18 Jul 2013 10:46:43 +0000 (03:46 -0700)]
Merge pull request #1187 from deepak-srivastava/search
CRM-12912, exposing hook injected fields in profiles
Deepak Srivastava [Thu, 18 Jul 2013 10:44:35 +0000 (16:14 +0530)]
CRM-12912
----------------------------------------
* CRM-12912:
http://issues.civicrm.org/jira/browse/CRM-12912
Kurund Jalmi [Thu, 18 Jul 2013 10:17:00 +0000 (03:17 -0700)]
Merge pull request #1186 from yashodha/softcredit
CRM-9744, CRM-12531
yashodha [Thu, 18 Jul 2013 09:38:00 +0000 (15:08 +0530)]
CRM-9744, CRM-12531
Kurund Jalmi [Thu, 18 Jul 2013 06:56:06 +0000 (23:56 -0700)]
Merge pull request #1177 from aadityawalawalkar/CRM-12695-fixes
Fixed/Modified the earlier patch for CRM-12695 wrt comment on PR - 1135
Kurund Jalmi [Thu, 18 Jul 2013 06:54:30 +0000 (23:54 -0700)]
Merge pull request #1182 from davecivicrm/CRM-11316
CRM-11316 Fix online contrib, event reg, PCP account, petition signature...
Kurund Jalmi [Thu, 18 Jul 2013 06:53:35 +0000 (23:53 -0700)]
Merge pull request #1183 from davecivicrm/CRM-12735
Crm 12735
Kurund Jalmi [Thu, 18 Jul 2013 06:52:32 +0000 (23:52 -0700)]
Merge pull request #1184 from eileenmcnaughton/CRM-13074
CRM-13074 - Failure on CMS user deletes contribution
Kurund Jalmi [Thu, 18 Jul 2013 06:48:27 +0000 (23:48 -0700)]
Merge pull request #1178 from ravishnair/civihr
-- fix for contribution import page break found during QA of issue CRM-9744
eileen [Thu, 18 Jul 2013 05:34:33 +0000 (17:34 +1200)]
CRM-13074 - Failure on CMS user deletes contribution
Dave Greenberg [Thu, 18 Jul 2013 00:39:08 +0000 (17:39 -0700)]
Needed additional condition to show Edit button for user who has edit my contact and is viewing their own contact record.
Coleman Watts [Thu, 18 Jul 2013 00:08:19 +0000 (17:08 -0700)]
Fix pseudoconstant regression
Tim Otten [Wed, 17 Jul 2013 23:35:28 +0000 (16:35 -0700)]
Merge pull request #1163 from fjg-conflux/CRM-13054
CRM-13054: Add crmRegions to EventInfo template.
Frank J. Gómez [Wed, 17 Jul 2013 20:33:05 +0000 (16:33 -0400)]
Added crm- prefix to class names.
Dave Greenberg [Wed, 17 Jul 2013 20:12:18 +0000 (13:12 -0700)]
CRM-11316 Fix online contrib, event reg, PCP account, petition signature and mailing subscribe forms to NOT include ReCAPTCHA for logged in users. Fix notices in CRM_PCP_Form_PCPAccount for anonymous users due to undefined _defaults property.
----------------------------------------
* CRM-11316:
http://issues.civicrm.org/jira/browse/CRM-11316
Dave Greenberg [Wed, 17 Jul 2013 19:54:04 +0000 (12:54 -0700)]
CRM-12735 Allow user with view contact permission to access Actions button in Contact Summary page.
----------------------------------------
* CRM-12735:
http://issues.civicrm.org/jira/browse/CRM-12735
colemanw [Wed, 17 Jul 2013 16:39:56 +0000 (09:39 -0700)]
Merge pull request #1167 from colemanw/getOptionLabels
Method to automatically retrieve option labels
colemanw [Wed, 17 Jul 2013 16:38:26 +0000 (09:38 -0700)]
Merge pull request #1180 from eileenmcnaughton/CRM-13067
CRM-13067 - preliminary code tidy up
Kurund Jalmi [Wed, 17 Jul 2013 15:48:19 +0000 (08:48 -0700)]
Merge pull request #1181 from agh1/event-date-in-participant-report
Add event start date to participant report (CRM-13069)
Andrew Hunt [Wed, 17 Jul 2013 15:41:09 +0000 (11:41 -0400)]
added event start date as field and filter
deepak-srivastava [Wed, 17 Jul 2013 10:58:22 +0000 (03:58 -0700)]
Merge pull request #1179 from deepak-srivastava/search
CRM-12925
eileen [Wed, 17 Jul 2013 10:24:23 +0000 (22:24 +1200)]
CRM-13067 e-notice fix
eileen [Wed, 17 Jul 2013 10:21:47 +0000 (22:21 +1200)]
CRM-13067 whitespace for addition of try catch.
I put the indentation in a separate commit to keep the other commit clean
eileen [Wed, 17 Jul 2013 10:16:09 +0000 (22:16 +1200)]
CRM-13067 tidy up import function by using exception try catch
eileen [Wed, 17 Jul 2013 04:35:17 +0000 (16:35 +1200)]
CRM-13067 code tidy up - move import specific function to import class
eileen [Wed, 17 Jul 2013 04:34:12 +0000 (16:34 +1200)]
CRM-13067 code tidy up - remove repetitive code
eileen [Wed, 17 Jul 2013 04:09:17 +0000 (16:09 +1200)]
CRM-13067 preliminary cleanup - reduce lines of code
eileen [Wed, 17 Jul 2013 09:46:59 +0000 (21:46 +1200)]
CRM-13067 add membership import test
eileen [Wed, 17 Jul 2013 09:35:32 +0000 (21:35 +1200)]
minor tidy up on test setup class
fix test class
Ravish Nair [Wed, 17 Jul 2013 10:48:39 +0000 (16:18 +0530)]
-- fix for contribution import break found during QA of issue CRM-9744
----------------------------------------
* CRM-9744: Using Soft Credit Contribution Feature with External ID Fails
http://issues.civicrm.org/jira/browse/CRM-9744
Deepak Srivastava [Wed, 17 Jul 2013 10:29:54 +0000 (15:59 +0530)]
CRM-12925
----------------------------------------
* CRM-12925: Implement "Job" search (for "Search Builder")
http://issues.civicrm.org/jira/browse/CRM-12925
Aaditya Walawalkar [Wed, 17 Jul 2013 10:02:29 +0000 (15:32 +0530)]
Fixed/Modified the earlier patch for CRM-12695 wrt comment on PR - 1135
----------------------------------------
* CRM-12695: Membership sharing doesn't work after merge
http://issues.civicrm.org/jira/browse/CRM-12695
* CRM-12695-fixes:
http://issues.civicrm.org/jira/browse/CRM-12695-fixes
Kurund Jalmi [Wed, 17 Jul 2013 08:52:09 +0000 (01:52 -0700)]
Merge pull request #1176 from pratik-joshi/CRM-13025
CRM-13025
deepak-srivastava [Wed, 17 Jul 2013 08:36:33 +0000 (01:36 -0700)]
Merge pull request #1175 from deepak-srivastava/logging
CRM-13028
Deepak Srivastava [Wed, 17 Jul 2013 08:20:35 +0000 (13:50 +0530)]
CRM-13028
----------------------------------------
* CRM-13028: Adv logging: Refine triggers for tables with datestamps
http://issues.civicrm.org/jira/browse/CRM-13028
Kurund Jalmi [Wed, 17 Jul 2013 07:49:39 +0000 (00:49 -0700)]
Merge pull request #1173 from dpradeep/CRM-10146-recommit
-- fixed for CRM-10146, Restricted the creation of same membership and activity again.
Frank J. Gómez [Wed, 17 Jul 2013 07:32:10 +0000 (03:32 -0400)]
CRM-13054: Fixed incorrectly nested tags.
dpradeep [Wed, 17 Jul 2013 07:29:58 +0000 (12:59 +0530)]
-- fixed for CRM-10146, Restricted the creation of same membership and activity again.
Frank J. Gómez [Wed, 17 Jul 2013 07:13:39 +0000 (03:13 -0400)]
CRM-13054: Add crmRegions to EventInfo template.
Kurund Jalmi [Wed, 17 Jul 2013 06:11:18 +0000 (23:11 -0700)]
Merge pull request #1164 from eileenmcnaughton/whitespace
remove newly introduced trailing spaces & tabs, new windows line-breaks ...
Kurund Jalmi [Tue, 16 Jul 2013 18:23:30 +0000 (11:23 -0700)]
Merge pull request #1171 from kurund/CRM-12963
more cleanup and preview fixes CRM-12963
Kurund Jalmi [Tue, 16 Jul 2013 18:20:27 +0000 (23:50 +0530)]
more cleanup and preview fixes CRM-12963
Kurund Jalmi [Tue, 16 Jul 2013 13:09:39 +0000 (06:09 -0700)]
Merge pull request #1170 from monishdeb/CRM-12985
CRM-12985 fix
monishdeb [Tue, 16 Jul 2013 12:48:26 +0000 (18:18 +0530)]
CRM-12985 fix
----------------------------------------
* CRM-12985: do not update price field name when label is updated
http://issues.civicrm.org/jira/browse/CRM-12985
Kurund Jalmi [Tue, 16 Jul 2013 12:30:56 +0000 (05:30 -0700)]
Merge pull request #1169 from monishdeb/CRM-13024-fixes
CRM-13024 fixes
monishdeb [Tue, 16 Jul 2013 10:11:53 +0000 (15:41 +0530)]
CRM-13024 fixes
----------------------------------------
* CRM-13024: Search Builder dropdowns broken for Groups, State, Country ...
http://issues.civicrm.org/jira/browse/CRM-13024
Coleman Watts [Tue, 16 Jul 2013 00:51:21 +0000 (17:51 -0700)]
Support "unique names" as well as sql name CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Coleman Watts [Mon, 15 Jul 2013 19:02:09 +0000 (12:02 -0700)]
Method to automatically retrieve option labels CRM-12464
----------------------------------------
* CRM-12464: Add PseudoConstants to Schema Metadata
http://issues.civicrm.org/jira/browse/CRM-12464
Tim Otten [Mon, 15 Jul 2013 21:15:38 +0000 (14:15 -0700)]
Merge pull request #1166 from deepak-srivastava/search
CRM-12924, CRM-12940 pluging advanced search panes via queryObjects hook
Tim Otten [Mon, 15 Jul 2013 18:56:01 +0000 (11:56 -0700)]
Merge pull request #1154 from ravishnair/CiviHR
-- CRM-12914 made email addresses clickable in profile search results
Deepak Srivastava [Mon, 15 Jul 2013 13:48:29 +0000 (19:18 +0530)]
CRM-12924, CRM-12940 pluging advanced search panes via queryObjects hook
----------------------------------------
* CRM-12924: Implement "Job" search (for "Advanced Search")
http://issues.civicrm.org/jira/browse/CRM-12924
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
http://issues.civicrm.org/jira/browse/CRM-12940
Pratik Joshi [Mon, 15 Jul 2013 13:41:51 +0000 (19:11 +0530)]
CRM-13025 : minor cleanup
Pratik Joshi [Mon, 15 Jul 2013 13:36:38 +0000 (19:06 +0530)]
CRM-13025
eileen [Sun, 14 Jul 2013 23:26:48 +0000 (11:26 +1200)]
remove newly introduced trailing spaces & tabs, new windows line-breaks also present but not tackled
Kurund Jalmi [Sun, 14 Jul 2013 17:46:24 +0000 (23:16 +0530)]
regenerated data after merge
Kurund Jalmi [Sun, 14 Jul 2013 17:40:20 +0000 (23:10 +0530)]
Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-07-14-22-39-05
Conflicts:
CRM/Contact/BAO/Contact.php
CRM/Group/Page/AJAX.php
CRM/Report/Form/Member/Detail.php
CRM/Utils/SoapServer.php
CRM/Utils/System/Base.php
sql/civicrm_generated.mysql
tests/phpunit/CRM/Core/DAOTest.php
tests/phpunit/CiviTest/CiviUnitTestCase.php
tests/phpunit/api/v3/ContributionTest.php
xml/version.xml
Kurund Jalmi [Sun, 14 Jul 2013 16:33:07 +0000 (09:33 -0700)]
Merge pull request #1161 from eileenmcnaughton/CRM-10859
CRM-10859 rename BAO classes that dont follow naming std (at least those...
deepak-srivastava [Sun, 14 Jul 2013 14:11:17 +0000 (07:11 -0700)]
Merge pull request #1162 from deepak-srivastava/search
CRM-12940
eileen [Sun, 14 Jul 2013 00:25:09 +0000 (12:25 +1200)]
CRM-10859 rename BAO classes that dont follow naming std (at least those for which API tests exist :-)
Coleman Watts [Sat, 13 Jul 2013 19:08:59 +0000 (12:08 -0700)]
js & css fix for CRM-12859
----------------------------------------
* CRM-12859: Manage Volunteer Assignments
http://issues.civicrm.org/jira/browse/CRM-12859
Kurund Jalmi [Fri, 12 Jul 2013 20:59:59 +0000 (13:59 -0700)]
Merge pull request #1159 from kurund/CRM-12965
more fixes for barcode layout CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 20:59:11 +0000 (13:59 -0700)]
Merge pull request #1158 from kurund/CRM-12965
code cleanup and also added 'Save and Preview' option CRM-12965
Kurund Jalmi [Fri, 12 Jul 2013 20:58:30 +0000 (02:28 +0530)]
more fixes for barcode layout CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 20:40:33 +0000 (02:10 +0530)]
code cleanup and also added 'Save and Preview' option CRM-12965
Kurund Jalmi [Fri, 12 Jul 2013 19:30:43 +0000 (12:30 -0700)]
Merge pull request #1157 from kurund/CRM-12967
added QR code support for name badges, CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 19:29:12 +0000 (00:59 +0530)]
added QR code support for name badges, CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 17:52:02 +0000 (10:52 -0700)]
Merge pull request #1145 from colemanw/searchOps
Restore comparison operators for search builder selects
Kurund Jalmi [Fri, 12 Jul 2013 17:50:38 +0000 (10:50 -0700)]
Merge pull request #1150 from eileenmcnaughton/CRM-13040
CRM-13040 allow for possiblility geocoder sets postcode
Kurund Jalmi [Fri, 12 Jul 2013 17:49:19 +0000 (10:49 -0700)]
Merge pull request #1151 from yashodha/4.4
fix - save petition
Kurund Jalmi [Fri, 12 Jul 2013 14:09:10 +0000 (07:09 -0700)]
Merge pull request #1156 from kurund/CRM-12967
patched Pratik's work on barcode position fixes, CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 14:08:17 +0000 (19:38 +0530)]
patched Pratik's work on barcode position fixes, CRM-12967
Deepak Srivastava [Fri, 12 Jul 2013 13:36:28 +0000 (19:06 +0530)]
CRM-12940
----------------------------------------
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
http://issues.civicrm.org/jira/browse/CRM-12940
Kurund Jalmi [Fri, 12 Jul 2013 11:28:46 +0000 (04:28 -0700)]
Merge pull request #1155 from kurund/hook-cleanup
removed unwanted hook
Kurund Jalmi [Fri, 12 Jul 2013 11:28:03 +0000 (16:58 +0530)]
removed unwanted hook
Kurund Jalmi [Fri, 12 Jul 2013 11:23:17 +0000 (04:23 -0700)]
Merge pull request #1153 from kurund/CRM-12967
added hook_civicrm_alterBarcode which allows users to change the data en...
Ravish Nair [Fri, 12 Jul 2013 11:12:55 +0000 (16:42 +0530)]
-- CRM-12914 made email addresses clickable in profile search results
----------------------------------------
* CRM-12914: Make email addresses clickable in search results
http://issues.civicrm.org/jira/browse/CRM-12914
Kurund Jalmi [Fri, 12 Jul 2013 10:56:31 +0000 (16:26 +0530)]
added hook_civicrm_alterBarcode which allows users to change the data encoded in barcode, CRM-12967
Kurund Jalmi [Fri, 12 Jul 2013 10:23:06 +0000 (03:23 -0700)]
Merge pull request #1152 from kurund/CRM-12965
CRM-12965
Kurund Jalmi [Fri, 12 Jul 2013 10:21:55 +0000 (15:51 +0530)]
added formRule to prevent conflict between barcode and #4, CRM-12965
Deepak Srivastava [Fri, 12 Jul 2013 09:40:30 +0000 (15:10 +0530)]
CRM-12940, extending core search via hook_civicrm_queryObjects
----------------------------------------
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
http://issues.civicrm.org/jira/browse/CRM-12940
Kurund Jalmi [Fri, 12 Jul 2013 07:52:53 +0000 (13:22 +0530)]
more cleanup and layout fixes CRM-12965
yashodha [Fri, 12 Jul 2013 05:21:40 +0000 (10:51 +0530)]
fix - save petition
eileen [Fri, 12 Jul 2013 01:04:40 +0000 (13:04 +1200)]
CRM-13040 allow for possiblility geocoder sets postcode
Tim Otten [Thu, 11 Jul 2013 21:51:58 +0000 (14:51 -0700)]
Merge pull request #1149 from totten/master-profile-export
CRM_Utils_Migrate_Export - Allow export of specific UFGroups
Tim Otten [Thu, 11 Jul 2013 21:12:14 +0000 (14:12 -0700)]
CRM_Utils_Migrate_Export - Allow export of specific UFGroups
Tim Otten [Thu, 11 Jul 2013 18:41:06 +0000 (11:41 -0700)]
Merge pull request #1148 from davecivicrm/CRM-12499b
CRM-12499 Modify cms to WordPress translatePermission to make cms:admini...
Dave Greenberg [Thu, 11 Jul 2013 17:12:07 +0000 (13:12 -0400)]
CRM-12499 Modify cms to WordPress translatePermission to make cms:administer users translate to WordPress administrator role. Add logic to contact view to handle WordPress access to user id and user profile url.
----------------------------------------
* CRM-12499: Allow users with 'access user profiles' to access $userRecordUrl
http://issues.civicrm.org/jira/browse/CRM-12499
deepak-srivastava [Thu, 11 Jul 2013 14:55:47 +0000 (07:55 -0700)]
Merge pull request #1147 from deepak-srivastava/toggle
CRM-12846, fix for test case failure - civipledge wasn't enabled by default
Deepak Srivastava [Thu, 11 Jul 2013 14:54:35 +0000 (20:24 +0530)]
CRM-12846, fix for test case failure - civipledge wasn't enabled by default
----------------------------------------
* CRM-12846: API support for toggling components by storing 'enableComponents' config in settings table
http://issues.civicrm.org/jira/browse/CRM-12846
Deepak Srivastava [Thu, 11 Jul 2013 12:37:28 +0000 (18:07 +0530)]
CRM-12940, towards allowing extension to alter core search
----------------------------------------
* CRM-12940: Allow extensions to participate in CRM_*_BAO_Query
http://issues.civicrm.org/jira/browse/CRM-12940
Tim Otten [Thu, 11 Jul 2013 04:35:51 +0000 (21:35 -0700)]
APIv3 - getFields - Add unit-test for 'get_options=all'
Coleman Watts [Thu, 11 Jul 2013 03:56:21 +0000 (20:56 -0700)]
Allow 'all' keyword in getfields.options
Coleman Watts [Wed, 10 Jul 2013 17:13:31 +0000 (10:13 -0700)]
Restore comparison operators for search builder selects
Coleman Watts [Wed, 10 Jul 2013 14:17:39 +0000 (07:17 -0700)]
Cleanup js
colemanw [Wed, 10 Jul 2013 04:22:09 +0000 (21:22 -0700)]
Merge pull request #1144 from totten/CRM-12865-profile-name
CRM-12865 - Define regions and CSS classes for profile forms
Tim Otten [Wed, 10 Jul 2013 04:17:16 +0000 (21:17 -0700)]
CRM-12865 - Emit hooks for profile forms
----------------------------------------
* CRM-12865: Define hook/CSS/region names for profile forms
http://issues.civicrm.org/jira/browse/CRM-12865
Tim Otten [Wed, 10 Jul 2013 03:22:39 +0000 (20:22 -0700)]
CRM-12865 - Define regions and CSS classes for profile forms
With this revision, the following can be used:
* civicrm/profile
* CSS: form#Search .crm-profile-name-{NAME}
* Region: profile-search-{NAME}
* civicrm/profile/create:
* CSS: form#Edit .crm-profile-name-{NAME}
* Region: profile-form-{NAME}
* civicrm/profile/edit:
* CSS: form#Edit .crm-profile-name-{NAME}
* Region: profile-form-{NAME}
* civicrm/profile/view:
* CSS: .crm-profile-view .crm-profile-name-{NAME}
* Region: profile-view-{NAME}
* civicrm/event/register:
* CSS: .crm-event-register-form-block .crm-profile-name-{NAME}
* civicrm/contribute/transact:
* CSS: .crm-contribution-main-form-block .crm-profile-name-{NAME}
----------------------------------------
* CRM-12865: Define hook/CSS/region names for profile forms
http://issues.civicrm.org/jira/browse/CRM-12865
Kurund Jalmi [Tue, 9 Jul 2013 21:28:31 +0000 (14:28 -0700)]
Merge pull request #1143 from kurund/CRM-12965
CRM-12965, UI improvements
Kurund Jalmi [Tue, 9 Jul 2013 21:28:00 +0000 (14:28 -0700)]
Merge pull request #1142 from kurund/CRM-12967
CRM-12967, barcode position fixes
Kurund Jalmi [Tue, 9 Jul 2013 21:27:14 +0000 (02:57 +0530)]
CRM-12967, barcode position fixes
projects / civicrm-core.git / log