civicrm-core.git
9 years agoMoved function updateModeRecurringEntityForEvent to ManageEvent/Repeat.php
unknown [Mon, 29 Sep 2014 17:36:54 +0000 (18:36 +0100)]
Moved function updateModeRecurringEntityForEvent to ManageEvent/Repeat.php

9 years agotidying up comment
priyankakaran26 [Mon, 29 Sep 2014 15:40:59 +0000 (16:40 +0100)]
tidying up comment

9 years agoValidation - End date should be after event's start date
unknown [Mon, 29 Sep 2014 16:36:13 +0000 (17:36 +0100)]
Validation - End date should be after event's start date

9 years agoFixed - When given wrong criteria empty popup is shown
unknown [Mon, 29 Sep 2014 15:59:53 +0000 (16:59 +0100)]
Fixed - When given wrong criteria empty popup is shown

9 years agohandle recurring entity delete
priyankakaran26 [Mon, 29 Sep 2014 14:31:14 +0000 (15:31 +0100)]
handle recurring entity delete

9 years agoFixed - When resaving configuration from child, setdefaults would not work
unknown [Mon, 29 Sep 2014 11:27:20 +0000 (12:27 +0100)]
Fixed - When resaving configuration from child, setdefaults would not work

9 years agoWhen mode update fails, change to this event is saved - Error handling
unknown [Mon, 29 Sep 2014 09:59:29 +0000 (10:59 +0100)]
When mode update fails, change to this event is saved - Error handling

9 years agoExclude dates js fix, do not add same date multiple times
unknown [Fri, 19 Sep 2014 16:14:30 +0000 (17:14 +0100)]
Exclude dates js fix, do not add same date multiple times

9 years agojavascript tabspace correction for RecurringEntity template file
unknown [Fri, 19 Sep 2014 14:17:19 +0000 (15:17 +0100)]
javascript tabspace correction for RecurringEntity template file

9 years agoMoved few event specific functions to CRM_Event_Form_ManageEvent_Repeat class, added...
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

9 years agoDo not insert entries related to uf_join and price_set_entity in recurring_entity...
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

9 years agoAjax return result correction and it's subsequent handling in js file
unknown [Wed, 17 Sep 2014 18:15:50 +0000 (19:15 +0100)]
Ajax return result correction and it's subsequent handling in js file

9 years agoChanged linked entity table for fee and registration
unknown [Wed, 17 Sep 2014 17:41:06 +0000 (18:41 +0100)]
Changed linked entity table for fee and registration

9 years agoUpdate cascade for all related tabs in Manage events
unknown [Wed, 17 Sep 2014 12:22:45 +0000 (13:22 +0100)]
Update cascade for all related tabs in Manage events

9 years agoConfirm pop up called only for the core tabs of the manage event and cascade changes...
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

9 years agoAllow recreating recursions even from child event
unknown [Mon, 15 Sep 2014 17:17:26 +0000 (18:17 +0100)]
Allow recreating recursions even from child event

9 years agoReplaced redundant code with BAO function getParticipantCountforEvent
unknown [Mon, 15 Sep 2014 16:18:57 +0000 (17:18 +0100)]
Replaced redundant code with BAO function getParticipantCountforEvent

9 years agoAlways consider current event start date as repetition start date
unknown [Mon, 15 Sep 2014 15:19:16 +0000 (16:19 +0100)]
Always consider current event start date as repetition start date

9 years agolinked entities test case
priyankakaran26 [Sat, 13 Sep 2014 19:55:15 +0000 (20:55 +0100)]
linked entities test case

9 years agogeneralize skip fields & testing linked-entities
priyankakaran26 [Sat, 13 Sep 2014 18:31:42 +0000 (19:31 +0100)]
generalize skip fields & testing linked-entities

9 years agoTowards testing linked entities test cases
unknown [Sat, 13 Sep 2014 18:11:17 +0000 (19:11 +0100)]
Towards testing linked entities test cases

9 years agoreturn params for generated entities
priyankakaran26 [Sat, 13 Sep 2014 16:03:42 +0000 (17:03 +0100)]
return params for generated entities

