civicrm-core.git
9 years agoCRM-15842 - Improve custom field multiple record display options
Coleman Watts [Tue, 20 Jan 2015 17:20:19 +0000 (12:20 -0500)]
CRM-15842 - Improve custom field multiple record display options

----------------------------------------
* CRM-15842: Custom field form improvements
  https://issues.civicrm.org/jira/browse/CRM-15842

9 years agoCRM-15842 - Custom group form cleanup
Coleman Watts [Tue, 20 Jan 2015 15:03:49 +0000 (10:03 -0500)]
CRM-15842 - Custom group form cleanup

----------------------------------------
* CRM-15842: Custom field form improvements
  https://issues.civicrm.org/jira/browse/CRM-15842

9 years agoMerge pull request #4977 from colemanw/CRM-15812
colemanw [Mon, 19 Jan 2015 21:24:34 +0000 (16:24 -0500)]
Merge pull request #4977 from colemanw/CRM-15812

CRM-15812 - Remove linebreaks from within {ts} strings

9 years agoMerge pull request #4963 from rohankatkar/CRM-15830
Monish Deb [Mon, 19 Jan 2015 19:30:40 +0000 (01:00 +0530)]
Merge pull request #4963 from rohankatkar/CRM-15830

Fix for CRM-15830

9 years agoCRM-15812 - Remove linebreaks from within {ts} strings
Coleman Watts [Mon, 19 Jan 2015 18:00:33 +0000 (13:00 -0500)]
CRM-15812 - Remove linebreaks from within {ts} strings

----------------------------------------
* CRM-15812: Translated strings not shown
  https://issues.civicrm.org/jira/browse/CRM-15812

9 years agoMerge pull request #4976 from colemanw/delOldUpgraders
colemanw [Mon, 19 Jan 2015 17:26:56 +0000 (12:26 -0500)]
Merge pull request #4976 from colemanw/delOldUpgraders

Remove ancient upgrade scripts part 2

9 years agoRemove ancient upgrade scripts part 2
Coleman Watts [Mon, 19 Jan 2015 15:51:39 +0000 (10:51 -0500)]
Remove ancient upgrade scripts part 2

9 years agoMerge pull request #4975 from rohankatkar/CRM-15838
Monish Deb [Mon, 19 Jan 2015 11:28:57 +0000 (16:58 +0530)]
Merge pull request #4975 from rohankatkar/CRM-15838

Additional changes for CRM-15838

