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.
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.
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
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
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
Kurund Jalmi [Tue, 9 Jul 2013 19:26:03 +0000 (00:56 +0530)]
CRM-12965, UI improvements
Kurund Jalmi [Tue, 9 Jul 2013 19:04:21 +0000 (12:04 -0700)]
Merge pull request #1141 from kurund/CRM-12965
CRM-12965
Kurund Jalmi [Tue, 9 Jul 2013 19:02:49 +0000 (00:32 +0530)]
CRM-12965, moved help below text input
Kurund Jalmi [Tue, 9 Jul 2013 18:54:36 +0000 (00:24 +0530)]
added support for participant and custom data of type participant tokens CRM-12965
Kurund Jalmi [Tue, 9 Jul 2013 18:47:40 +0000 (00:17 +0530)]
typo fix CRM-12965
Kurund Jalmi [Tue, 9 Jul 2013 18:09:13 +0000 (23:39 +0530)]
CRM-12965, fixed defaults
Kurund Jalmi [Tue, 9 Jul 2013 18:06:02 +0000 (23:36 +0530)]
CRM-12965, notice fixes and cleanup
Kurund Jalmi [Tue, 9 Jul 2013 11:34:54 +0000 (04:34 -0700)]
Merge pull request #1140 from pratik-joshi/CRM-12964-upgrade-handling
CRM-12964-upgrade-handling
Pratik Joshi [Tue, 9 Jul 2013 11:29:20 +0000 (16:59 +0530)]
CRM-12964-upgrade-handling
Coleman Watts [Tue, 9 Jul 2013 03:18:47 +0000 (20:18 -0700)]
Fix typos in releaser script
CiviCRM [Tue, 9 Jul 2013 03:12:50 +0000 (20:12 -0700)]
Update version to 4.3.6
Kurund Jalmi [Mon, 8 Jul 2013 18:15:16 +0000 (11:15 -0700)]
Merge pull request #1138 from pratik-joshi/CRM-13011
CRM-13011 : applied the patch
Tim Otten [Mon, 8 Jul 2013 17:44:38 +0000 (10:44 -0700)]
Merge pull request #1134 from deepak-srivastava/toggle
CRM-12846
Tim Otten [Mon, 8 Jul 2013 17:25:39 +0000 (10:25 -0700)]
Merge pull request #1137 from totten/4.3-userLoginFinalize
CRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors
Tim Otten [Mon, 8 Jul 2013 17:12:54 +0000 (10:12 -0700)]
CRM-13014 - CRM_Utils_System::userLoginFinalize - Disable due to syntax errors
----------------------------------------
* CRM-13014: CiviMobile fatal on non-d7 -Need a UF function for login authenticate
http://issues.civicrm.org/jira/browse/CRM-13014
Pratik Joshi [Mon, 8 Jul 2013 15:01:22 +0000 (20:31 +0530)]
CRM-13011 : applied the patch
Kurund Jalmi [Mon, 8 Jul 2013 14:04:25 +0000 (07:04 -0700)]
Merge pull request #1136 from kurund/CRM-12965
CRM-12965, fixes for layout based on image
Kurund Jalmi [Mon, 8 Jul 2013 14:03:08 +0000 (19:33 +0530)]
CRM-12965, fixes for layout based on image
Deepak Srivastava [Mon, 8 Jul 2013 11:53:26 +0000 (17:23 +0530)]
CRM-12846, give preference to settings table
----------------------------------------
* CRM-12846: API support for toggling components by storing 'enableComponents' config in settings table
http://issues.civicrm.org/jira/browse/CRM-12846
Kurund Jalmi [Mon, 8 Jul 2013 11:17:20 +0000 (04:17 -0700)]
Merge pull request #1133 from pratik-joshi/CRM-13007
CRM-13007 fix
Deepak Srivastava [Mon, 8 Jul 2013 08:50:44 +0000 (14:20 +0530)]
CRM-12846, settings metadata spec
----------------------------------------
* CRM-12846: API support for toggling components by storing 'enableComponents' config in settings table
http://issues.civicrm.org/jira/browse/CRM-12846
Pratik Joshi [Mon, 8 Jul 2013 08:08:17 +0000 (13:38 +0530)]
CRM-13007 fix
Coleman Watts [Mon, 8 Jul 2013 04:11:33 +0000 (21:11 -0700)]
js cleanup
Kurund Jalmi [Sun, 7 Jul 2013 19:34:21 +0000 (12:34 -0700)]
Merge pull request #1124 from GiantRobot/apiclass-codingstds
CRM-13010. Coding standards cleanup in api/class.api.php
Kurund Jalmi [Sun, 7 Jul 2013 14:30:01 +0000 (07:30 -0700)]
Merge pull request #1132 from kurund/CRM-12966
CRM-12966
Kurund Jalmi [Sun, 7 Jul 2013 14:21:11 +0000 (19:51 +0530)]
added barcode support, CRM-12966
Kurund Jalmi [Fri, 5 Jul 2013 15:31:36 +0000 (21:01 +0530)]
CRM-12966, fixed image 2 position
Tim Otten [Sat, 6 Jul 2013 13:04:45 +0000 (06:04 -0700)]
Merge pull request #1130 from eileenmcnaughton/4.3
CRM-13016 update error code - test fix
eileen [Sat, 6 Jul 2013 03:18:11 +0000 (15:18 +1200)]
CRM-13016 update error code
Tim Otten [Sat, 6 Jul 2013 02:30:30 +0000 (19:30 -0700)]
Merge pull request #1127 from eileenmcnaughton/4.3
4.3 developer support, apiv3 wrapper, uf level functions to support civimobile/other extensions
eileen [Fri, 5 Jul 2013 22:46:52 +0000 (10:46 +1200)]
CRM-13014 support userLoginFinalize() for UF classes (fix civimobile)
eileen [Fri, 5 Jul 2013 07:29:30 +0000 (19:29 +1200)]
CRM-13016 add civicrm_api3 wrapper
Tim Otten [Fri, 5 Jul 2013 19:24:45 +0000 (12:24 -0700)]
Merge pull request #1118 from totten/master-apientities
api/v3 - Better support for entities defined by extensions
Tim Otten [Fri, 5 Jul 2013 19:24:09 +0000 (12:24 -0700)]
Merge pull request #1126 from totten/master-civiunittest-populatedb
CRM-12922 - Allow unit-tests (e.g. api_v3_HRJobTest) to override _populateDB()
Tim Otten [Fri, 5 Jul 2013 19:22:04 +0000 (12:22 -0700)]
CRM-12922 - Allow unit-tests (e.g. api_v3_HRJobTest) to override _populateDB()
----------------------------------------
* CRM-12922: Create data model for Job Position, etal
http://issues.civicrm.org/jira/browse/CRM-12922
Deepak Srivastava [Fri, 5 Jul 2013 14:06:54 +0000 (19:36 +0530)]
CRM-12846
----------------------------------------
* CRM-12846: API support for toggling components by storing 'enableComponents' config in settings table
http://issues.civicrm.org/jira/browse/CRM-12846
Kurund Jalmi [Fri, 5 Jul 2013 13:34:07 +0000 (06:34 -0700)]
Merge pull request #1125 from monishdeb/CRM-12928
CRM-12928 fixes
monishdeb [Fri, 5 Jul 2013 12:59:09 +0000 (18:29 +0530)]
CRM-12928 fixes
----------------------------------------
* CRM-12928: Merge contacts fatal error: Unknown column 'source_contact_id' in 'where clause (related to activity restructure)
http://issues.civicrm.org/jira/browse/CRM-12928
Chris Burgess [Fri, 5 Jul 2013 11:37:25 +0000 (23:37 +1200)]
CRM-13010. Coding standards cleanup in api/class.api.php
Kurund Jalmi [Thu, 4 Jul 2013 23:04:01 +0000 (16:04 -0700)]
Merge pull request #1123 from kurund/CRM-12966
CRM-12966
Kurund Jalmi [Thu, 4 Jul 2013 23:02:37 +0000 (04:32 +0530)]
CRM-12966, minor typo
projects / civicrm-core.git / log