civicrm-core.git
10 years agotowards recursion objects
priyankakaran26 [Fri, 12 Sep 2014 14:42:59 +0000 (15:42 +0100)]
towards recursion objects

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

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

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

10 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

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

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

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

10 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

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

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

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

10 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

10 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

10 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

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

10 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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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.

10 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

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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

10 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

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

10 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

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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

10 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

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

10 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

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

10 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

10 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

10 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

10 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.

10 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

10 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

10 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

10 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

10 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)

10 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

10 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

10 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

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

10 years agosql/4.5.alpha1.mysql.tpl - Fix syntax error
Tim Otten [Tue, 30 Sep 2014 13:38:15 +0000 (14:38 +0100)]
sql/4.5.alpha1.mysql.tpl - Fix syntax error

10 years ago--CRM-15391, Fixed typo error
Pradeep Nayak [Tue, 30 Sep 2014 13:09:33 +0000 (18:39 +0530)]
--CRM-15391, Fixed typo error

10 years agoWebtest fix
Rohan Katkar [Tue, 30 Sep 2014 12:35:09 +0000 (18:05 +0530)]
Webtest fix

10 years agoMerge pull request #4276 from yashodha/CRM-10206
Yashodha Chaku [Tue, 30 Sep 2014 12:27:57 +0000 (17:57 +0530)]
Merge pull request #4276 from yashodha/CRM-10206

CRM-10206

10 years agoCRM-10206
CiviCRM [Tue, 30 Sep 2014 12:03:36 +0000 (17:33 +0530)]
CRM-10206

10 years agoCRM-15389 - js error in communication prefs
Paul Campbell [Tue, 30 Sep 2014 11:27:20 +0000 (12:27 +0100)]
CRM-15389 - js error in communication prefs

----------------------------------------
* CRM-15389: Cannot change contact greetings due to Javascript error
  https://issues.civicrm.org/jira/browse/CRM-15389

10 years agoMerge pull request #71 from dpradeep/merge-20140930
Kurund Jalmi [Tue, 30 Sep 2014 10:02:31 +0000 (11:02 +0100)]
Merge pull request #71 from dpradeep/merge-20140930

merging civicrm canonical master into master

10 years agoMerge pull request #4270 from eileenmcnaughton/CRM-15296-test-harness
Eileen McNaughton [Tue, 30 Sep 2014 09:14:45 +0000 (22:14 +1300)]
Merge pull request #4270 from eileenmcnaughton/CRM-15296-test-harness

CRM-5296 test harness

10 years agoSay which extension being operated on
John E Prescott [Tue, 30 Sep 2014 09:12:59 +0000 (10:12 +0100)]
Say which extension being operated on

This changes the title of the extension form to include the name of the extension being disabled. This makes it clear if users are batch disabling extensions.

10 years agoMerge pull request #4268 from jitendrapurohit/webtestfixes
Yashodha Chaku [Tue, 30 Sep 2014 08:24:51 +0000 (13:54 +0530)]
Merge pull request #4268 from jitendrapurohit/webtestfixes

ParticipantMaxCountTest fix

10 years agoCRM-15296 make test committable so we can merge it in prior to merging fix
eileenmcnaughton [Tue, 30 Sep 2014 07:57:27 +0000 (07:57 +0000)]
CRM-15296 make test committable so we can merge it in prior to merging fix
ie we mark the unfixed bits incomplete

10 years agoMerge remote branch 'canonical/master' into merge-20140930
dpradeep [Tue, 30 Sep 2014 07:43:26 +0000 (13:13 +0530)]
Merge remote branch 'canonical/master' into merge-20140930

Conflicts:
CRM/Event/BAO/Participant.php
CRM/Member/BAO/Membership.php
CRM/Price/BAO/PriceSet.php
sql/civicrm_generated.mysql
templates/CRM/Price/Page/Field.tpl
templates/CRM/Price/Page/Option.tpl

10 years agoCRM-15296 test updates
Eileen McNaughton [Tue, 30 Sep 2014 07:35:27 +0000 (20:35 +1300)]
CRM-15296 test updates