9 years agoAdded comment for DAOs for Recurring Entity
unknown [Sat, 13 Sep 2014 15:36:34 +0000 (16:36 +0100)]
Added comment for DAOs for Recurring Entity

9 years agotowards linked entities and generation
priyankakaran26 [Sat, 13 Sep 2014 15:23:16 +0000 (16:23 +0100)]
towards linked entities and generation

9 years agoAdd upgrade script for 4.6alpha1
unknown [Sat, 13 Sep 2014 15:05:46 +0000 (16:05 +0100)]
Add upgrade script for 4.6alpha1

9 years agoswap entity_status with start_action_date vice/versa
unknown [Sat, 13 Sep 2014 14:54:42 +0000 (15:54 +0100)]
swap entity_status with start_action_date vice/versa

9 years agotowards recursion object tests
priyankakaran26 [Fri, 12 Sep 2014 21:58:28 +0000 (22:58 +0100)]
towards recursion object tests

9 years agotowards recursion objects
priyankakaran26 [Fri, 12 Sep 2014 20:48:04 +0000 (21:48 +0100)]
towards recursion objects

9 years agotest case using recursion objects
priyankakaran26 [Fri, 12 Sep 2014 15:09:56 +0000 (16:09 +0100)]
test case using recursion objects

9 years agotowards recursion objects
priyankakaran26 [Fri, 12 Sep 2014 14:42:59 +0000 (15:42 +0100)]
towards recursion objects

9 years agotowards event:recursions thru objects
priyankakaran26 [Fri, 12 Sep 2014 09:34:35 +0000 (10:34 +0100)]
towards event:recursions thru objects

9 years agotowards recursion object:general
priyankakaran26 [Fri, 12 Sep 2014 09:04:27 +0000 (10:04 +0100)]
towards recursion object:general

9 years agotowards recurring objects
priyankakaran26 [Fri, 12 Sep 2014 00:45:22 +0000 (01:45 +0100)]
towards recurring objects

9 years agotest case for activities: object oriented
priyankakaran26 [Thu, 11 Sep 2014 21:49:25 +0000 (22:49 +0100)]
test case for activities: object oriented

9 years agoget indent alright
priyankakaran26 [Thu, 11 Sep 2014 17:19:53 +0000 (18:19 +0100)]
get indent alright

9 years agoTestcase: merged activity and event
unknown [Thu, 11 Sep 2014 16:39:35 +0000 (17:39 +0100)]
Testcase: merged activity and event

9 years agoTestcase for Recurring Entity - events
unknown [Thu, 11 Sep 2014 14:37:08 +0000 (15:37 +0100)]
Testcase for Recurring Entity - events

9 years agoTestcase: Changes in comments and update class name
unknown [Thu, 11 Sep 2014 13:07:15 +0000 (14:07 +0100)]
Testcase: Changes in comments and update class name

9 years agotowards recurring activity test case
priyankakaran26 [Thu, 11 Sep 2014 12:49:40 +0000 (13:49 +0100)]
towards recurring activity test case

9 years agoTestcase for RecurringEntity:Activities
unknown [Thu, 11 Sep 2014 11:35:40 +0000 (12:35 +0100)]
Testcase for RecurringEntity:Activities

9 years agoFunction optimization and js fix
unknown [Tue, 9 Sep 2014 15:20:42 +0000 (16:20 +0100)]
Function optimization and js fix

9 years agoLink participant count to participant search
unknown [Mon, 8 Sep 2014 21:06:26 +0000 (22:06 +0100)]
Link participant count to participant search

9 years agoParticipant check before recreating repeat configuration
unknown [Mon, 8 Sep 2014 20:28:00 +0000 (21:28 +0100)]
Participant check before recreating repeat configuration

9 years agofix for month case in generate recursion
unknown [Mon, 8 Sep 2014 13:34:18 +0000 (14:34 +0100)]
fix for month case in generate recursion

9 years agoCheck participant before deleting events
unknown [Mon, 8 Sep 2014 00:03:18 +0000 (01:03 +0100)]
Check participant before deleting events

9 years agoAdd time to repetition start date
unknown [Sun, 7 Sep 2014 22:34:04 +0000 (23:34 +0100)]
Add time to repetition start date

