Jaka Kranjc [Sat, 17 Jan 2015 20:26:55 +0000 (21:26 +0100)]
civicrm_state_province.tpl: added missing newline at EOF
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
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
atif-shaikh [Fri, 16 Jan 2015 11:12:08 +0000 (16:42 +0530)]
flush out inappropriate changes
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
pratikshad [Fri, 16 Jan 2015 10:37:40 +0000 (16:07 +0530)]
Fixed warning of Division by zero in CiviReport
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
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
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
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
monishdeb [Tue, 3 Feb 2015 07:52:04 +0000 (13:22 +0530)]
INFRA-32 batch 11
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
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
Web Access [Fri, 16 Jan 2015 06:42:31 +0000 (12:12 +0530)]
INFRA 32 - Batch #17
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
pratikshad [Fri, 16 Jan 2015 05:58:43 +0000 (11:28 +0530)]
Fixed return void for clean up batch-15
yashodha [Fri, 16 Jan 2015 05:40:54 +0000 (11:10 +0530)]
clean up changes for batch 18
pratikshad [Fri, 16 Jan 2015 05:36:39 +0000 (11:06 +0530)]
Clean up code for batch 19
Monish Deb [Fri, 16 Jan 2015 05:25:52 +0000 (10:55 +0530)]
Merge pull request #4935 from atif-shaikh/CRM-15804
Crm 15804
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
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
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
atif-shaikh [Thu, 15 Jan 2015 14:35:41 +0000 (20:05 +0530)]
INFRA-132 - Batch #8
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
pratikshad [Thu, 15 Jan 2015 12:33:19 +0000 (18:03 +0530)]
Fixed Code clean up for batch 15
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
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
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
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
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
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
Eileen McNaughton [Thu, 15 Jan 2015 07:49:42 +0000 (20:49 +1300)]
Merge pull request #4949 from eileenmcnaughton/minor-tidies
comment fixes
Eileen McNaughton [Thu, 15 Jan 2015 07:49:28 +0000 (20:49 +1300)]
more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 07:48:02 +0000 (20:48 +1300)]
comment fixes
pratikshad [Thu, 15 Jan 2015 07:43:11 +0000 (13:13 +0530)]
Fixed code after cleanup test
Eileen McNaughton [Thu, 15 Jan 2015 07:37:12 +0000 (20:37 +1300)]
comment fixes
Eileen McNaughton [Thu, 15 Jan 2015 07:26:22 +0000 (20:26 +1300)]
Merge pull request #4946 from eileenmcnaughton/minor-tidies
Minor tidies
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
Eileen McNaughton [Thu, 15 Jan 2015 07:25:34 +0000 (20:25 +1300)]
comment fixes
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()".
Eileen McNaughton [Thu, 15 Jan 2015 07:14:52 +0000 (20:14 +1300)]
minor tidies
Web Access [Thu, 15 Jan 2015 07:13:10 +0000 (12:43 +0530)]
Typo fix
Eileen McNaughton [Thu, 15 Jan 2015 07:05:23 +0000 (20:05 +1300)]
minor tidy ups
yashodha [Thu, 15 Jan 2015 07:05:01 +0000 (12:35 +0530)]
clean up fixes for batch 5
Web Access [Thu, 15 Jan 2015 07:02:44 +0000 (12:32 +0530)]
Code cleanup - Batch #9
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)
Eileen McNaughton [Thu, 15 Jan 2015 06:58:23 +0000 (19:58 +1300)]
minor tidies
Yashodha Chaku [Thu, 15 Jan 2015 06:56:06 +0000 (12:26 +0530)]
Merge pull request #4942 from civicrm/batch-5
cleanup fixes
Eileen McNaughton [Thu, 15 Jan 2015 06:46:41 +0000 (19:46 +1300)]
Merge pull request #4938 from eileenmcnaughton/minor-tidies
Minor tidies
Eileen McNaughton [Thu, 15 Jan 2015 06:46:19 +0000 (19:46 +1300)]
a few mor fixes
yashodha [Thu, 15 Jan 2015 05:28:14 +0000 (10:58 +0530)]
cleanup fixes
Eileen McNaughton [Thu, 15 Jan 2015 05:00:04 +0000 (18:00 +1300)]
more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:59:57 +0000 (17:59 +1300)]
fix property visibility
Eileen McNaughton [Thu, 15 Jan 2015 04:13:28 +0000 (17:13 +1300)]
Code tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 04:06:51 +0000 (17:06 +1300)]
more code tidy ups
Tim Otten [Thu, 15 Jan 2015 02:59:26 +0000 (18:59 -0800)]
INFRA-132 - Batch 14 (g)
Eileen McNaughton [Thu, 15 Jan 2015 02:55:34 +0000 (15:55 +1300)]
more file tidy-ups
Eileen McNaughton [Thu, 15 Jan 2015 02:31:14 +0000 (15:31 +1300)]
fix clean up
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.
Eileen McNaughton [Thu, 15 Jan 2015 02:14:54 +0000 (15:14 +1300)]
changed visibility on wrong property - amend
Eileen McNaughton [Thu, 15 Jan 2015 02:07:19 +0000 (15:07 +1300)]
a few more tidy ups
Eileen McNaughton [Thu, 15 Jan 2015 01:44:58 +0000 (14:44 +1300)]
fix report property to public
Eileen McNaughton [Thu, 15 Jan 2015 01:13:53 +0000 (14:13 +1300)]
PHPcs file tidy up
Eileen McNaughton [Thu, 15 Jan 2015 01:01:38 +0000 (14:01 +1300)]
fix class property
Eileen McNaughton [Thu, 15 Jan 2015 00:59:02 +0000 (13:59 +1300)]
fix example tpl for code standards
Eileen McNaughton [Wed, 14 Jan 2015 22:16:12 +0000 (11:16 +1300)]
add a few more property declarations
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
Eileen McNaughton [Wed, 14 Jan 2015 22:01:03 +0000 (11:01 +1300)]
declare a few more variables properly
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
Eileen McNaughton [Wed, 14 Jan 2015 21:34:17 +0000 (10:34 +1300)]
spelling fixes
Eileen McNaughton [Wed, 14 Jan 2015 21:17:15 +0000 (10:17 +1300)]
minor comment fixes on report class + remove the silence operator
Eileen McNaughton [Wed, 14 Jan 2015 21:09:03 +0000 (10:09 +1300)]
a few more minor tidy ups
Eileen McNaughton [Wed, 14 Jan 2015 21:01:06 +0000 (10:01 +1300)]
a few tidy ups & comment fixes
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
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
monishdeb [Sun, 1 Feb 2015 15:25:14 +0000 (20:55 +0530)]
INFRA-132 - Batch #7
Coleman Watts [Wed, 14 Jan 2015 17:06:32 +0000 (12:06 -0500)]
CRM-15789 - Fix dashboard close icon
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Kurund Jalmi [Wed, 14 Jan 2015 16:11:21 +0000 (21:41 +0530)]
Merge pull request #4920 from pratikshad/Fixed-webtests
Fixed webtest of Contibution
Kurund Jalmi [Wed, 14 Jan 2015 16:10:47 +0000 (21:40 +0530)]
Merge pull request #4932 from totten/master-batch0-g
INFRA-132 - Batch 0 (set g)
Kurund Jalmi [Wed, 14 Jan 2015 16:10:22 +0000 (21:40 +0530)]
Merge pull request #4934 from kurund/cleanup
code cleanup
atif-shaikh [Wed, 14 Jan 2015 14:45:37 +0000 (20:15 +0530)]
CRM-15804 - More appropriate fix
----------------------------------------
* CRM-15804: CiviEvent Date Picker broken in modal dialog
https://issues.civicrm.org/jira/browse/CRM-15804
kurund [Wed, 14 Jan 2015 13:45:55 +0000 (19:15 +0530)]
code cleanup
CiviCRM [Wed, 14 Jan 2015 13:30:28 +0000 (05:30 -0800)]
Update version to 4.6.alpha3
Yashodha Chaku [Wed, 14 Jan 2015 08:39:36 +0000 (14:09 +0530)]
Merge pull request #4933 from civicrm/typo-corrections
typo fixes
yashodha [Wed, 14 Jan 2015 08:36:59 +0000 (14:06 +0530)]
typo fixes
Tim Otten [Wed, 14 Jan 2015 04:53:48 +0000 (20:53 -0800)]
INFRA-132 - Batch 0 (set g)
Tim Otten [Wed, 14 Jan 2015 03:21:30 +0000 (19:21 -0800)]
Merge pull request #4931 from davecivicrm/INFRA-132
INFRA-132 - Batch #6
Coleman Watts [Wed, 14 Jan 2015 02:51:08 +0000 (21:51 -0500)]
Merge branch '4.5' into master
Conflicts:
CRM/Core/Payment/BaseIPN.php
tests/phpunit/WebTest/Campaign/CampaignDescriptionTest.php
tests/phpunit/WebTest/Event/AddPricesetTest.php
tests/phpunit/WebTest/Member/OfflineMembershipRenewTest.php
colemanw [Wed, 14 Jan 2015 02:28:27 +0000 (21:28 -0500)]
Merge pull request #4930 from colemanw/CRM-15817
CRM-15817 - Fix merge error
Dave Greenberg [Wed, 14 Jan 2015 02:11:34 +0000 (18:11 -0800)]
INFRA-132 - Batch #6
Coleman Watts [Wed, 14 Jan 2015 01:25:45 +0000 (20:25 -0500)]
CRM-15817 - Fix merge error
Tim Otten [Wed, 14 Jan 2015 01:23:43 +0000 (17:23 -0800)]
Merge pull request #4928 from totten/master-batch0
INFRA-132 - Batch 0
Tim Otten [Wed, 14 Jan 2015 00:28:17 +0000 (16:28 -0800)]
Merge pull request #4927 from totten/master-setupsh-data
bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options
Tim Otten [Wed, 14 Jan 2015 00:26:35 +0000 (16:26 -0800)]
INFRA-132 - Batch 0
Tim Otten [Tue, 13 Jan 2015 23:23:47 +0000 (15:23 -0800)]
bin/setup.sh - Distinguish the plain (civicrm_data.mysql) and example (civicrm_generated.mysql) options
colemanw [Tue, 13 Jan 2015 21:24:14 +0000 (16:24 -0500)]
Merge pull request #4926 from colemanw/INFRA-132
INFRA-132 - Batch #1
Coleman Watts [Tue, 13 Jan 2015 19:12:40 +0000 (14:12 -0500)]
INFRA-132 - Batch #1
Karin Gerritsen [Tue, 13 Jan 2015 19:56:05 +0000 (12:56 -0700)]
CRM-15814 - Gecoder maxlength issue -> go to 12
Look like we can now get 12 digits from Google: for an address with long < -100 (Calgary, AB e.g). We better go to 12:
-114.
2162111
Monish Deb [Tue, 13 Jan 2015 18:45:24 +0000 (00:15 +0530)]
Merge pull request #4919 from rohankatkar/webtests-4.5
Webtests fix-4.5
colemanw [Tue, 13 Jan 2015 18:17:02 +0000 (13:17 -0500)]
Merge pull request #4924 from colemanw/CRM-15742
CRM-15742 - Prevent dialog from returning to an invalid state
projects / civicrm-core.git / log