Eileen McNaughton [Mon, 13 Oct 2014 04:39:38 +0000 (17:39 +1300)]
preliminary tidy up - trailing spaces & comments
Eileen McNaughton [Mon, 13 Oct 2014 04:27:35 +0000 (17:27 +1300)]
preliminary tidy up - mostly removing unused params
Eileen McNaughton [Mon, 13 Oct 2014 04:14:10 +0000 (17:14 +1300)]
preliminary tidy up - remove redundant refs to __LINE__
kurund [Tue, 7 Oct 2014 14:03:35 +0000 (19:33 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-07-19-33-29
Kurund Jalmi [Tue, 7 Oct 2014 13:54:16 +0000 (19:24 +0530)]
Merge pull request #4318 from jitendrapurohit/webtestfixes
webtest fixes 4.5
Kurund Jalmi [Tue, 7 Oct 2014 13:54:00 +0000 (19:24 +0530)]
Merge pull request #4319 from rohankatkar/webtest_4.5.0
Fixed webtest
Rohan Katkar [Tue, 7 Oct 2014 13:46:01 +0000 (19:16 +0530)]
Fixed webtest
Kurund Jalmi [Tue, 7 Oct 2014 13:24:21 +0000 (18:54 +0530)]
Merge pull request #4282 from colemanw/CRM-15327
CRM-15327 - Fix autofill of chain-select
jitendrapurohit [Tue, 7 Oct 2014 13:03:25 +0000 (18:33 +0530)]
webtest fixes 4.5
Dave Greenberg [Mon, 6 Oct 2014 21:40:27 +0000 (14:40 -0700)]
Merge pull request #4312 from civicrm/revert-4294-CRM-15407
Revert "CRM-15407 - add fee_amount and net_amount to Dummy processor."
Dave Greenberg [Mon, 6 Oct 2014 21:39:52 +0000 (14:39 -0700)]
Revert "CRM-15407 - add fee_amount and net_amount to Dummy processor."
Dave Greenberg [Mon, 6 Oct 2014 21:32:49 +0000 (14:32 -0700)]
Merge pull request #4294 from davecivicrm/CRM-15407
CRM-15407 - add fee_amount and net_amount to Dummy processor.
Dave Greenberg [Mon, 6 Oct 2014 21:25:19 +0000 (14:25 -0700)]
Merge pull request #4298 from davecivicrm/CRM-15374
CRM-15374 - exclude fee-related financial_trxn rows from balance calcula...
Coleman Watts [Mon, 6 Oct 2014 19:58:55 +0000 (15:58 -0400)]
CRM-13981 - Fix default value bug introduced in
133e2c9
This commit cleans up a useless foreach loop that didn't do anything (the conditional would always evaluate to TRUE)
and fixes a bug with setting default values:
It seems that with Quickform, calling $form->setDefults with $defaults['foo']['bar'] = $value is "almost" equivalent to
$defaults["foo[bar]"] = $value but with one key difference: the latter always trumps the former.
So because the buildProfile function uses the latter method to set country default value to defaultContactCountry
(e.g. United States), that would always override the "correct" default value which is set here.
Coleman Watts [Tue, 30 Sep 2014 20:08:58 +0000 (16:08 -0400)]
CRM-15327 - Fix autofill of chain-select
Coleman Watts [Thu, 18 Sep 2014 01:24:47 +0000 (21:24 -0400)]
OnBehalfOf.tpl - fix attr vs prop and trigger change
Kurund Jalmi [Mon, 6 Oct 2014 17:23:51 +0000 (22:53 +0530)]
Merge pull request #4302 from guanhuan/additional-participant-fixes
fixed additional participant error
Dave Greenberg [Mon, 6 Oct 2014 17:17:32 +0000 (10:17 -0700)]
Merge pull request #4309 from davecivicrm/CRM-11342
CRM-11342 - Fix for correct filtering of permissioned employees.
Yashodha Chaku [Mon, 6 Oct 2014 10:51:00 +0000 (16:21 +0530)]
Merge pull request #4311 from jitendrapurohit/webtestfixes
Webtestfixes
jitendrapurohit [Mon, 6 Oct 2014 10:43:53 +0000 (16:13 +0530)]
Additional fix
jitendrapurohit [Mon, 6 Oct 2014 10:37:13 +0000 (16:07 +0530)]
Webtest Fix
Kurund Jalmi [Sun, 5 Oct 2014 15:55:16 +0000 (21:25 +0530)]
Merge pull request #4289 from colemanw/CRM-15130
CRM-15130 - Avoid fatal error in jsortable.tpl
Coleman Watts [Sat, 4 Oct 2014 22:29:36 +0000 (18:29 -0400)]
Common.js minor cleanup
Dave Greenberg [Sat, 4 Oct 2014 00:54:46 +0000 (17:54 -0700)]
CRM-11342 - Fix for correct filtering of permissioned employees.
----------------------------------------
* CRM-11342:
https://issues.civicrm.org/jira/browse/CRM-11342
Dave Greenberg [Fri, 3 Oct 2014 22:12:29 +0000 (15:12 -0700)]
CRM-15374 - Fix new regression on fix for balance calc when options are full.
----------------------------------------
* CRM-15374:
https://issues.civicrm.org/jira/browse/CRM-15374
colemanw [Fri, 3 Oct 2014 21:32:02 +0000 (17:32 -0400)]
Merge pull request #4308 from colemanw/HRDCase
Remove obsolete HRDCase templates
Coleman Watts [Fri, 3 Oct 2014 21:29:54 +0000 (17:29 -0400)]
Remove obsolete HRDCase templates
colemanw [Fri, 3 Oct 2014 20:44:08 +0000 (16:44 -0400)]
Merge pull request #4307 from colemanw/console
Use CRM.console to prevent errors in older browsers
Coleman Watts [Fri, 3 Oct 2014 20:40:45 +0000 (16:40 -0400)]
Use CRM.console to prevent errors in older browsers
colemanw [Fri, 3 Oct 2014 17:43:18 +0000 (13:43 -0400)]
Merge pull request #4301 from colemanw/CRM-15411
CRM-15411 - Fix participant message ajax load
Kurund Jalmi [Fri, 3 Oct 2014 17:24:59 +0000 (18:24 +0100)]
Merge pull request #4068 from priyankakaran26/event-recurring-46
CRM-15256 : Repeating Events With Core Recursion
deepak-srivastava [Fri, 3 Oct 2014 14:49:35 +0000 (15:49 +0100)]
remove recurring dao file
deepak-srivastava [Fri, 3 Oct 2014 14:48:02 +0000 (15:48 +0100)]
add dao file to gitignore
deepak-srivastava [Fri, 3 Oct 2014 14:36:51 +0000 (15:36 +0100)]
misc indent fixes
deepak-srivastava [Fri, 3 Oct 2014 14:29:00 +0000 (15:29 +0100)]
if else spacing, and ts tags
unknown [Fri, 3 Oct 2014 14:23:18 +0000 (15:23 +0100)]
changed inline css to civicrm core classes and added custom classes for repeat dialog
Guanhuan Chen [Fri, 3 Oct 2014 14:17:40 +0000 (15:17 +0100)]
fixed additional participant error
Coleman Watts [Fri, 3 Oct 2014 13:59:45 +0000 (09:59 -0400)]
CRM-15411 - Fix participant message ajax load
deepak-srivastava [Fri, 3 Oct 2014 12:21:18 +0000 (13:21 +0100)]
else to a new line, if-else space corrections
deepak-srivastava [Fri, 3 Oct 2014 11:45:32 +0000 (12:45 +0100)]
indent fixes
deepak-srivastava [Fri, 3 Oct 2014 10:03:19 +0000 (11:03 +0100)]
some notice fixes
deepak-srivastava [Thu, 2 Oct 2014 16:00:41 +0000 (17:00 +0100)]
make sure recurring set has a parent-parent entry
unknown [Thu, 2 Oct 2014 15:47:27 +0000 (16:47 +0100)]
few more assertions for activity and event test cases
deepak-srivastava [Thu, 2 Oct 2014 14:41:47 +0000 (15:41 +0100)]
consider dao->delete result for triggerDelete()
deepak-srivastava [Thu, 2 Oct 2014 14:27:16 +0000 (15:27 +0100)]
switch listeners to symphony style
deepak-srivastava [Tue, 30 Sep 2014 17:25:44 +0000 (18:25 +0100)]
auto create linked entities after repeat config has been created
priyankakaran26 [Tue, 30 Sep 2014 14:06:40 +0000 (15:06 +0100)]
preview vs actual generation fix
unknown [Tue, 30 Sep 2014 13:49:02 +0000 (14:49 +0100)]
Few JS improvisations
unknown [Mon, 29 Sep 2014 17:36:54 +0000 (18:36 +0100)]
Moved function updateModeRecurringEntityForEvent to ManageEvent/Repeat.php
priyankakaran26 [Mon, 29 Sep 2014 15:40:59 +0000 (16:40 +0100)]
tidying up comment
unknown [Mon, 29 Sep 2014 16:36:13 +0000 (17:36 +0100)]
Validation - End date should be after event's start date
unknown [Mon, 29 Sep 2014 15:59:53 +0000 (16:59 +0100)]
Fixed - When given wrong criteria empty popup is shown
priyankakaran26 [Mon, 29 Sep 2014 14:31:14 +0000 (15:31 +0100)]
handle recurring entity delete
unknown [Mon, 29 Sep 2014 11:27:20 +0000 (12:27 +0100)]
Fixed - When resaving configuration from child, setdefaults would not work
unknown [Mon, 29 Sep 2014 09:59:29 +0000 (10:59 +0100)]
When mode update fails, change to this event is saved - Error handling
unknown [Fri, 19 Sep 2014 16:14:30 +0000 (17:14 +0100)]
Exclude dates js fix, do not add same date multiple times
unknown [Fri, 19 Sep 2014 14:17:19 +0000 (15:17 +0100)]
javascript tabspace correction for RecurringEntity template file
unknown [Fri, 19 Sep 2014 13:29:45 +0000 (14:29 +0100)]
Moved few event specific functions to CRM_Event_Form_ManageEvent_Repeat class, added comments to function in CRM/Core/BAO/RecurringEntity - need refinement
unknown [Thu, 18 Sep 2014 11:16:17 +0000 (12:16 +0100)]
Do not insert entries related to uf_join and price_set_entity in recurring_entity table
unknown [Wed, 17 Sep 2014 18:15:50 +0000 (19:15 +0100)]
Ajax return result correction and it's subsequent handling in js file
unknown [Wed, 17 Sep 2014 17:41:06 +0000 (18:41 +0100)]
Changed linked entity table for fee and registration
unknown [Wed, 17 Sep 2014 12:22:45 +0000 (13:22 +0100)]
Update cascade for all related tabs in Manage events
unknown [Tue, 16 Sep 2014 15:50:24 +0000 (16:50 +0100)]
Confirm pop up called only for the core tabs of the manage event and cascade changes works for friends and pcp
unknown [Mon, 15 Sep 2014 17:17:26 +0000 (18:17 +0100)]
Allow recreating recursions even from child event
unknown [Mon, 15 Sep 2014 16:18:57 +0000 (17:18 +0100)]
Replaced redundant code with BAO function getParticipantCountforEvent
unknown [Mon, 15 Sep 2014 15:19:16 +0000 (16:19 +0100)]
Always consider current event start date as repetition start date
priyankakaran26 [Sat, 13 Sep 2014 19:55:15 +0000 (20:55 +0100)]
linked entities test case
priyankakaran26 [Sat, 13 Sep 2014 18:31:42 +0000 (19:31 +0100)]
generalize skip fields & testing linked-entities
unknown [Sat, 13 Sep 2014 18:11:17 +0000 (19:11 +0100)]
Towards testing linked entities test cases
priyankakaran26 [Sat, 13 Sep 2014 16:03:42 +0000 (17:03 +0100)]
return params for generated entities
unknown [Sat, 13 Sep 2014 15:36:34 +0000 (16:36 +0100)]
Added comment for DAOs for Recurring Entity
priyankakaran26 [Sat, 13 Sep 2014 15:23:16 +0000 (16:23 +0100)]
towards linked entities and generation
unknown [Sat, 13 Sep 2014 15:05:46 +0000 (16:05 +0100)]
Add upgrade script for 4.6alpha1
unknown [Sat, 13 Sep 2014 14:54:42 +0000 (15:54 +0100)]
swap entity_status with start_action_date vice/versa
priyankakaran26 [Fri, 12 Sep 2014 21:58:28 +0000 (22:58 +0100)]
towards recursion object tests
priyankakaran26 [Fri, 12 Sep 2014 20:48:04 +0000 (21:48 +0100)]
towards recursion objects
priyankakaran26 [Fri, 12 Sep 2014 15:09:56 +0000 (16:09 +0100)]
test case using recursion objects
priyankakaran26 [Fri, 12 Sep 2014 14:42:59 +0000 (15:42 +0100)]
towards recursion objects
priyankakaran26 [Fri, 12 Sep 2014 09:34:35 +0000 (10:34 +0100)]
towards event:recursions thru objects
priyankakaran26 [Fri, 12 Sep 2014 09:04:27 +0000 (10:04 +0100)]
towards recursion object:general
priyankakaran26 [Fri, 12 Sep 2014 00:45:22 +0000 (01:45 +0100)]
towards recurring objects
priyankakaran26 [Thu, 11 Sep 2014 21:49:25 +0000 (22:49 +0100)]
test case for activities: object oriented
priyankakaran26 [Thu, 11 Sep 2014 17:19:53 +0000 (18:19 +0100)]
get indent alright
unknown [Thu, 11 Sep 2014 16:39:35 +0000 (17:39 +0100)]
Testcase: merged activity and event
unknown [Thu, 11 Sep 2014 14:37:08 +0000 (15:37 +0100)]
Testcase for Recurring Entity - events
unknown [Thu, 11 Sep 2014 13:07:15 +0000 (14:07 +0100)]
Testcase: Changes in comments and update class name
priyankakaran26 [Thu, 11 Sep 2014 12:49:40 +0000 (13:49 +0100)]
towards recurring activity test case
unknown [Thu, 11 Sep 2014 11:35:40 +0000 (12:35 +0100)]
Testcase for RecurringEntity:Activities
unknown [Tue, 9 Sep 2014 15:20:42 +0000 (16:20 +0100)]
Function optimization and js fix
unknown [Mon, 8 Sep 2014 21:06:26 +0000 (22:06 +0100)]
Link participant count to participant search
unknown [Mon, 8 Sep 2014 20:28:00 +0000 (21:28 +0100)]
Participant check before recreating repeat configuration
unknown [Mon, 8 Sep 2014 13:34:18 +0000 (14:34 +0100)]
fix for month case in generate recursion
unknown [Mon, 8 Sep 2014 00:03:18 +0000 (01:03 +0100)]
Check participant before deleting events
unknown [Sun, 7 Sep 2014 22:34:04 +0000 (23:34 +0100)]
Add time to repetition start date
priyankakaran26 [Sun, 7 Sep 2014 22:13:40 +0000 (23:13 +0100)]
interval cal fix
priyankakaran26 [Sun, 7 Sep 2014 20:08:55 +0000 (21:08 +0100)]
generalize core bao recurring entity
unknown [Sun, 7 Sep 2014 18:57:48 +0000 (19:57 +0100)]
repetition start date on the basis of parent event start date
priyankakaran26 [Sun, 7 Sep 2014 15:32:41 +0000 (16:32 +0100)]
1. dao generations fixes 2. cascade-type to mode
priyankakaran26 [Sun, 7 Sep 2014 13:34:14 +0000 (14:34 +0100)]
generate recurrsions based on exclude dates
unknown [Sun, 7 Sep 2014 11:31:59 +0000 (12:31 +0100)]
Hightligh repeat tab on manage event screen