9 years agointerval cal fix
priyankakaran26 [Sun, 7 Sep 2014 22:13:40 +0000 (23:13 +0100)]
interval cal fix

9 years agogeneralize core bao recurring entity
priyankakaran26 [Sun, 7 Sep 2014 20:08:55 +0000 (21:08 +0100)]
generalize core bao recurring entity

9 years agorepetition start date on the basis of parent event start date
unknown [Sun, 7 Sep 2014 18:57:48 +0000 (19:57 +0100)]
repetition start date on the basis of parent event start date

9 years ago1. dao generations fixes 2. cascade-type to mode
priyankakaran26 [Sun, 7 Sep 2014 15:32:41 +0000 (16:32 +0100)]
1. dao generations fixes 2. cascade-type to mode

9 years agogenerate recurrsions based on exclude dates
priyankakaran26 [Sun, 7 Sep 2014 13:34:14 +0000 (14:34 +0100)]
generate recurrsions based on exclude dates

9 years agoHightligh repeat tab on manage event screen
unknown [Sun, 7 Sep 2014 11:31:59 +0000 (12:31 +0100)]
Hightligh repeat tab on manage event screen

9 years agoParent /child text on event dashboard
unknown [Sun, 7 Sep 2014 11:08:52 +0000 (12:08 +0100)]
Parent /child text on event dashboard

9 years agoJs fix for copyexcludedates for posting dates
unknown [Sat, 6 Sep 2014 23:45:31 +0000 (00:45 +0100)]
Js fix for copyexcludedates for posting dates

9 years agodelete relations from recurring entity and highlight repeat on event dashboard
unknown [Sat, 6 Sep 2014 21:58:51 +0000 (22:58 +0100)]
delete relations from recurring entity and highlight repeat on event dashboard

9 years agosince event-info effectively doesn't have any chnage, make it like as core would...
priyankakaran26 [Sat, 6 Sep 2014 21:50:06 +0000 (22:50 +0100)]
since event-info effectively doesn't have any chnage, make it like as core would expect.

9 years agoFunction to delete relation from recurringentity, xml path correction for ajax calls
unknown [Sat, 6 Sep 2014 19:47:12 +0000 (20:47 +0100)]
Function to delete relation from recurringentity, xml path correction for ajax calls

9 years agorepeat mode dialog improvements
priyankakaran26 [Fri, 5 Sep 2014 23:20:30 +0000 (00:20 +0100)]
repeat mode dialog improvements

9 years agorepeat mode confirmation dialog generalization
priyankakaran26 [Fri, 5 Sep 2014 23:02:03 +0000 (00:02 +0100)]
repeat mode confirmation dialog generalization

9 years agoMoved function generateRecursion and addEntityThroughRecursion from Form/RecurringEnt...
unknown [Fri, 5 Sep 2014 16:11:50 +0000 (17:11 +0100)]
Moved function generateRecursion and addEntityThroughRecursion from Form/RecurringEntity to BAO/RecurringEntity and their subsequent calls

9 years agoReplaced function call getallConnected events function with getEntitiesForParent...
unknown [Fri, 5 Sep 2014 15:39:36 +0000 (16:39 +0100)]
Replaced function call getallConnected events function with getEntitiesForParent and removed it from RecurringEntity

9 years agoAjax validation where ocurrences should not be more than 30, help text for help icons
unknown [Fri, 5 Sep 2014 14:53:57 +0000 (15:53 +0100)]
Ajax validation where ocurrences should not be more than 30, help text for help icons

9 years agovalidation on ajax request-show error in dialog, setdefaults correction and moved...
unknown [Fri, 5 Sep 2014 11:47:12 +0000 (12:47 +0100)]
validation on ajax request-show error in dialog, setdefaults correction and moved the function to BAO/RecurringEntity

9 years agoUpdate cascade type for all the events option
unknown [Thu, 4 Sep 2014 17:42:48 +0000 (18:42 +0100)]
Update cascade type for all the events option

9 years agoAllow submit for cascade type popup box
unknown [Thu, 4 Sep 2014 17:17:04 +0000 (18:17 +0100)]
Allow submit for cascade type popup box

