Merge in Civi Core#1

Merged

seamuslee001 merged 4576 commits intoseamuslee001:masterfrom civicrm:master

Oct 18, 2014

+111,804-56,037

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 1, 2014

Commits on Oct 2, 2014

Commits on Oct 3, 2014

CRM-15374 - exclude fee-related financial_trxn rows from balance calculations and view payments page.
davecivicrm
committed
event recurring patch for v4.6

priyankakaran26
authored and
deepak-srivastava
committed
DAO changes

priyankakaran26
authored and
deepak-srivastava
committed
added default to cascade_type in recurring_entiy table

priyankakaran26
authored and
deepak-srivastava
committed
recurring form template

priyankakaran26
authored and
deepak-srivastava
committed
parent / child indication on manage events page

priyankakaran26
authored and
deepak-srivastava
committed
Highlight repeat tab event details page, removed unwanted code from recurringentity, removed loading image from preview confirmbox

priyankakaran26
authored and
deepak-srivastava
committed
fix ajax errors for diff php ver

priyankakaran26
authored and
deepak-srivastava
committed
Redirection correction to advanced search

priyankakaran26
authored and
deepak-srivastava
committed
cascade update based on mode / cascade-type

priyankakaran26
authored and
deepak-srivastava
committed
Allow submit for cascade type popup box

priyankakaran26
authored and
deepak-srivastava
committed
Update cascade type for all the events option

priyankakaran26
authored and
deepak-srivastava
committed
validation on ajax request-show error in dialog, setdefaults correction and moved the function to BAO/RecurringEntity

priyankakaran26
authored and
deepak-srivastava
committed
Ajax validation where ocurrences should not be more than 30, help text for help icons

priyankakaran26
authored and
deepak-srivastava
committed
Replaced function call getallConnected events function with getEntitiesForParent and removed it from RecurringEntity

priyankakaran26
authored and
deepak-srivastava
committed
Moved function generateRecursion and addEntityThroughRecursion from Form/RecurringEntity to BAO/RecurringEntity and their subsequent calls

priyankakaran26
authored and
deepak-srivastava
committed
repeat mode confirmation dialog generalization

priyankakaran26
authored and
deepak-srivastava
committed
repeat mode dialog improvements

priyankakaran26
authored and
deepak-srivastava
committed
Function to delete relation from recurringentity, xml path correction for ajax calls

priyankakaran26
authored and
deepak-srivastava
committed
since event-info effectively doesn't have any chnage, make it like as core would expect.

priyankakaran26
authored and
deepak-srivastava
committed
delete relations from recurring entity and highlight repeat on event dashboard

priyankakaran26
authored and
deepak-srivastava
committed
Js fix for copyexcludedates for posting dates

priyankakaran26
authored and
deepak-srivastava
committed
Parent /child text on event dashboard

priyankakaran26
authored and
deepak-srivastava
committed
Hightligh repeat tab on manage event screen

priyankakaran26
authored and
deepak-srivastava
committed
generate recurrsions based on exclude dates

priyankakaran26
authored and
deepak-srivastava
committed
1. dao generations fixes 2. cascade-type to mode

priyankakaran26
authored and
deepak-srivastava
committed
repetition start date on the basis of parent event start date

priyankakaran26
authored and
deepak-srivastava
committed
generalize core bao recurring entity

priyankakaran26
authored and
deepak-srivastava
committed
interval cal fix

priyankakaran26
authored and
deepak-srivastava
committed
Add time to repetition start date

priyankakaran26
authored and
deepak-srivastava
committed
Check participant before deleting events

priyankakaran26
authored and
deepak-srivastava
committed
fix for month case in generate recursion

priyankakaran26
authored and
deepak-srivastava
committed
Participant check before recreating repeat configuration

priyankakaran26
authored and
deepak-srivastava
committed
Link participant count to participant search

priyankakaran26
authored and
deepak-srivastava
committed
Function optimization and js fix

priyankakaran26
authored and
deepak-srivastava
committed
Testcase for RecurringEntity:Activities

priyankakaran26
authored and
deepak-srivastava
committed
towards recurring activity test case

priyankakaran26
authored and
deepak-srivastava
committed
Testcase: Changes in comments and update class name