9 years agoAdditional commit for CRM-15838
Web Access [Mon, 19 Jan 2015 10:09:56 +0000 (15:39 +0530)]
Additional commit for CRM-15838

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40
kurund [Mon, 19 Jan 2015 09:45:47 +0000 (15:15 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-19-15-14-40

9 years agoMerge pull request #4969 from lynxlynxlynx/master
Monish Deb [Mon, 19 Jan 2015 09:43:58 +0000 (15:13 +0530)]
Merge pull request #4969 from lynxlynxlynx/master

Updated Slovenian "provinces": fixed names and added missing ones

9 years agoMerge pull request #4973 from PalanteJon/cleanup-master
Tim Otten [Mon, 19 Jan 2015 06:53:05 +0000 (22:53 -0800)]
Merge pull request #4973 from PalanteJon/cleanup-master

INFRA-132 batch 2 cleanup

9 years agoINFRA-132 batch 2 cleanup
Jon goldberg [Mon, 19 Jan 2015 05:19:22 +0000 (00:19 -0500)]
INFRA-132 batch 2 cleanup

9 years agoMerge pull request #4972 from rohankatkar/Batch#17
Monish Deb [Mon, 19 Jan 2015 04:51:00 +0000 (10:21 +0530)]
Merge pull request #4972 from rohankatkar/Batch#17

Minor changes to Batch #17

9 years agoMinor changes to Batch #17
Web Access [Mon, 19 Jan 2015 04:46:39 +0000 (10:16 +0530)]
Minor changes to Batch #17

9 years agoMerge pull request #4971 from kurund/batch-16
Kurund Jalmi [Sun, 18 Jan 2015 19:12:09 +0000 (00:42 +0530)]
Merge pull request #4971 from kurund/batch-16

more cleanup batch 16

9 years agomore cleanup batch 16
kurund [Sun, 18 Jan 2015 16:50:20 +0000 (22:20 +0530)]
more cleanup batch 16

9 years agoMerge pull request #4970 from colemanw/CRM-15812
colemanw [Sun, 18 Jan 2015 00:11:57 +0000 (19:11 -0500)]
Merge pull request #4970 from colemanw/CRM-15812

CRM-15812 - Fix missing ts

9 years agoCRM-15812 - Fix missing ts
Coleman Watts [Sun, 18 Jan 2015 00:09:13 +0000 (19:09 -0500)]
CRM-15812 - Fix missing ts

----------------------------------------
* CRM-15812: Translated strings not shown
  https://issues.civicrm.org/jira/browse/CRM-15812

9 years agocivicrm_state_province.tpl: added missing Slovenian "provinces"
Jaka Kranjc [Sat, 17 Jan 2015 21:41:45 +0000 (22:41 +0100)]
civicrm_state_province.tpl: added missing Slovenian "provinces"

9 years agoUse proper names for Slovenian municipalities
Jaka Kranjc [Sat, 17 Jan 2015 20:45:02 +0000 (21:45 +0100)]
Use proper names for Slovenian municipalities

long live unicode!

9 years agocivicrm_state_province.tpl: added missing newline at EOF
Jaka Kranjc [Sat, 17 Jan 2015 20:26:55 +0000 (21:26 +0100)]
civicrm_state_province.tpl: added missing newline at EOF

9 years agoMerge pull request #4950 from atif-shaikh/CRM-15826
Tim Otten [Sat, 17 Jan 2015 09:46:28 +0000 (01:46 -0800)]
Merge pull request #4950 from atif-shaikh/CRM-15826

CRM-15826 - CiviCase core bugs

9 years agoMerge pull request #4961 from pratikshad/core-bugs
Monish Deb [Fri, 16 Jan 2015 13:06:34 +0000 (18:36 +0530)]
Merge pull request #4961 from pratikshad/core-bugs

Fixed Division by zero warning in Contribution Repeat CiviReport

9 years agoFix for CRM-15830
Web Access [Fri, 16 Jan 2015 12:54:48 +0000 (18:24 +0530)]
Fix for CRM-15830

9 years agoflush out inappropriate changes
atif-shaikh [Fri, 16 Jan 2015 11:12:08 +0000 (16:42 +0530)]
flush out inappropriate changes

9 years agoMake sure that the "Change Timeline" business logic runs in a transaction
atif-shaikh [Fri, 16 Jan 2015 11:06:39 +0000 (16:36 +0530)]
Make sure that the "Change Timeline" business logic runs in a transaction

9 years agoFixed warning of Division by zero in CiviReport
pratikshad [Fri, 16 Jan 2015 10:37:40 +0000 (16:07 +0530)]
Fixed warning of Division by zero in CiviReport

9 years agoMerge pull request #4954 from monishdeb/CRM-15812
Kurund Jalmi [Fri, 16 Jan 2015 10:13:04 +0000 (15:43 +0530)]
Merge pull request #4954 from monishdeb/CRM-15812

CRM-15812 fix - Translated strings not shown

9 years agoCRM-15812 fix - Translated strings not shown
monishdeb [Mon, 2 Feb 2015 13:41:03 +0000 (19:11 +0530)]
CRM-15812 fix - Translated strings not shown

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

9 years agoMerge pull request #4958 from pratikshad/code-cleanup-batch-19
Kurund Jalmi [Fri, 16 Jan 2015 10:12:30 +0000 (15:42 +0530)]
Merge pull request #4958 from pratikshad/code-cleanup-batch-19

Clean up code for batch 19

9 years agoMerge pull request #4953 from monishdeb/4.5
Yashodha Chaku [Fri, 16 Jan 2015 10:10:34 +0000 (15:40 +0530)]
Merge pull request #4953 from monishdeb/4.5

CRM-15813 fix - Honoree Information profile overwrites contributor infor...

9 years agoCRM-15813 fix - Honoree Information profile overwrites contributor information
monishdeb [Mon, 2 Feb 2015 13:03:20 +0000 (18:33 +0530)]
CRM-15813 fix - Honoree Information profile overwrites contributor information

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

9 years agoMerge pull request #4960 from monishdeb/INFRA-32
Kurund Jalmi [Fri, 16 Jan 2015 10:09:12 +0000 (15:39 +0530)]
Merge pull request #4960 from monishdeb/INFRA-32

INFRA-32 batch 11

9 years agoINFRA-32 batch 11
monishdeb [Tue, 3 Feb 2015 07:52:04 +0000 (13:22 +0530)]
INFRA-32 batch 11

9 years agoMerge pull request #4959 from rohankatkar/batch-17
Kurund Jalmi [Fri, 16 Jan 2015 10:09:05 +0000 (15:39 +0530)]
Merge pull request #4959 from rohankatkar/batch-17

INFRA 32 - Batch #17

9 years agoMerge pull request #4957 from civicrm/batch-18
Kurund Jalmi [Fri, 16 Jan 2015 10:07:52 +0000 (15:37 +0530)]
Merge pull request #4957 from civicrm/batch-18

clean up changes for batch 18

9 years agoINFRA 32 - Batch #17
Web Access [Fri, 16 Jan 2015 06:42:31 +0000 (12:12 +0530)]
INFRA 32 - Batch #17

9 years agoMerge pull request #4951 from pratikshad/code-cleanup-batch-15
Monish Deb [Fri, 16 Jan 2015 06:07:31 +0000 (11:37 +0530)]
Merge pull request #4951 from pratikshad/code-cleanup-batch-15

Fixed Code clean up for batch 15

9 years agoFixed return void for clean up batch-15
pratikshad [Fri, 16 Jan 2015 05:58:43 +0000 (11:28 +0530)]
Fixed return void  for clean up batch-15

9 years agoclean up changes for batch 18
yashodha [Fri, 16 Jan 2015 05:40:54 +0000 (11:10 +0530)]
clean up changes for batch 18

9 years agoClean up code for batch 19
pratikshad [Fri, 16 Jan 2015 05:36:39 +0000 (11:06 +0530)]
Clean up code for batch 19

9 years agoMerge pull request #4935 from atif-shaikh/CRM-15804
Monish Deb [Fri, 16 Jan 2015 05:25:52 +0000 (10:55 +0530)]
Merge pull request #4935 from atif-shaikh/CRM-15804

Crm 15804

9 years agoMerge pull request #4955 from atif-shaikh/master-cleanup
Yashodha Chaku [Fri, 16 Jan 2015 03:14:26 +0000 (08:44 +0530)]
Merge pull request #4955 from atif-shaikh/master-cleanup

INFRA-132 - Batch #8

9 years agoMerge pull request #4956 from colemanw/CRM-15820
colemanw [Thu, 15 Jan 2015 20:05:17 +0000 (15:05 -0500)]
Merge pull request #4956 from colemanw/CRM-15820

CRM-15820 - Exclude deleted contacts from group counts

9 years agoCRM-15820 - Exclude deleted contacts from group counts
Coleman Watts [Thu, 15 Jan 2015 19:08:41 +0000 (14:08 -0500)]
CRM-15820 - Exclude deleted contacts from group counts

----------------------------------------
* CRM-15820: Manage Groups contact summary also counts contacts in trash
  https://issues.civicrm.org/jira/browse/CRM-15820

9 years agoINFRA-132 - Batch #8
atif-shaikh [Thu, 15 Jan 2015 14:35:41 +0000 (20:05 +0530)]
INFRA-132 - Batch #8

9 years agoMerge branch 'master' of github.com:civicrm/civicrm-core into code-cleanup-batch-15
pratikshad [Thu, 15 Jan 2015 12:40:43 +0000 (18:10 +0530)]
Merge branch 'master' of github.com:civicrm/civicrm-core into code-cleanup-batch-15

9 years agoFixed Code clean up for batch 15
pratikshad [Thu, 15 Jan 2015 12:33:19 +0000 (18:03 +0530)]
Fixed Code clean up for batch 15

9 years agoMerge pull request #4925 from KarinG/patch-1
Yashodha Chaku [Thu, 15 Jan 2015 11:46:40 +0000 (17:16 +0530)]
Merge pull request #4925 from KarinG/patch-1

CRM-15814 - Gecoder maxlength issue -> go to 12

9 years agoMerge pull request #4948 from pratikshad/code-cleanup
Yashodha Chaku [Thu, 15 Jan 2015 11:29:06 +0000 (16:59 +0530)]
Merge pull request #4948 from pratikshad/code-cleanup

Fixed code after cleanup test

9 years agoMerge pull request #4940 from mlutfy/crm15824
Yashodha Chaku [Thu, 15 Jan 2015 11:20:58 +0000 (16:50 +0530)]
Merge pull request #4940 from mlutfy/crm15824

CRM-15824: Add the thankyou_title variable to the online contribution receipt

9 years agoMerge pull request #4944 from civicrm/batch-5.part2
Kurund Jalmi [Thu, 15 Jan 2015 10:00:14 +0000 (15:30 +0530)]
Merge pull request #4944 from civicrm/batch-5.part2

clean up fixes for batch 5

9 years agoCRM-15826 - CiviCase core bugs
atif-shaikh [Thu, 15 Jan 2015 09:48:05 +0000 (15:18 +0530)]
CRM-15826 - CiviCase core bugs

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

9 years agoMerge pull request #4943 from rohankatkar/batch-9
Monish Deb [Thu, 15 Jan 2015 09:41:57 +0000 (15:11 +0530)]
Merge pull request #4943 from rohankatkar/batch-9

INFRA 32 - Batch #9

9 years agoMerge pull request #4949 from eileenmcnaughton/minor-tidies
Eileen McNaughton [Thu, 15 Jan 2015 07:49:42 +0000 (20:49 +1300)]
Merge pull request #4949 from eileenmcnaughton/minor-tidies

comment fixes

9 years agomore tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 07:49:28 +0000 (20:49 +1300)]
more tidy ups

9 years agocomment fixes
Eileen McNaughton [Thu, 15 Jan 2015 07:48:02 +0000 (20:48 +1300)]
comment fixes

9 years agoFixed code after cleanup test
pratikshad [Thu, 15 Jan 2015 07:43:11 +0000 (13:13 +0530)]
Fixed code after cleanup test

9 years agocomment fixes
Eileen McNaughton [Thu, 15 Jan 2015 07:37:12 +0000 (20:37 +1300)]
comment fixes

9 years agoMerge pull request #4946 from eileenmcnaughton/minor-tidies
Eileen McNaughton [Thu, 15 Jan 2015 07:26:22 +0000 (20:26 +1300)]
Merge pull request #4946 from eileenmcnaughton/minor-tidies

Minor tidies

9 years agoMerge pull request #4945 from totten/master-civi-alltests
Tim Otten [Thu, 15 Jan 2015 07:25:54 +0000 (23:25 -0800)]
Merge pull request #4945 from totten/master-civi-alltests

INFRA-132 - Civi\AllTests

9 years agocomment fixes
Eileen McNaughton [Thu, 15 Jan 2015 07:25:34 +0000 (20:25 +1300)]
comment fixes

9 years agoINFRA-132 - Civi\AllTests
Tim Otten [Thu, 15 Jan 2015 07:22:14 +0000 (23:22 -0800)]
INFRA-132 - Civi\AllTests

1db1c57 changed "new self" to "new CiviTestSuite()". This changes to
"new self()".

9 years agominor tidies
Eileen McNaughton [Thu, 15 Jan 2015 07:14:52 +0000 (20:14 +1300)]
minor tidies

9 years agoTypo fix
Web Access [Thu, 15 Jan 2015 07:13:10 +0000 (12:43 +0530)]
Typo fix

9 years agominor tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 07:05:23 +0000 (20:05 +1300)]
minor tidy ups