9 years agocascade update based on mode / cascade-type
priyankakaran26 [Thu, 4 Sep 2014 17:05:01 +0000 (18:05 +0100)]
cascade update based on mode / cascade-type

9 years agoRedirection correction to advanced search
unknown [Thu, 4 Sep 2014 16:35:39 +0000 (17:35 +0100)]
Redirection correction to advanced search

9 years agofix ajax errors for diff php ver
priyankakaran26 [Thu, 4 Sep 2014 14:58:04 +0000 (15:58 +0100)]
fix ajax errors for diff php ver

9 years agoHighlight repeat tab event details page, removed unwanted code from recurringentity...
unknown [Thu, 4 Sep 2014 13:59:28 +0000 (14:59 +0100)]
Highlight repeat tab event details page, removed unwanted code from recurringentity, removed loading image from preview confirmbox

9 years agoparent / child indication on manage events page
priyankakaran26 [Thu, 4 Sep 2014 11:49:52 +0000 (12:49 +0100)]
parent / child indication on manage events page

9 years agorecurring form template
priyankakaran26 [Thu, 4 Sep 2014 11:32:11 +0000 (12:32 +0100)]
recurring form template

9 years agoadded default to cascade_type in recurring_entiy table
unknown [Thu, 4 Sep 2014 11:06:20 +0000 (12:06 +0100)]
added default to cascade_type in recurring_entiy table

9 years agoDAO changes
unknown [Thu, 4 Sep 2014 10:41:45 +0000 (11:41 +0100)]
DAO changes

9 years agoevent recurring patch for v4.6
priyankakaran26 [Wed, 3 Sep 2014 21:13:51 +0000 (22:13 +0100)]
event recurring patch for v4.6

9 years agoMerge branch 'master' of github.com:webaccess/civicrm-core into sales-tax
kurund [Thu, 2 Oct 2014 09:35:36 +0000 (10:35 +0100)]
Merge branch 'master' of github.com:webaccess/civicrm-core into sales-tax