priyankakaran26
authored and
deepak-srivastava
committed
Testcase for Recurring Entity - events

priyankakaran26
authored and
deepak-srivastava
committed
Testcase: merged activity and event

priyankakaran26
authored and
deepak-srivastava
committed
get indent alright

priyankakaran26
authored and
deepak-srivastava
committed
test case for activities: object oriented

priyankakaran26
authored and
deepak-srivastava
committed
towards recurring objects

priyankakaran26
authored and
deepak-srivastava
committed
towards recursion object:general

priyankakaran26
authored and
deepak-srivastava
committed
towards event:recursions thru objects

priyankakaran26
authored and
deepak-srivastava
committed
towards recursion objects

priyankakaran26
authored and
deepak-srivastava
committed
test case using recursion objects

priyankakaran26
authored and
deepak-srivastava
committed
towards recursion objects

priyankakaran26
authored and
deepak-srivastava
committed
towards recursion object tests

priyankakaran26
authored and
deepak-srivastava
committed
swap entity_status with start_action_date vice/versa

priyankakaran26
authored and
deepak-srivastava
committed
Add upgrade script for 4.6alpha1

priyankakaran26
authored and
deepak-srivastava
committed
towards linked entities and generation

priyankakaran26
authored and
deepak-srivastava
committed
Added comment for DAOs for Recurring Entity

priyankakaran26
authored and
deepak-srivastava
committed
return params for generated entities

priyankakaran26
authored and
deepak-srivastava
committed
Towards testing linked entities test cases

priyankakaran26
authored and
deepak-srivastava
committed
generalize skip fields & testing linked-entities

priyankakaran26
authored and
deepak-srivastava
committed
linked entities test case

priyankakaran26
authored and
deepak-srivastava
committed
Always consider current event start date as repetition start date

priyankakaran26
authored and
deepak-srivastava
committed
Replaced redundant code with BAO function getParticipantCountforEvent

priyankakaran26
authored and
deepak-srivastava
committed
Allow recreating recursions even from child event

priyankakaran26
authored and
deepak-srivastava
committed
Confirm pop up called only for the core tabs of the manage event and cascade changes works for friends and pcp

priyankakaran26
authored and
deepak-srivastava
committed
Update cascade for all related tabs in Manage events

priyankakaran26
authored and
deepak-srivastava
committed
Changed linked entity table for fee and registration

priyankakaran26
authored and
deepak-srivastava
committed
Ajax return result correction and it's subsequent handling in js file

priyankakaran26
authored and
deepak-srivastava
committed
Do not insert entries related to uf_join and price_set_entity in recurring_entity table

priyankakaran26
authored and
deepak-srivastava
committed
Moved few event specific functions to CRM_Event_Form_ManageEvent_Repeat class, added comments to function in CRM/Core/BAO/RecurringEntity - need refinement

priyankakaran26
authored and
deepak-srivastava
committed
javascript tabspace correction for RecurringEntity template file

priyankakaran26
authored and
deepak-srivastava
committed
Exclude dates js fix, do not add same date multiple times

priyankakaran26
authored and
deepak-srivastava
committed
When mode update fails, change to this event is saved - Error handling

priyankakaran26
authored and
deepak-srivastava
committed
Fixed - When resaving configuration from child, setdefaults would not work

priyankakaran26
authored and
deepak-srivastava
committed
handle recurring entity delete

priyankakaran26
authored and
deepak-srivastava
committed
Fixed - When given wrong criteria empty popup is shown

priyankakaran26
authored and
deepak-srivastava
committed
Validation - End date should be after event's start date

priyankakaran26
authored and
deepak-srivastava
committed
tidying up comment

priyankakaran26
authored and
deepak-srivastava
committed
Moved function updateModeRecurringEntityForEvent to ManageEvent/Repeat.php

priyankakaran26
authored and
deepak-srivastava
committed
Few JS improvisations

priyankakaran26
authored and
deepak-srivastava
committed
preview vs actual generation fix

priyankakaran26
authored and
deepak-srivastava
committed
auto create linked entities after repeat config has been created
deepak-srivastava
committed
switch listeners to symphony style
deepak-srivastava
committed
consider dao->delete result for triggerDelete()
deepak-srivastava
committed
few more assertions for activity and event test cases