9 years agoclean up fixes for batch 5
yashodha [Thu, 15 Jan 2015 07:05:01 +0000 (12:35 +0530)]
clean up fixes for batch 5

9 years agoCode cleanup - Batch #9
Web Access [Thu, 15 Jan 2015 07:02:44 +0000 (12:32 +0530)]
Code cleanup - Batch #9

9 years agoMerge pull request #4941 from totten/master-batch-14
Yashodha Chaku [Thu, 15 Jan 2015 06:58:29 +0000 (12:28 +0530)]
Merge pull request #4941 from totten/master-batch-14

INFRA-132 - Batch 14 (g)

9 years agominor tidies
Eileen McNaughton [Thu, 15 Jan 2015 06:58:23 +0000 (19:58 +1300)]
minor tidies

9 years agoMerge pull request #4942 from civicrm/batch-5
Yashodha Chaku [Thu, 15 Jan 2015 06:56:06 +0000 (12:26 +0530)]
Merge pull request #4942 from civicrm/batch-5

cleanup fixes

9 years agoMerge pull request #4938 from eileenmcnaughton/minor-tidies
Eileen McNaughton [Thu, 15 Jan 2015 06:46:41 +0000 (19:46 +1300)]
Merge pull request #4938 from eileenmcnaughton/minor-tidies

