civicrm-core.git
10 years agoMerge pull request #3341 from systopia/CRM-14740
pratik-joshi [Mon, 26 May 2014 11:13:14 +0000 (16:43 +0530)]
Merge pull request #3341 from systopia/CRM-14740

CRM-14740

10 years agoMerge pull request #3359 from jitendrapurohit/CRM_14315
pratik-joshi [Mon, 26 May 2014 07:51:04 +0000 (13:21 +0530)]
Merge pull request #3359 from jitendrapurohit/CRM_14315

CRM-14315

10 years agoCRM-14315
jitendrapurohit [Mon, 26 May 2014 07:38:37 +0000 (13:08 +0530)]
CRM-14315

10 years agoMerge pull request #3339 from yashodha/CRM-14664
Yashodha Chaku [Mon, 26 May 2014 06:50:42 +0000 (12:20 +0530)]
Merge pull request #3339 from yashodha/CRM-14664

CRM-14664: js fixes

10 years agoMerge pull request #3355 from eileenmcnaughton/comments
Tim Otten [Sat, 24 May 2014 18:59:58 +0000 (11:59 -0700)]
Merge pull request #3355 from eileenmcnaughton/comments

Autogenerated comments for Civi dir

10 years agoMerge pull request #3358 from eileenmcnaughton/comments-extra
Eileen McNaughton [Sat, 24 May 2014 09:34:10 +0000 (21:34 +1200)]
Merge pull request #3358 from eileenmcnaughton/comments-extra

Comments extra

10 years agocomments & spelling
Eileen McNaughton [Sat, 24 May 2014 07:21:00 +0000 (19:21 +1200)]
comments & spelling

10 years agofix spelling errors & a couple of comment blocks
Eileen McNaughton [Sat, 24 May 2014 07:14:24 +0000 (19:14 +1200)]
fix spelling errors & a couple of comment blocks

10 years agomissing comments in civi dir
Eileen McNaughton [Sat, 24 May 2014 03:22:47 +0000 (15:22 +1200)]
missing comments in civi dir

10 years agoMerge pull request #3356 from eileenmcnaughton/tests
Eileen McNaughton [Sat, 24 May 2014 05:56:57 +0000 (17:56 +1200)]
Merge pull request #3356 from eileenmcnaughton/tests

test & comment tidy-ups

10 years agominor test tidy-up - esp remove unused vars
Eileen McNaughton [Sat, 24 May 2014 05:54:39 +0000 (17:54 +1200)]
minor test tidy-up - esp remove unused vars

10 years agoadd a couple of comments
Eileen McNaughton [Sat, 24 May 2014 05:47:47 +0000 (17:47 +1200)]
add a couple of comments

10 years agospelling fixes
Eileen McNaughton [Sat, 24 May 2014 05:46:53 +0000 (17:46 +1200)]
spelling fixes

10 years agocontact test cleanup - in particular don't do unused assignments (in some cases this...
Eileen McNaughton [Sat, 24 May 2014 05:23:49 +0000 (17:23 +1200)]
contact test cleanup - in particular don't do unused assignments (in some cases this highlights test is
invalid but I have not reviewed for that

10 years agospelling fixes
Eileen McNaughton [Sat, 24 May 2014 05:22:25 +0000 (17:22 +1200)]
spelling fixes

10 years agocomment fix
Eileen McNaughton [Sat, 24 May 2014 05:02:40 +0000 (17:02 +1200)]
comment fix

10 years agospelling fix
Eileen McNaughton [Sat, 24 May 2014 04:59:17 +0000 (16:59 +1200)]
spelling fix

10 years agoanother comment fix
Eileen McNaughton [Sat, 24 May 2014 04:49:40 +0000 (16:49 +1200)]
another comment fix

10 years agocomment fixes
Eileen McNaughton [Sat, 24 May 2014 04:47:46 +0000 (16:47 +1200)]
comment fixes

10 years agoremove obsolete require once
Eileen McNaughton [Sat, 24 May 2014 04:40:44 +0000 (16:40 +1200)]
remove obsolete require once

10 years agofix comment block & typo
Eileen McNaughton [Sat, 24 May 2014 04:39:36 +0000 (16:39 +1200)]
fix comment block & typo

10 years agocomment tweaks (typos etc)
Eileen McNaughton [Sat, 24 May 2014 04:33:15 +0000 (16:33 +1200)]
comment tweaks (typos etc)

