Eileen McNaughton [Mon, 16 Mar 2015 19:42:12 +0000 (08:42 +1300)]
whitespace fixes
Eileen McNaughton [Mon, 16 Mar 2015 12:43:08 +0000 (01:43 +1300)]
remove duplicate setting of custom data after checking that custom data is still saved
Eileen McNaughton [Mon, 16 Mar 2015 12:30:37 +0000 (01:30 +1300)]
CRM-16055 fix relationship form to be adding related memberships properly (in the create action)
Eileen McNaughton [Mon, 16 Mar 2015 11:57:34 +0000 (00:57 +1300)]
CRM-16055 fix enabling & disabling of related memberships
Eileen McNaughton [Mon, 16 Mar 2015 11:29:29 +0000 (00:29 +1300)]
CRM-16055 removing an IF with 2 effects,
1) per discussion with Coleman - relationships should inherit membership independent of the logged in user permission
2) the check for duplicate means that if ANY duplicates are present then do not create any relationships - this going to miss valid relationships
Eileen McNaughton [Mon, 16 Mar 2015 11:26:44 +0000 (00:26 +1300)]
CRM-16055 fix form to work correctly on update action
Eileen McNaughton [Mon, 16 Mar 2015 11:16:01 +0000 (00:16 +1300)]
CRM-16055 enotice fix on ajax
Eileen McNaughton [Mon, 16 Mar 2015 10:35:46 +0000 (23:35 +1300)]
CRM-16055 fix tasks
These appear to be the only 2 places in the whole codebase calling relationship:add - this function no longer
accepts the same parameters so the tasks have bee re-written to call createMultiple
Eileen McNaughton [Mon, 16 Mar 2015 04:24:20 +0000 (17:24 +1300)]
CRM-16055 further fix on setting relationship fields
Eileen McNaughton [Mon, 16 Mar 2015 04:09:25 +0000 (17:09 +1300)]
CRM-16055 assume correct parameters are already loaded before checking for valid relationships
Eileen McNaughton [Mon, 16 Mar 2015 03:58:29 +0000 (16:58 +1300)]
CRM-16055 migrate single create call away from multiple create and use create api
Eileen McNaughton [Mon, 16 Mar 2015 03:53:54 +0000 (16:53 +1300)]
CRM-16055 remove handling for contact_check from relationship add
Eileen McNaughton [Sun, 15 Mar 2015 20:34:54 +0000 (09:34 +1300)]
minor comment improvement
Eileen McNaughton [Sat, 7 Mar 2015 12:05:07 +0000 (23:05 +1100)]
more phpcs tidy up
Eileen McNaughton [Sat, 7 Mar 2015 11:53:16 +0000 (22:53 +1100)]
code standards tidy-up
Eileen McNaughton [Sat, 7 Mar 2015 11:41:57 +0000 (22:41 +1100)]
code standards tidy-up
Eileen McNaughton [Sat, 7 Mar 2015 06:15:40 +0000 (17:15 +1100)]
CRM-16055 further refactor towards sensible relationship BAO functions
Eileen McNaughton [Sat, 7 Mar 2015 05:54:59 +0000 (16:54 +1100)]
fix code standards
Eileen McNaughton [Fri, 6 Mar 2015 21:26:17 +0000 (08:26 +1100)]
CRM-16055 towards using sensible multiple create function
Eileen McNaughton [Fri, 6 Mar 2015 20:56:16 +0000 (07:56 +1100)]
CRM-16055 initial fix
Eileen McNaughton [Mon, 16 Mar 2015 12:34:51 +0000 (01:34 +1300)]
Merge pull request #5402 from eileenmcnaughton/test
make mailing failure tests less specific. We try not to make failure tes...
kurund [Mon, 16 Mar 2015 11:54:51 +0000 (17:24 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-4.6-2015-03-16-17-24-33
Eileen McNaughton [Mon, 16 Mar 2015 08:38:56 +0000 (21:38 +1300)]
make mailing failure tests less specific. We try not to make failure tests too specific, in this case adding 'type'
to spec will change the message & we may as well not check it rather than changing the test
colemanw [Mon, 16 Mar 2015 03:02:15 +0000 (23:02 -0400)]
Merge pull request #5399 from colemanw/CRM-16115
CRM-16115 - Fix campaign datatable headers
Coleman Watts [Mon, 16 Mar 2015 03:00:02 +0000 (23:00 -0400)]
CRM-16115 - Fix campaign datatable headers
colemanw [Mon, 16 Mar 2015 02:50:42 +0000 (22:50 -0400)]
Merge pull request #5398 from colemanw/CRM-16103
CRM-16103 - Improve mailing search form layout
Coleman Watts [Mon, 16 Mar 2015 02:23:17 +0000 (22:23 -0400)]
CRM-16103 - Improve mailing search form layout
colemanw [Sun, 15 Mar 2015 23:34:32 +0000 (19:34 -0400)]
Merge pull request #5394 from colemanw/api
Api explorer improvement and getfields description cleanup
Coleman Watts [Sun, 15 Mar 2015 22:09:27 +0000 (18:09 -0400)]
API - Improve getfields for getrefcount
Coleman Watts [Sun, 15 Mar 2015 16:43:07 +0000 (12:43 -0400)]
API - don't put burden of sequential options on spec functions
Coleman Watts [Sun, 15 Mar 2015 15:55:19 +0000 (11:55 -0400)]
API - add field options to getoptions metadata
Dave Greenberg [Sun, 15 Mar 2015 15:41:06 +0000 (08:41 -0700)]
Merge pull request #5385 from davecivicrm/CRM-16109
Crm 16109
Coleman Watts [Sun, 15 Mar 2015 04:57:40 +0000 (00:57 -0400)]
API Explorer - fix getvalue action return field
Coleman Watts [Sun, 15 Mar 2015 04:34:07 +0000 (00:34 -0400)]
API - provide more metadata for generic actions
Coleman Watts [Sun, 15 Mar 2015 03:04:45 +0000 (23:04 -0400)]
Api explorer - limit multiselect to certain actions
Coleman Watts [Sun, 15 Mar 2015 02:49:37 +0000 (22:49 -0400)]
Cleanup api field descriptions
Coleman Watts [Sun, 15 Mar 2015 02:49:19 +0000 (22:49 -0400)]
Api explorer - render boolean fields as yes-no select
colemanw [Sat, 14 Mar 2015 18:26:12 +0000 (14:26 -0400)]
Merge pull request #5389 from mlutfy/4.6-crm16111
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 16:29:13 +0000 (12:29 -0400)]
CRM-16111: Translation string fixes (4.6 review).
Mathieu Lutfy [Sat, 14 Mar 2015 15:08:14 +0000 (11:08 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:49:26 +0000 (10:49 -0400)]
Merge pull request #5388 from mlutfy/4.6-crm15832-3
CRM-15832: Typo fix in tools/bin/scripts/create-pot-files
Mathieu Lutfy [Sat, 14 Mar 2015 14:45:48 +0000 (10:45 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:42:57 +0000 (10:42 -0400)]
CRM-16111: Translation string fixes (reported by r4zoli).
Mathieu Lutfy [Sat, 14 Mar 2015 14:26:53 +0000 (10:26 -0400)]
CRM-15832: Typo fix in tools/bin/scripts/create-pot-files
colemanw [Sat, 14 Mar 2015 00:20:03 +0000 (20:20 -0400)]
Merge pull request #5383 from deepak-srivastava/CRM-15932
CRM-15932 - Warning Fix: call_user_func() expects parameter 1 to be a valid callback...
Dave Greenberg [Sat, 14 Mar 2015 00:17:23 +0000 (17:17 -0700)]
CRM-16109 - suppress fee section for waitlist and approval-required registration flows. Fix failing webtest: testEventApprovalRegistration WebTest_Event_AddEventTest
----------------------------------------
* CRM-16109: Confusing empty display of fees section during confirmation and thank-you for waitlisted and require-approval registrations
https://issues.civicrm.org/jira/browse/CRM-16109
Dave Greenberg [Fri, 13 Mar 2015 23:57:17 +0000 (16:57 -0700)]
CRM-16109 - suppress fee section for waitlist and approval-required registration flows.
----------------------------------------
* CRM-16109: Confusing empty display of fees section during confirmation and thank-you for waitlisted and require-approval registrations
https://issues.civicrm.org/jira/browse/CRM-16109
deepak-srivastava [Fri, 13 Mar 2015 23:04:57 +0000 (23:04 +0000)]
CI: warning fix
Dave Greenberg [Fri, 13 Mar 2015 22:08:26 +0000 (15:08 -0700)]
Merge pull request #5384 from davecivicrm/CRM-16108
CRM-16108 - Backport to 4.6.
Dave Greenberg [Fri, 13 Mar 2015 22:08:47 +0000 (15:08 -0700)]
CRM-16108 - Backport to 4.6.
----------------------------------------
* CRM-16108: Some URL's cannot be parsed
https://issues.civicrm.org/jira/browse/CRM-16108
deepak-srivastava [Fri, 13 Mar 2015 21:54:01 +0000 (21:54 +0000)]
Warning Fix: call_user_func() expects parameter 1 to be a valid callback, second array member is not a valid method
colemanw [Fri, 13 Mar 2015 20:31:54 +0000 (16:31 -0400)]
Merge pull request #5374 from mlutfy/4.6-crm-15832-sh
CRM-15832: import create-pot-files and split partials/js in their respective components
colemanw [Fri, 13 Mar 2015 18:23:06 +0000 (14:23 -0400)]
Merge pull request #5326 from jmcclelland/smart-groups-data
Smart groups data
colemanw [Fri, 13 Mar 2015 18:18:05 +0000 (14:18 -0400)]
Merge pull request #5379 from rohankatkar/webtest-4.6
Webtest Fixes
colemanw [Fri, 13 Mar 2015 18:17:29 +0000 (14:17 -0400)]
Merge pull request #5378 from atif-shaikh/WebtestFix
WebtestFix
colemanw [Fri, 13 Mar 2015 18:16:54 +0000 (14:16 -0400)]
Merge pull request #5377 from jitendrapurohit/webtest46
webtest fixes
Mathieu Lutfy [Fri, 13 Mar 2015 16:16:43 +0000 (12:16 -0400)]
CRM-15832: rename create-pot-files.sh to create-pot-files (language-neutral).
colemanw [Fri, 13 Mar 2015 16:01:35 +0000 (12:01 -0400)]
Merge pull request #5381 from colemanw/setting
Move setting from dom to dynamic js
Coleman Watts [Fri, 13 Mar 2015 15:57:01 +0000 (11:57 -0400)]
Move setting from dom to dynamic js
colemanw [Fri, 13 Mar 2015 15:09:38 +0000 (11:09 -0400)]
Merge pull request #5376 from atif-shaikh/CRM-16105
CRM-16105 - For offline contributions recurring option does not appear
colemanw [Fri, 13 Mar 2015 14:56:10 +0000 (10:56 -0400)]
Merge pull request #5373 from colemanw/CRM-16076
CRM-16076 - Restore file/image behavior in profiles
colemanw [Fri, 13 Mar 2015 14:30:41 +0000 (10:30 -0400)]
Merge pull request #5380 from colemanw/CRM-15932
CRM-15932 - Show total number of events not just number of children
Web Access [Fri, 13 Mar 2015 13:21:14 +0000 (18:51 +0530)]
Webtest Fixes
atif-shaikh [Fri, 13 Mar 2015 13:20:03 +0000 (18:50 +0530)]
Webtest QA Fix
atif-shaikh [Fri, 13 Mar 2015 13:06:31 +0000 (18:36 +0530)]
WebtestFix
jitendrapurohit [Fri, 13 Mar 2015 13:05:41 +0000 (18:35 +0530)]
webtest fixes
atif-shaikh [Fri, 13 Mar 2015 12:34:49 +0000 (18:04 +0530)]
CRM-16105 - For ofline contributions recurring option does not appear
https://issues.civicrm.org/jira/browse/CRM-16105
Monish Deb [Fri, 13 Mar 2015 11:31:47 +0000 (17:01 +0530)]
Merge pull request #5375 from monishdeb/4.6
CRM-16102 fix - Thows validation error on adding any 'Contact' field if ...
monishdeb [Fri, 13 Mar 2015 08:29:35 +0000 (13:59 +0530)]
CRM-16102 fix - Thows validation error on adding any 'Contact' field if the profile has any 'Subtype' field
https://issues.civicrm.org/jira/browse/CRM-16102
Coleman Watts [Fri, 13 Mar 2015 02:19:44 +0000 (22:19 -0400)]
CRM-16076 - Avoid unnecessary query for empty image fields
Mathieu Lutfy [Fri, 13 Mar 2015 02:07:46 +0000 (22:07 -0400)]
CRM-15832: create-pot-files: split partials/js in their respective components.
Coleman Watts [Fri, 13 Mar 2015 01:57:53 +0000 (21:57 -0400)]
CRM-16076 - Restore file/image behavior in profiles
Mathieu Lutfy [Fri, 13 Mar 2015 01:51:34 +0000 (21:51 -0400)]
CRM-15832: Initial commit of tools/bin/scripts/create-pot-files.sh (moved from the l10n repo).
colemanw [Fri, 13 Mar 2015 00:40:03 +0000 (20:40 -0400)]
Merge pull request #5372 from agh1/reminder-created_date
CRM-16101 - Reminder based on created_date and modified_date
Dave Greenberg [Thu, 12 Mar 2015 23:35:29 +0000 (16:35 -0700)]
Merge pull request #5367 from atif-shaikh/CRM-16064WebTest
CRM-16064 - Webtest Fix
colemanw [Thu, 12 Mar 2015 22:44:16 +0000 (18:44 -0400)]
Merge pull request #5371 from colemanw/CRM-16096
CRM-16096 - Fix separator character in contact_type selectValues
colemanw [Thu, 12 Mar 2015 21:07:48 +0000 (17:07 -0400)]
Merge pull request #5370 from colemanw/CRM-16075
CRM-16075 - Remove country alias from api spec
Coleman Watts [Thu, 12 Mar 2015 21:00:23 +0000 (17:00 -0400)]
CRM-16096 - Fix separator character in contact_type selectValues
Andrew Hunt [Thu, 12 Mar 2015 20:25:53 +0000 (16:25 -0400)]
reminders: tests for created_date and modified_date
Monish Deb [Thu, 12 Mar 2015 19:35:00 +0000 (01:05 +0530)]
Merge pull request #5369 from rohankatkar/webtest-4.6
Webtest Fixes
Monish Deb [Thu, 12 Mar 2015 19:34:24 +0000 (01:04 +0530)]
Merge pull request #5368 from jitendrapurohit/webtestfix46
webtest fixes 4.6
Coleman Watts [Thu, 12 Mar 2015 18:47:29 +0000 (14:47 -0400)]
CRM-16075 - Remove country alias from api spec
Coleman Watts [Thu, 12 Mar 2015 17:59:57 +0000 (13:59 -0400)]
CRM-15988 - Use lowercase entity name in field_id
Andrew Hunt [Thu, 12 Mar 2015 16:46:22 +0000 (12:46 -0400)]
add reminders for created_date and modified_date
Coleman Watts [Thu, 12 Mar 2015 15:31:43 +0000 (11:31 -0400)]
Merge branch '4.5' into 4.6
Jon goldberg [Thu, 12 Mar 2015 03:42:28 +0000 (23:42 -0400)]
CRM-16056 - Core CiviCRM - Fix populating prev/next cache when jumping > 500 records past the end of cache
colemanw [Thu, 12 Mar 2015 14:04:21 +0000 (10:04 -0400)]
Merge pull request #5364 from colemanw/CRM-16085
CRM-16085 - Contact inline edit - Fix handling of empty name/email
Web Access [Thu, 12 Mar 2015 13:09:01 +0000 (18:39 +0530)]
Webtest Fixes
jitendrapurohit [Thu, 12 Mar 2015 13:06:36 +0000 (18:36 +0530)]
webtest fixes
atif-shaikh [Thu, 12 Mar 2015 11:01:23 +0000 (16:31 +0530)]
CRM-16064 - Contributions pricesets charge $1 more than selected
https://issues.civicrm.org/jira/browse/CRM-16064
atif-shaikh [Thu, 12 Mar 2015 10:36:36 +0000 (16:06 +0530)]
CRM-16064 - Webtest Fix
----------------------------------------
* CRM-16064: Contributions pricesets charge $1 more than selected
https://issues.civicrm.org/jira/browse/CRM-16064
Monish Deb [Thu, 12 Mar 2015 08:19:53 +0000 (13:49 +0530)]
Merge pull request #5366 from monishdeb/4.6
CRM-16092 fix - Incorrect API call in Civi/Payment/System.php
monishdeb [Thu, 12 Mar 2015 07:01:01 +0000 (12:31 +0530)]
CRM-16092 fix - Incorrect API call in Civi/Payment/System.php
https://issues.civicrm.org/jira/browse/CRM-16092
Monish Deb [Thu, 12 Mar 2015 05:38:28 +0000 (11:08 +0530)]
Merge pull request #5361 from rohankatkar/webtest-4.6
Webtest Fixes
Coleman Watts [Thu, 12 Mar 2015 01:58:48 +0000 (21:58 -0400)]
CRM-16085 - Contact inline edit - Fix handling of empty name/email
Dave Greenberg [Thu, 12 Mar 2015 00:32:01 +0000 (17:32 -0700)]
Merge pull request #5363 from colemanw/CRM-16093
CRM-16093 - Fix js error on participant form
Coleman Watts [Wed, 11 Mar 2015 18:10:53 +0000 (14:10 -0400)]
CRM-16093 - Fix js error on participant form
Web Access [Wed, 11 Mar 2015 13:26:13 +0000 (18:56 +0530)]
Webtest fixes
CiviCRM [Wed, 11 Mar 2015 10:51:48 +0000 (03:51 -0700)]
Update version to 4.6.beta4
Kurund Jalmi [Wed, 11 Mar 2015 08:55:52 +0000 (14:25 +0530)]
Merge pull request #5358 from atif-shaikh/CRM-14199WarningFix
CRM-14199 - Minor Warning Fix
projects / civicrm-core.git / log