Minor tidies

9 years agoa few mor fixes
Eileen McNaughton [Thu, 15 Jan 2015 06:46:19 +0000 (19:46 +1300)]
a few mor fixes

9 years agocleanup fixes
yashodha [Thu, 15 Jan 2015 05:28:14 +0000 (10:58 +0530)]
cleanup fixes

9 years agomore tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 05:00:04 +0000 (18:00 +1300)]
more tidy ups

9 years agofix property visibility
Eileen McNaughton [Thu, 15 Jan 2015 04:59:57 +0000 (17:59 +1300)]
fix property visibility

9 years agoCode tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:13:28 +0000 (17:13 +1300)]
Code tidy ups

9 years agomore code tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:06:51 +0000 (17:06 +1300)]
more code tidy ups

9 years agoINFRA-132 - Batch 14 (g)
Tim Otten [Thu, 15 Jan 2015 02:59:26 +0000 (18:59 -0800)]
INFRA-132 - Batch 14 (g)

9 years agomore file tidy-ups
Eileen McNaughton [Thu, 15 Jan 2015 02:55:34 +0000 (15:55 +1300)]
more file tidy-ups

9 years agofix clean up
Eileen McNaughton [Thu, 15 Jan 2015 02:31:14 +0000 (15:31 +1300)]
fix clean up