10 years agoMerge pull request #4269 from rohankatkar/webtest_4.5.0
Yashodha Chaku [Tue, 30 Sep 2014 07:39:49 +0000 (13:09 +0530)]
Merge pull request #4269 from rohankatkar/webtest_4.5.0

Webtest Fix

10 years agoMerge pull request #4267 from eileenmcnaughton/CRM-15296-e-notice
Eileen McNaughton [Tue, 30 Sep 2014 06:58:44 +0000 (19:58 +1300)]
Merge pull request #4267 from eileenmcnaughton/CRM-15296-e-notice

CRM-15296 enotice fix

10 years agoParticipantMaxCountTest fix
jitendrapurohit [Tue, 30 Sep 2014 06:55:23 +0000 (12:25 +0530)]
ParticipantMaxCountTest fix

10 years agoWebtest Fix
Rohan Katkar [Tue, 30 Sep 2014 06:54:19 +0000 (12:24 +0530)]
Webtest Fix

10 years agoCRM-15296 enotice fix
Eileen McNaughton [Tue, 30 Sep 2014 02:59:32 +0000 (15:59 +1300)]
CRM-15296 enotice fix

10 years agoMerge pull request #4257 from eileenmcnaughton/CRM-15299-master
Eileen McNaughton [Tue, 30 Sep 2014 00:03:47 +0000 (13:03 +1300)]
Merge pull request #4257 from eileenmcnaughton/CRM-15299-master

CRM-15299 stdise behaviour on search (as tested via api)

10 years agoMerge pull request #4266 from davecivicrm/CRM-15387a
Dave Greenberg [Mon, 29 Sep 2014 23:41:27 +0000 (16:41 -0700)]
Merge pull request #4266 from davecivicrm/CRM-15387a

CRM-15387 - Add legacy support for honor_contact_id in contribution crea...

10 years agoCRM-15387 - Add legacy support for honor_contact_id in contribution create api, fix...
Dave Greenberg [Mon, 29 Sep 2014 23:40:41 +0000 (16:40 -0700)]
CRM-15387 - Add legacy support for honor_contact_id in contribution create api, fix legacy support for soft_credit_to so that soft_credit_type is set to default. Add tests for both.

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

10 years agoMerge pull request #4261 from rohankatkar/webtest_4.5.0
Yashodha Chaku [Mon, 29 Sep 2014 22:26:57 +0000 (03:56 +0530)]
Merge pull request #4261 from rohankatkar/webtest_4.5.0

Webtest fix

10 years agoMerge pull request #4264 from colemanw/css_sort
colemanw [Mon, 29 Sep 2014 19:46:10 +0000 (15:46 -0400)]
Merge pull request #4264 from colemanw/css_sort

Fix weird color added to some datatables' sort column

10 years agoFix weird color added to some datatables' sort column
Coleman Watts [Mon, 29 Sep 2014 19:44:42 +0000 (15:44 -0400)]
Fix weird color added to some datatables' sort column

10 years agoMerge pull request #4089 from jaapjansma/CRM-15268
Eileen McNaughton [Mon, 29 Sep 2014 19:17:58 +0000 (08:17 +1300)]
Merge pull request #4089 from jaapjansma/CRM-15268

Case update API doesn't return the correct values

10 years agoMerge pull request #4263 from colemanw/More
colemanw [Mon, 29 Sep 2014 18:46:17 +0000 (14:46 -0400)]
Merge pull request #4263 from colemanw/More

More related data to refresh on contact summary tab

10 years agoMore related data to refresh on contact summary tab
Coleman Watts [Mon, 29 Sep 2014 18:42:49 +0000 (14:42 -0400)]
More related data to refresh on contact summary tab

10 years agoMerge pull request #4262 from JohnFF/master
Dave Greenberg [Mon, 29 Sep 2014 18:11:38 +0000 (11:11 -0700)]
Merge pull request #4262 from JohnFF/master

Minor fix to incorrect HTML

10 years agoMerge pull request #4258 from jitendrapurohit/CRM-15368
colemanw [Mon, 29 Sep 2014 17:54:20 +0000 (13:54 -0400)]
Merge pull request #4258 from jitendrapurohit/CRM-15368

CRM-15368