10 years agominor comment fixes
Eileen McNaughton [Sat, 24 May 2014 04:12:06 +0000 (16:12 +1200)]
minor comment fixes

10 years agoadd one more missing comment block
Eileen McNaughton [Sat, 24 May 2014 03:51:06 +0000 (15:51 +1200)]
add one more missing comment block

10 years agoMerge pull request #3354 from eileenmcnaughton/comments-extra
Eileen McNaughton [Sat, 24 May 2014 03:45:40 +0000 (15:45 +1200)]
Merge pull request #3354 from eileenmcnaughton/comments-extra

Add autogenerated comments to tools & tests

10 years agotools - add missing comment blocks
Eileen McNaughton [Sat, 24 May 2014 03:44:30 +0000 (15:44 +1200)]
tools - add missing comment blocks

10 years agotests - add autogenerated comment blocks
Eileen McNaughton [Sat, 24 May 2014 03:37:39 +0000 (15:37 +1200)]
tests - add autogenerated comment blocks

10 years agoadd autogenerated comments
Eileen McNaughton [Sat, 24 May 2014 03:34:53 +0000 (15:34 +1200)]
add autogenerated comments

10 years agoMerge pull request #3353 from eileenmcnaughton/comments-extra
Eileen McNaughton [Sat, 24 May 2014 03:29:11 +0000 (15:29 +1200)]
Merge pull request #3353 from eileenmcnaughton/comments-extra

Comments extra

10 years agoadd autogenerated comment blocks to tests dir
Eileen McNaughton [Sat, 24 May 2014 03:28:10 +0000 (15:28 +1200)]
add autogenerated comment blocks to tests dir

10 years agoadd a few remaining missing comment blocks (autogenerated)
Eileen McNaughton [Sat, 24 May 2014 03:26:43 +0000 (15:26 +1200)]
add a few remaining missing comment blocks (autogenerated)

10 years agoMerge pull request #3352 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 03:25:15 +0000 (15:25 +1200)]
Merge pull request #3352 from eileenmcnaughton/comments

CRM add remaining missing comment blocks (autogenerated)

10 years agobin add missing comment blocks (autogenerated)
Eileen McNaughton [Sat, 24 May 2014 03:14:18 +0000 (15:14 +1200)]
bin add missing comment blocks (autogenerated)

10 years agoCRM add remaining missing comment blocks (autogenerated)
Eileen McNaughton [Sat, 24 May 2014 03:10:30 +0000 (15:10 +1200)]
CRM add remaining missing comment blocks (autogenerated)

10 years agoMerge pull request #3351 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 02:58:28 +0000 (14:58 +1200)]
Merge pull request #3351 from eileenmcnaughton/comments

CRM/Core add missing comment blocks (autogenerated)

10 years agoCRM/Core add missing comment blocks (autogenerated)
Eileen McNaughton [Sat, 24 May 2014 02:57:15 +0000 (14:57 +1200)]
CRM/Core add missing comment blocks (autogenerated)

10 years agoMerge pull request #3350 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 02:52:49 +0000 (14:52 +1200)]
Merge pull request #3350 from eileenmcnaughton/comments

Add missing comment  blocks (autogenerated)

10 years agoCRM/Core/Payment add missing code blocks (autogenerated)
Eileen McNaughton [Sat, 24 May 2014 02:51:35 +0000 (14:51 +1200)]
CRM/Core/Payment add missing code blocks (autogenerated)

10 years agoadd CRM/Core/CodeGen comment blocks
Eileen McNaughton [Sat, 24 May 2014 02:46:58 +0000 (14:46 +1200)]
add CRM/Core/CodeGen comment blocks

10 years agomore missing code comment blocks
Eileen McNaughton [Sat, 24 May 2014 02:45:36 +0000 (14:45 +1200)]
more missing code comment blocks

10 years agoMerge pull request #3349 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 02:40:21 +0000 (14:40 +1200)]
Merge pull request #3349 from eileenmcnaughton/comments

Add missing comment  blocks

10 years agoCRM/Campaign add missing comments
Eileen McNaughton [Sat, 24 May 2014 02:39:28 +0000 (14:39 +1200)]
CRM/Campaign add missing comments

10 years agoCRM/Case add automatically generated comments
Eileen McNaughton [Sat, 24 May 2014 02:35:43 +0000 (14:35 +1200)]
CRM/Case add automatically generated comments

10 years agoMerge pull request #3348 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 02:31:42 +0000 (14:31 +1200)]
Merge pull request #3348 from eileenmcnaughton/comments