Conflicts:
api/v3/Contribution.php

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58
Tim Otten [Thu, 2 Oct 2014 06:54:01 +0000 (07:54 +0100)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-02-07-53-58

9 years agofixed the version, generated data and version for new fields
kurund [Thu, 2 Oct 2014 00:15:56 +0000 (05:45 +0530)]
fixed the version, generated data and version for new fields

9 years agoMerge pull request #72 from dpradeep/upgrade-handling
Kurund Jalmi [Wed, 1 Oct 2014 22:12:27 +0000 (23:12 +0100)]
Merge pull request #72 from dpradeep/upgrade-handling

Migrated update code from 4.5.beta5 to 4.6.alpha1

9 years agoMerge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-01-19-08-00
Tim Otten [Wed, 1 Oct 2014 18:08:27 +0000 (19:08 +0100)]
Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-10-01-19-08-00

9 years agoMerge pull request #4288 from totten/4.4-setupsh-port
Tim Otten [Wed, 1 Oct 2014 16:55:24 +0000 (17:55 +0100)]
Merge pull request #4288 from totten/4.4-setupsh-port

setup.sh - Fix support mysqld on alternative ports

9 years agosetup.sh - Fix support mysqld on alternative ports
Tim Otten [Wed, 1 Oct 2014 16:20:37 +0000 (17:20 +0100)]
setup.sh - Fix support mysqld on alternative ports

9 years agoMerge pull request #4285 from jitendrapurohit/CRM-15396
Kurund Jalmi [Wed, 1 Oct 2014 14:15:14 +0000 (15:15 +0100)]
Merge pull request #4285 from jitendrapurohit/CRM-15396

CRM-15396

9 years agoMerge pull request #4286 from totten/4.5-entity-ref-bc
Tim Otten [Wed, 1 Oct 2014 13:02:28 +0000 (14:02 +0100)]
Merge pull request #4286 from totten/4.5-entity-ref-bc

CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs

9 years agoCRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's...
Tim Otten [Wed, 1 Oct 2014 11:24:18 +0000 (12:24 +0100)]
CRM-15198 - EntityReference - Provide backward compatibility with CiviVolunteer's DAOs

9 years agoCRM-15396
jitendrapurohit [Wed, 1 Oct 2014 10:04:31 +0000 (15:34 +0530)]
CRM-15396

9 years agoMerge pull request #4280 from mrpaulc/CRM-15383
Kurund Jalmi [Wed, 1 Oct 2014 09:39:58 +0000 (10:39 +0100)]
Merge pull request #4280 from mrpaulc/CRM-15383

CRM-15383 - fix template loading for PDF letter

9 years agoWebtest fixes
Coleman Watts [Wed, 1 Oct 2014 01:09:33 +0000 (21:09 -0400)]
Webtest fixes

9 years agoMerge pull request #4246 from crusonweb/CRM-15310
Kurund Jalmi [Wed, 1 Oct 2014 00:12:56 +0000 (01:12 +0100)]
Merge pull request #4246 from crusonweb/CRM-15310

CRM-15310

9 years agoMerge pull request #4277 from rohankatkar/webtest_4.5.0
Kurund Jalmi [Wed, 1 Oct 2014 00:02:11 +0000 (01:02 +0100)]
Merge pull request #4277 from rohankatkar/webtest_4.5.0

Webtest fix

9 years agoMerge pull request #4281 from colemanw/CRM-15394
Dave Greenberg [Tue, 30 Sep 2014 23:08:21 +0000 (16:08 -0700)]
Merge pull request #4281 from colemanw/CRM-15394

CRM-15394 - Fix credit card contribution link

9 years agoMerge pull request #4283 from davecivicrm/CRM-15380
Dave Greenberg [Tue, 30 Sep 2014 22:36:41 +0000 (15:36 -0700)]
Merge pull request #4283 from davecivicrm/CRM-15380

CRM-15380 - Replaces PR 4273.

9 years agoCRM-15380 - Replaces PR 4273.
Dave Greenberg [Tue, 30 Sep 2014 22:33:19 +0000 (15:33 -0700)]
CRM-15380 - Replaces PR 4273.

----------------------------------------
* CRM-15380:
  https://issues.civicrm.org/jira/browse/CRM-15380

9 years agoMerge pull request #4271 from JohnFF/patch-1
Dave Greenberg [Tue, 30 Sep 2014 20:11:18 +0000 (13:11 -0700)]
Merge pull request #4271 from JohnFF/patch-1

Say which extension being operated on

9 years agoCRM-15394 - Fix credit card contribution link
Coleman Watts [Tue, 30 Sep 2014 19:37:44 +0000 (15:37 -0400)]
CRM-15394 - Fix credit card contribution link

9 years agoMerge pull request #4275 from mrpaulc/CRM-15389
colemanw [Tue, 30 Sep 2014 17:44:47 +0000 (13:44 -0400)]
Merge pull request #4275 from mrpaulc/CRM-15389

CRM-15389 - js error in communication prefs

9 years agoMerge pull request #4279 from totten/monishdeb-CRM-15343
Tim Otten [Tue, 30 Sep 2014 15:43:22 +0000 (16:43 +0100)]
Merge pull request #4279 from totten/monishdeb-CRM-15343

CRM-15343 - CiviCase - Fix corruption of soft FKs (case-type-id)

9 years agoCRM-15383 - fix template loading for PDF letter
Paul Campbell [Tue, 30 Sep 2014 15:41:06 +0000 (16:41 +0100)]
CRM-15383 - fix template loading for PDF letter

----------------------------------------
* CRM-15383: Can't load template when creating PDF letter
  https://issues.civicrm.org/jira/browse/CRM-15383

9 years agoMigrated update code from 4.5.beta5 to 4.6.alpha1
dpradeep [Tue, 30 Sep 2014 14:34:25 +0000 (20:04 +0530)]
Migrated update code from 4.5.beta5 to 4.6.alpha1

9 years agoMerge pull request #4278 from pradpnayak/CRM-15391
Kurund Jalmi [Tue, 30 Sep 2014 13:59:31 +0000 (14:59 +0100)]
Merge pull request #4278 from pradpnayak/CRM-15391

--CRM-15391, Fixed typo error

9 years agoUpgrade...FourFive.php - Tweak message
Tim Otten [Tue, 30 Sep 2014 13:38:31 +0000 (14:38 +0100)]
Upgrade...FourFive.php - Tweak message