priyankakaran26
authored and
deepak-srivastava
committed
make sure recurring set has a parent-parent entry
deepak-srivastava
committed
some notice fixes
deepak-srivastava
committed
indent fixes
deepak-srivastava
committed
else to a new line, if-else space corrections
deepak-srivastava
committed
CRM-15411 - Fix participant message ajax load
colemanw
committed
fixed additional participant error
guanhuan
committed
changed inline css to civicrm core classes and added custom classes for repeat dialog
priyankakaran26
committed
if else spacing, and ts tags
deepak-srivastava
committed
misc indent fixes
deepak-srivastava
committed
add dao file to gitignore
deepak-srivastava
committed
remove recurring dao file
deepak-srivastava
committed
Merge pull request #4068 from priyankakaran26/event-recurring-46
kurund
committed
Merge pull request #4301 from colemanw/CRM-15411
colemanw
committed
Use CRM.console to prevent errors in older browsers
colemanw
committed
Merge pull request #4307 from colemanw/console
colemanw
committed
Remove obsolete HRDCase templates
colemanw
committed
Merge pull request #4308 from colemanw/HRDCase
colemanw
committed
CRM-15374 - Fix new regression on fix for balance calc when options are full.
davecivicrm
committed

Commits on Oct 4, 2014

Commits on Oct 5, 2014

Commits on Oct 6, 2014

Commits on Oct 7, 2014

Commits on Oct 8, 2014

Merge pull request #4324 from davecivicrm/CRM-15234
davecivicrm
committed
Merge pull request #4322 from jmcclelland/mass-sms-logging
Yashodha Chaku
committed
Merge pull request #4317 from atif-shaikh/CRM-15379
Yashodha Chaku
committed
Additional changes for CRM-15421
rohankatkar
committed
Merge pull request #4325 from rohankatkar/CRM_15421
Yashodha Chaku
committed
Merge pull request #4316 from jitendrapurohit/CRM-15423
Yashodha Chaku
committed
Webtest fix
rohankatkar
committed
Merge pull request #4326 from rohankatkar/webtest_4.5.0
Yashodha Chaku
committed
CRM-15430 - ensure default dashlets properly initialized for new users.
jmcclelland
committed
Add link to basic payment processor inline help screen on the Payment Processor listings page (in addition to the create and edit form).
davecivicrm
committed
Merge pull request #4328 from davecivicrm/payProcHelp
davecivicrm
committed

Commits on Oct 9, 2014

Improve API explorer handling of operators
colemanw
committed
API explorer - fix getfields action select
colemanw
committed
Merge pull request #4331 from colemanw/explorer
colemanw
committed
webtest fixes
rohankatkar
committed
js break after editing Notes on Contact Summary Page
jitendrapurohit
committed
Merge pull request #4333 from jitendrapurohit/webtestfixes
Yashodha Chaku
committed
Merge pull request #4332 from rohankatkar/webtest-4.5.0
Yashodha Chaku
committed
CRM-15343 - 4.5.0 corrupts soft references to case-types
atif-shaikh
committed
Merge pull request #4223 from atif-shaikh/CRM-15366
Yashodha Chaku
committed
Merge pull request #4334 from atif-shaikh/CRM-15343
kurund
committed
CRM-15434 - Fix mailing search doesn't work in non-English languages
elcapo
committed
Webtest fixes
jitendrapurohit
committed
Merge pull request #4336 from jitendrapurohit/webtestfixes
Yashodha Chaku
committed
API Explorer - use entityRef for FK fields
colemanw
committed
Add basic entityRef support for activities
colemanw
committed
Normalize translated string
colemanw
committed
Fix contact entityRef placeholder text
colemanw
committed
CRM-15435: Fix custom group weights (mostly for Case ActivityView).
mlutfy
committed
Merge pull request #4338 from mlutfy/4.5-crm15435
colemanw
committed

Commits on Oct 10, 2014

Commits on Oct 11, 2014

Commits on Oct 12, 2014

Commits on Oct 13, 2014

Commits on Oct 14, 2014

Commits on Oct 15, 2014