Comments

10 years agoCRM/Event add comments
Eileen McNaughton [Sat, 24 May 2014 02:30:24 +0000 (14:30 +1200)]
CRM/Event add comments

10 years agoCRM/Mailing missing comments
Eileen McNaughton [Sat, 24 May 2014 02:28:05 +0000 (14:28 +1200)]
CRM/Mailing missing comments

10 years agochange var name to camel case
Eileen McNaughton [Sat, 24 May 2014 02:19:36 +0000 (14:19 +1200)]
change var name to camel case

10 years agospelling & comment fix
Eileen McNaughton [Sat, 24 May 2014 02:17:36 +0000 (14:17 +1200)]
spelling & comment fix

10 years agoMerge pull request #3347 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 02:09:24 +0000 (14:09 +1200)]
Merge pull request #3347 from eileenmcnaughton/comments

Comments

10 years agoremove unused variable
Eileen McNaughton [Sat, 24 May 2014 02:08:16 +0000 (14:08 +1200)]
remove unused variable

10 years agocomment fixes
Eileen McNaughton [Sat, 24 May 2014 02:07:57 +0000 (14:07 +1200)]
comment fixes

10 years agoMerge pull request #3346 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 01:54:28 +0000 (13:54 +1200)]
Merge pull request #3346 from eileenmcnaughton/comments

Comments

10 years agoAdd missing comments in CRM/Core
Eileen McNaughton [Sat, 24 May 2014 01:50:48 +0000 (13:50 +1200)]
Add missing comments in CRM/Core

10 years agoCRM add missing comment blocks
Eileen McNaughton [Sat, 24 May 2014 01:41:54 +0000 (13:41 +1200)]
CRM add missing comment blocks

10 years agoMerge pull request #3345 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 01:33:23 +0000 (13:33 +1200)]
Merge pull request #3345 from eileenmcnaughton/comments

Add automated comment blocks for functions missing them

10 years agoCRM/Report add missing comment blocks
Eileen McNaughton [Sat, 24 May 2014 01:32:12 +0000 (13:32 +1200)]
CRM/Report add missing comment blocks

10 years agoCRM/SMS add missing comment blocks
Eileen McNaughton [Sat, 24 May 2014 01:30:36 +0000 (13:30 +1200)]
CRM/SMS add missing comment blocks

10 years agoCRM/Upgrade add missing comment blocks
Eileen McNaughton [Sat, 24 May 2014 01:29:33 +0000 (13:29 +1200)]
CRM/Upgrade add missing comment blocks

10 years agoCRM/Contact add comment blocks
Eileen McNaughton [Sat, 24 May 2014 01:27:01 +0000 (13:27 +1200)]
CRM/Contact add comment blocks

10 years agoMerge pull request #3344 from eileenmcnaughton/comments
Eileen McNaughton [Sat, 24 May 2014 01:10:01 +0000 (13:10 +1200)]
Merge pull request #3344 from eileenmcnaughton/comments

Comments

10 years agoCRM/Utils add comments
Eileen McNaughton [Sat, 24 May 2014 01:05:05 +0000 (13:05 +1200)]
CRM/Utils add comments

10 years agoadd missing comments - tests directory
Eileen McNaughton [Sat, 24 May 2014 01:00:55 +0000 (13:00 +1200)]
add missing comments - tests directory

10 years agoremove duplicate assignments
Eileen McNaughton [Sat, 24 May 2014 00:58:22 +0000 (12:58 +1200)]
remove duplicate assignments

10 years agocomment fixes
Eileen McNaughton [Sat, 24 May 2014 00:58:05 +0000 (12:58 +1200)]
comment fixes

10 years agoMerge pull request #3322 from totten/master-refcount
Tim Otten [Fri, 23 May 2014 22:20:25 +0000 (15:20 -0700)]
Merge pull request #3322 from totten/master-refcount

CRM-14478 - Add generic API, "getrefcount"

10 years agoCRM-14478 - Count references to activity-types and relationship-types in CiviCase XML
Tim Otten [Fri, 23 May 2014 22:11:53 +0000 (15:11 -0700)]
CRM-14478 - Count references to activity-types and relationship-types in CiviCase XML

10 years agoCRM-14478 - Allow components and hooks to influence refcounts
Tim Otten [Fri, 23 May 2014 22:09:20 +0000 (15:09 -0700)]
CRM-14478 - Allow components and hooks to influence refcounts