9 years agoCRM-15824: Add the thankyou_title variable to the online contribution receipt.
Mathieu Lutfy [Thu, 15 Jan 2015 02:27:30 +0000 (21:27 -0500)]
CRM-15824: Add the thankyou_title variable to the online contribution receipt.

9 years agochanged visibility on wrong property - amend
Eileen McNaughton [Thu, 15 Jan 2015 02:14:54 +0000 (15:14 +1300)]
changed visibility on wrong property - amend

9 years agoa few more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 02:07:19 +0000 (15:07 +1300)]
a few more tidy ups

9 years agofix report property to public
Eileen McNaughton [Thu, 15 Jan 2015 01:44:58 +0000 (14:44 +1300)]
fix report property to public

9 years agoPHPcs file tidy up
Eileen McNaughton [Thu, 15 Jan 2015 01:13:53 +0000 (14:13 +1300)]
PHPcs file tidy up

9 years agofix class property
Eileen McNaughton [Thu, 15 Jan 2015 01:01:38 +0000 (14:01 +1300)]
fix class property

9 years agofix example tpl for code standards
Eileen McNaughton [Thu, 15 Jan 2015 00:59:02 +0000 (13:59 +1300)]
fix example tpl for code standards

9 years agoadd a few more property declarations
Eileen McNaughton [Wed, 14 Jan 2015 22:16:12 +0000 (11:16 +1300)]
add a few more property declarations

9 years agoMerge pull request #4939 from colemanw/CRM-15789
colemanw [Wed, 14 Jan 2015 22:13:26 +0000 (17:13 -0500)]
Merge pull request #4939 from colemanw/CRM-15789

CRM-15789 - Fix dashboard close icon

9 years agodeclare a few more variables properly
Eileen McNaughton [Wed, 14 Jan 2015 22:01:03 +0000 (11:01 +1300)]
declare a few more variables properly

9 years agoimprove CRM_Utils_Type::escape error message
Eileen McNaughton [Wed, 14 Jan 2015 21:40:34 +0000 (10:40 +1300)]
improve CRM_Utils_Type::escape error message
Give people a clue if they have failed to camel case
the type

9 years agospelling fixes
Eileen McNaughton [Wed, 14 Jan 2015 21:34:17 +0000 (10:34 +1300)]
spelling fixes

9 years agominor comment fixes on report class + remove the silence operator
Eileen McNaughton [Wed, 14 Jan 2015 21:17:15 +0000 (10:17 +1300)]
minor comment fixes on report class + remove the silence operator

9 years agoa few more minor tidy ups
Eileen McNaughton [Wed, 14 Jan 2015 21:09:03 +0000 (10:09 +1300)]
a few more minor tidy ups

9 years agoa few tidy ups & comment fixes
Eileen McNaughton [Wed, 14 Jan 2015 21:01:06 +0000 (10:01 +1300)]
a few tidy ups & comment fixes

9 years ago a few tidy ups on the report class including removing an unused var
Eileen McNaughton [Wed, 14 Jan 2015 21:00:19 +0000 (10:00 +1300)]
 a few tidy ups on the report class including removing an unused var

9 years agoMerge pull request #4936 from monishdeb/INFRA-32
Kurund Jalmi [Wed, 14 Jan 2015 18:24:27 +0000 (23:54 +0530)]
Merge pull request #4936 from monishdeb/INFRA-32

INFRA-132 - Batch #7

9 years agoINFRA-132 - Batch #7
monishdeb [Sun, 1 Feb 2015 15:25:14 +0000 (20:55 +0530)]
INFRA-132 - Batch #7