10 years agoCRM-14478 - CRM_Case_XMLRepository - Add getActivityReferenceCount(), getRelationship...
Tim Otten [Fri, 23 May 2014 04:17:44 +0000 (21:17 -0700)]
CRM-14478 - CRM_Case_XMLRepository - Add getActivityReferenceCount(), getRelationshipReferenceCount()

10 years agoCRM-14478 - Add generic API, "getrefcount"
Tim Otten [Wed, 21 May 2014 09:01:20 +0000 (02:01 -0700)]
CRM-14478 - Add generic API, "getrefcount"

10 years agoCRM-14664: js fixes
yashodha [Fri, 23 May 2014 13:42:46 +0000 (19:12 +0530)]
CRM-14664: js fixes

10 years agoshow status label instead of name in event dashboard
systopia [Tue, 20 May 2014 15:12:01 +0000 (17:12 +0200)]
show status label instead of name in event dashboard

10 years agoMerge pull request #3337 from NileemaJadhav/CRM-master
Yashodha Chaku [Fri, 23 May 2014 10:46:15 +0000 (16:16 +0530)]
Merge pull request #3337 from NileemaJadhav/CRM-master

--Fix notices on Case view page for status with filter condition

10 years ago--Fix notices on Case view page for status with filter condition
Nileema [Fri, 23 May 2014 09:24:24 +0000 (14:54 +0530)]
--Fix notices on Case view page for status with filter condition

10 years agoMerge pull request #3336 from monishdeb/CRM-14724
Yashodha Chaku [Fri, 23 May 2014 07:20:55 +0000 (12:50 +0530)]
Merge pull request #3336 from monishdeb/CRM-14724

CRM-14724 additional fix

10 years agoCRM-14627 additional fix
monishdeb [Fri, 23 May 2014 06:57:01 +0000 (12:27 +0530)]
CRM-14627 additional fix

----------------------------------------
* CRM-14627: civicrm navigation inconsistent
  https://issues.civicrm.org/jira/browse/CRM-14627

10 years agoMerge pull request #3335 from kurund/gendata-fixes
Kurund Jalmi [Fri, 23 May 2014 05:55:54 +0000 (11:25 +0530)]
Merge pull request #3335 from kurund/gendata-fixes

generated data fixes

10 years agogenerated data fixes
kurund [Fri, 23 May 2014 05:55:18 +0000 (11:25 +0530)]
generated data fixes

10 years agoMerge pull request #3191 from divya-jose/CRM-14636
Kurund Jalmi [Fri, 23 May 2014 05:32:07 +0000 (11:02 +0530)]
Merge pull request #3191 from divya-jose/CRM-14636

--CRM-14636 Datatables implimentation causes dom collisions

10 years agoMerge pull request #3261 from atif-shaikh/CoreBugs
pratik-joshi [Fri, 23 May 2014 05:01:25 +0000 (10:31 +0530)]
Merge pull request #3261 from atif-shaikh/CoreBugs

Core Bug related to foreign key referencing not defined for civicrm_entity_tag table

10 years agoMerge pull request #3271 from jitendrapurohit/CoreWebtestFix4.5alpha1
Kurund Jalmi [Fri, 23 May 2014 04:52:32 +0000 (10:22 +0530)]
Merge pull request #3271 from jitendrapurohit/CoreWebtestFix4.5alpha1

WebTest Core Bug

10 years agoMerge pull request #3308 from jitendrapurohit/CoreBug4.5alpha1_Webtests
Kurund Jalmi [Fri, 23 May 2014 04:52:05 +0000 (10:22 +0530)]
Merge pull request #3308 from jitendrapurohit/CoreBug4.5alpha1_Webtests

CRM-12872

10 years agoMerge pull request #3329 from jitendrapurohit/CRM-14373
Kurund Jalmi [Fri, 23 May 2014 04:51:42 +0000 (10:21 +0530)]
Merge pull request #3329 from jitendrapurohit/CRM-14373

CRM-14373

10 years agoMerge pull request #3328 from NileemaJadhav/CRM-master
Kurund Jalmi [Fri, 23 May 2014 04:51:22 +0000 (10:21 +0530)]
Merge pull request #3328 from NileemaJadhav/CRM-master

HR-376 Fix for having Case entity type custom fields for profile selector

10 years agoMerge pull request #3330 from monishdeb/CRM-14724
Kurund Jalmi [Fri, 23 May 2014 04:49:15 +0000 (10:19 +0530)]
Merge pull request #3330 from monishdeb/CRM-14724

CRM-14724 fix - when viewing b to a relationship link to contact a returns contact b

10 years agoMerge pull request #3325 from totten/master-casetype-ajax
Kurund Jalmi [Fri, 23 May 2014 03:51:41 +0000 (09:21 +0530)]
Merge pull request #3325 from totten/master-casetype-ajax

CRM-14725 - crmCaseType - Use AJAX load/save

10 years agoCRM-14478 - Add CRM_Core_DAO::getReferenceCounts()
Tim Otten [Wed, 21 May 2014 08:34:56 +0000 (01:34 -0700)]
CRM-14478 - Add CRM_Core_DAO::getReferenceCounts()

10 years agoCRM_Utils_Array::index() -- Allow indexing when some keys are NULL/undefined
Tim Otten [Wed, 21 May 2014 07:45:42 +0000 (00:45 -0700)]
CRM_Utils_Array::index() -- Allow indexing when some keys are NULL/undefined

10 years agoCRM-14478 - Add CRM_Core_Reference_OptionValue
Tim Otten [Wed, 21 May 2014 07:32:01 +0000 (00:32 -0700)]
CRM-14478 - Add CRM_Core_Reference_OptionValue

10 years agoCRM-14478 - Split CRM_Core_EntityReference into different classes
Tim Otten [Wed, 21 May 2014 06:06:39 +0000 (23:06 -0700)]
CRM-14478 - Split CRM_Core_EntityReference into different classes

10 years agoCRM-14478 - CRM_Core_EntityReference - Move SQL construction
Tim Otten [Wed, 21 May 2014 05:36:05 +0000 (22:36 -0700)]
CRM-14478 - CRM_Core_EntityReference - Move SQL construction

This anticipates polymorphic SQL construction -- where have different
classes for different types of references (eg conventional SQL FKs; dynamic
FK; option-value FKs) and where each class constructs slightly different
SQL.

10 years agoMerge pull request #3334 from totten/master-casexmlrepo
Kurund Jalmi [Fri, 23 May 2014 03:16:22 +0000 (08:46 +0530)]
Merge pull request #3334 from totten/master-casexmlrepo

CRM-14478, CRM-14474 - Move XML lookup code into new class

10 years agoCRM-14478, CRM-14474 - Move XML lookup code into new class
Tim Otten [Fri, 23 May 2014 03:11:25 +0000 (20:11 -0700)]
CRM-14478, CRM-14474 - Move XML lookup code into new class

10 years agoMerge pull request #3326 from pratik-joshi/CRM-14704-reopen-fix
Dave Greenberg [Thu, 22 May 2014 18:59:21 +0000 (11:59 -0700)]
Merge pull request #3326 from pratik-joshi/CRM-14704-reopen-fix

CRM-14704 : newly added target contact ids won't have any effect of activity creation

10 years agoMerge pull request #3333 from kurund/CRM-14476
Kurund Jalmi [Thu, 22 May 2014 18:58:21 +0000 (00:28 +0530)]
Merge pull request #3333 from kurund/CRM-14476

CRM-14476, case type fixes

10 years agoupdated case type sample data to include xml definition
kurund [Thu, 22 May 2014 18:57:10 +0000 (00:27 +0530)]
updated case type sample data to include xml definition

10 years agorename column name, CRM-14473
kurund [Thu, 22 May 2014 17:53:52 +0000 (23:23 +0530)]
rename column name, CRM-14473

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

10 years agoMerge pull request #3332 from davecivicrm/CRM-11864
Dave Greenberg [Thu, 22 May 2014 17:50:43 +0000 (10:50 -0700)]
Merge pull request #3332 from davecivicrm/CRM-11864

CRM-11864 - replacing stale PR-3101 with additional layout improvements.

10 years agoCRM-11864 - changes for confirmation block
Dave Greenberg [Thu, 22 May 2014 17:49:26 +0000 (10:49 -0700)]
CRM-11864 - changes for confirmation block

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

10 years ago- replaceing stale PR-3101 with additional layout improvements.
Dave Greenberg [Thu, 22 May 2014 17:37:24 +0000 (10:37 -0700)]
- replaceing stale PR-3101 with additional layout improvements.

10 years agoCRM-14724 fix - when viewing b to a relationship link to contact a returns contact b
monishdeb [Thu, 22 May 2014 14:48:44 +0000 (20:18 +0530)]
CRM-14724 fix - when viewing b to a relationship link to contact a returns contact b

https://issues.civicrm.org/jira/browse/CRM-14724