civicrm-core.git
9 years agoCRM-15798 adjust membership date calculation for multiyear membership
Eileen McNaughton [Thu, 8 Jan 2015 12:01:36 +0000 (01:01 +1300)]
CRM-15798 adjust membership date calculation for multiyear membership
After refactoring the code to understand it & adding a test this is the upshot...
we are dealing with annual memberships (even if they are in 5 year blocks rollover is
still about month & day) so if the definition of whether they are in the rollover period is
actually the same in multi-year as for a single year - if they are between the rollover &
the cut off they get an extra part-year. Hence, when determining whether to give an extra
part year we don't need to compare the rollover to the final end date (5 years on) but
to the next year's end date - just like for an annual

Note that one could argue, but I don't think anyone has, that if the 5 year period has started
then the get the remainder of this 5 years + the next 5 years - which is what the
existing code seems to be almost trying to do

9 years agoUpdate version to 4.6.alpha5
CiviCRM [Wed, 28 Jan 2015 11:23:22 +0000 (03:23 -0800)]
Update version to 4.6.alpha5

9 years agoMerge pull request #5020 from pratikshad/4.6-alpha4
Yashodha Chaku [Wed, 28 Jan 2015 09:33:32 +0000 (15:03 +0530)]
Merge pull request #5020 from pratikshad/4.6-alpha4

Fixed civicrm upgrade issue

9 years agoMerge pull request #4947 from eileenmcnaughton/examples
Eileen McNaughton [Wed, 28 Jan 2015 07:55:52 +0000 (20:55 +1300)]
Merge pull request #4947 from eileenmcnaughton/examples

Examples

9 years agoMerge pull request #5019 from totten/master-autosave-att
Tim Otten [Wed, 28 Jan 2015 07:39:41 +0000 (23:39 -0800)]
Merge pull request #5019 from totten/master-autosave-att

CRM-15855 - Autosave attachments. Call leave() as part of "Save Draft".

9 years agoCRM-15855 - crmMailing - After explicitly saving a draft, leave.
Tim Otten [Wed, 28 Jan 2015 05:52:45 +0000 (21:52 -0800)]
CRM-15855 - crmMailing - After explicitly saving a draft, leave.

9 years agoCRM-15855 - crmMailing - Fix autosave for attachments
Tim Otten [Wed, 28 Jan 2015 05:44:03 +0000 (21:44 -0800)]
CRM-15855 - crmMailing - Fix autosave for attachments

9 years agocrmMailing - Load attachments using "resolve"
Tim Otten [Wed, 28 Jan 2015 04:21:32 +0000 (20:21 -0800)]
crmMailing - Load attachments using "resolve"

9 years agoFixed civicrm upgrade issue
pratikshad [Wed, 28 Jan 2015 03:08:10 +0000 (13:08 +1000)]
Fixed civicrm upgrade issue

9 years agostill getting example test to pass
Eileen McNaughton [Tue, 27 Jan 2015 20:48:58 +0000 (09:48 +1300)]
still getting example test to pass

9 years agoRemove unneeded call to crmtooltip
Coleman Watts [Tue, 27 Jan 2015 19:47:04 +0000 (14:47 -0500)]
Remove unneeded call to crmtooltip

9 years agoapi example, hack id back to 1 to compensate for poor test cleanup
Eileen McNaughton [Tue, 27 Jan 2015 18:40:26 +0000 (07:40 +1300)]
api example, hack id back to 1 to compensate for poor test cleanup

9 years agocomment fix
Eileen McNaughton [Tue, 27 Jan 2015 17:39:47 +0000 (06:39 +1300)]
comment fix

9 years agoAlter contribution example test to try to get an error message
Eileen McNaughton [Tue, 27 Jan 2015 17:39:17 +0000 (06:39 +1300)]
Alter contribution example test to try to get an error message

9 years agoMerge pull request #5014 from eileenmcnaughton/rebase
Eileen McNaughton [Tue, 27 Jan 2015 17:35:03 +0000 (06:35 +1300)]
Merge pull request #5014 from eileenmcnaughton/rebase

CRM-15798 still refactoring variable names & adding comments

9 years agoMerge pull request #5015 from rohankatkar/CRM-15853
Kurund Jalmi [Tue, 27 Jan 2015 16:55:31 +0000 (22:25 +0530)]
Merge pull request #5015 from rohankatkar/CRM-15853

CRM-15853

9 years agoMerge pull request #5016 from colemanw/APIExplorer
colemanw [Tue, 27 Jan 2015 15:08:58 +0000 (10:08 -0500)]
Merge pull request #5016 from colemanw/APIExplorer

APIExplorer - lint js

9 years agoAPIExplorer - lint js
Coleman Watts [Tue, 27 Jan 2015 14:23:58 +0000 (09:23 -0500)]
APIExplorer - lint js

9 years agoCRM-15853
Web Access [Tue, 27 Jan 2015 14:13:17 +0000 (19:43 +0530)]
CRM-15853

9 years agoCRM-15798 still refactoring variable names & adding comments
Eileen McNaughton [Thu, 8 Jan 2015 11:49:36 +0000 (00:49 +1300)]
CRM-15798 still refactoring variable names & adding comments

9 years agoMerge pull request #5013 from totten/master-karma-ci
Tim Otten [Tue, 27 Jan 2015 11:00:26 +0000 (03:00 -0800)]
Merge pull request #5013 from totten/master-karma-ci

karma - Misc patches towards testing JS via Jenkins

9 years agoMerge pull request #5012 from totten/master-jshint
Tim Otten [Tue, 27 Jan 2015 09:20:21 +0000 (01:20 -0800)]
Merge pull request #5012 from totten/master-jshint

INFRA-132 - Add .jshintrc. Misc js cleanup.

9 years agobin/setup.sh - Reenable bower
Tim Otten [Tue, 27 Jan 2015 07:52:15 +0000 (07:52 +0000)]
bin/setup.sh - Reenable bower

9 years agoMerge pull request #5011 from eileenmcnaughton/rebase2
Eileen McNaughton [Tue, 27 Jan 2015 07:40:47 +0000 (20:40 +1300)]
Merge pull request #5011 from eileenmcnaughton/rebase2

additional test and test tidy-ups

9 years agokarma - Specify output for JUnit XML (when used)
Tim Otten [Tue, 27 Jan 2015 07:25:46 +0000 (23:25 -0800)]
karma - Specify output for JUnit XML (when used)

9 years agoINFRA-132 - Misc js
Tim Otten [Tue, 27 Jan 2015 05:53:48 +0000 (21:53 -0800)]
INFRA-132 - Misc js

9 years agoINFRA-132 - Add .jshintrc. Cleanup tests/karama/unit.
Tim Otten [Tue, 27 Jan 2015 05:46:43 +0000 (21:46 -0800)]
INFRA-132 - Add .jshintrc. Cleanup tests/karama/unit.

9 years agoremove unnecessary variable
Eileen McNaughton [Thu, 8 Jan 2015 11:38:53 +0000 (00:38 +1300)]
remove unnecessary variable

9 years agoadditional test and test tidy-ups
Eileen McNaughton [Tue, 27 Jan 2015 04:59:17 +0000 (17:59 +1300)]
additional test and test tidy-ups

9 years agoimprove error reporting on failed example test
Eileen McNaughton [Tue, 27 Jan 2015 04:55:45 +0000 (17:55 +1300)]
improve error reporting on failed example test

9 years agoMerge pull request #5010 from eileenmcnaughton/rebase2
Eileen McNaughton [Tue, 27 Jan 2015 04:44:25 +0000 (17:44 +1300)]
Merge pull request #5010 from eileenmcnaughton/rebase2

CRM-15798 function extraction on membership date calculation

9 years agoMerge pull request #5007 from colemanw/CRM-15759
colemanw [Tue, 27 Jan 2015 02:53:44 +0000 (21:53 -0500)]
Merge pull request #5007 from colemanw/CRM-15759

CRM-15759 - Use crmEditable for changing case activity status

9 years agoMerge pull request #5009 from eileenmcnaughton/contribution_recur_test
Eileen McNaughton [Tue, 27 Jan 2015 02:10:33 +0000 (15:10 +1300)]
Merge pull request #5009 from eileenmcnaughton/contribution_recur_test

Contribution recur test fixes

9 years agostylistic repair
Eileen McNaughton [Tue, 27 Jan 2015 02:03:10 +0000 (15:03 +1300)]
stylistic repair

9 years agoCRM-15798 function extraction on membership date calculation
Eileen McNaughton [Tue, 27 Jan 2015 01:59:14 +0000 (14:59 +1300)]
CRM-15798 function extraction on membership date calculation
this is part of a big rebase to clean up PR for CRM-15798 post code-cleanup
& it going stale

9 years agoMerge pull request #5008 from eileenmcnaughton/rebase
Eileen McNaughton [Tue, 27 Jan 2015 01:44:27 +0000 (14:44 +1300)]
Merge pull request #5008 from eileenmcnaughton/rebase

Rebase of some of the tidyups from other PR

9 years agotest generated examples: hack payment processor number back to 1 since cleanup on...
eileenmcnaughton [Tue, 27 Jan 2015 01:33:12 +0000 (01:33 +0000)]
test generated examples: hack payment processor number back to 1 since cleanup on test case is problematic

9 years agofurther minor tidy ups to example tests
eileenmcnaughton [Tue, 27 Jan 2015 01:11:08 +0000 (01:11 +0000)]
further minor tidy  ups to example tests

9 years agoupdate examples"
eileenmcnaughton [Thu, 15 Jan 2015 07:16:04 +0000 (07:16 +0000)]
update examples"

9 years agofix to previous - don't assume trxn_id required
Eileen McNaughton [Tue, 27 Jan 2015 01:00:01 +0000 (14:00 +1300)]
fix to previous - don't assume trxn_id required

9 years agoallow dummy to take mulitple trxn_ids
Eileen McNaughton [Tue, 27 Jan 2015 00:34:49 +0000 (13:34 +1300)]
allow dummy to take mulitple trxn_ids

9 years agoadd flush for cached payment processors
Eileen McNaughton [Tue, 27 Jan 2015 00:22:53 +0000 (13:22 +1300)]
add flush for cached payment processors

9 years agocomment fixes
Eileen McNaughton [Tue, 27 Jan 2015 00:21:28 +0000 (13:21 +1300)]
comment fixes

9 years agostyle fixes
Eileen McNaughton [Mon, 26 Jan 2015 23:59:28 +0000 (12:59 +1300)]
style fixes

9 years agorename contribution type to financial type
Eileen McNaughton [Mon, 26 Jan 2015 23:18:54 +0000 (12:18 +1300)]
rename contribution type to financial type

9 years agofix error whereby protected function called
Eileen McNaughton [Mon, 26 Jan 2015 23:16:55 +0000 (12:16 +1300)]
fix error whereby protected function called
since calling direct payment throws an error we can move the error handling too

9 years agominor tidyups
Eileen McNaughton [Mon, 26 Jan 2015 23:03:42 +0000 (12:03 +1300)]
minor tidyups

9 years agominor tidyups
Eileen McNaughton [Thu, 8 Jan 2015 11:19:27 +0000 (00:19 +1300)]
minor tidyups

9 years agoCRM-15798 membership_type api tidy-up - preparatory to test fixes
Eileen McNaughton [Thu, 8 Jan 2015 04:34:57 +0000 (17:34 +1300)]
CRM-15798 membership_type api tidy-up - preparatory to test fixes

9 years agoCRM-15759 - Use crmEditable for changing case activity status
Coleman Watts [Mon, 26 Jan 2015 18:38:31 +0000 (13:38 -0500)]
CRM-15759 - Use crmEditable for changing case activity status

Also cleanup js in ActivityTab.tpl

9 years agoMerge branch 4.5 into master
Coleman Watts [Mon, 26 Jan 2015 16:38:59 +0000 (11:38 -0500)]
Merge branch 4.5 into master

9 years agoAPIExplorer.js comment cleanup
Coleman Watts [Mon, 26 Jan 2015 16:36:44 +0000 (11:36 -0500)]
APIExplorer.js comment cleanup

9 years agoMerge pull request #5002 from colemanw/explorer
colemanw [Mon, 26 Jan 2015 16:21:17 +0000 (11:21 -0500)]
Merge pull request #5002 from colemanw/explorer

API explorer improvements

9 years agoMerge pull request #5005 from colemanw/CRM-15872
colemanw [Mon, 26 Jan 2015 14:01:38 +0000 (09:01 -0500)]
Merge pull request #5005 from colemanw/CRM-15872

CRM-15872 - Fix change activity status on contact case tab

9 years agoCRM-15872 - Fix change activity status on contact case tab
Coleman Watts [Mon, 26 Jan 2015 14:01:12 +0000 (09:01 -0500)]
CRM-15872 - Fix change activity status on contact case tab

9 years agoMerge pull request #4985 from colemanw/CRM-15845
Kurund Jalmi [Mon, 26 Jan 2015 12:21:12 +0000 (17:51 +0530)]
Merge pull request #4985 from colemanw/CRM-15845

CRM-15845 - Fix relationship datatables permission check

9 years agoMerge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00
kurund [Mon, 26 Jan 2015 09:07:58 +0000 (14:37 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-26-14-28-00

Conflicts:
CRM/Contact/Page/ImageFile.php
CRM/Contribute/Form/SoftCredit.php
CRM/Event/Form/ManageEvent/Registration.php

9 years agoAPI explorer js style cleanup
Coleman Watts [Sun, 25 Jan 2015 22:15:11 +0000 (17:15 -0500)]
API explorer js style cleanup

9 years agoFix api explorer chaining to use getactions
Coleman Watts [Sun, 25 Jan 2015 20:31:21 +0000 (15:31 -0500)]
Fix api explorer chaining to use getactions

9 years agoCRM-15789 - Add icon to api explorer button
Coleman Watts [Sun, 25 Jan 2015 19:47:01 +0000 (14:47 -0500)]
CRM-15789 - Add icon to api explorer button

9 years agoApi explorer improvements
Coleman Watts [Sat, 24 Jan 2015 21:27:27 +0000 (16:27 -0500)]
Api explorer improvements

9 years agoMerge pull request #5000 from totten/master-cbf3
Tim Otten [Sat, 24 Jan 2015 10:32:56 +0000 (02:32 -0800)]
Merge pull request #5000 from totten/master-cbf3

INFRA-132 - Misc

9 years agoINFRA-132 - Misc
Tim Otten [Sat, 24 Jan 2015 09:18:32 +0000 (01:18 -0800)]
INFRA-132 - Misc

9 years agoMerge pull request #4999 from totten/master-autosave
Tim Otten [Sat, 24 Jan 2015 09:19:47 +0000 (01:19 -0800)]
Merge pull request #4999 from totten/master-autosave

CRM-15855 - Autosave mailings while editing

9 years agoINFRA-132 - angular-crmMailingAB/directives.js
Tim Otten [Sat, 24 Jan 2015 08:00:57 +0000 (00:00 -0800)]
INFRA-132 - angular-crmMailingAB/directives.js

9 years agoCRM-15856 - crmMailing - Disable "Submit Mailing" until the form is valid.
Tim Otten [Sat, 24 Jan 2015 06:32:31 +0000 (22:32 -0800)]
CRM-15856 - crmMailing - Disable "Submit Mailing" until the form is valid.

9 years agoCRM-15856 - crmMailing - Validate that body_html *or* body_text is defined
Tim Otten [Sat, 24 Jan 2015 06:28:52 +0000 (22:28 -0800)]
CRM-15856 - crmMailing - Validate that body_html *or* body_text is defined

9 years agoCRM-15856 - crmUi - Add generic, field-independent validator (crmUiValidate).
Tim Otten [Sat, 24 Jan 2015 06:27:05 +0000 (22:27 -0800)]
CRM-15856 - crmUi - Add generic, field-independent validator (crmUiValidate).

9 years agoCRM-15856 - crmMailing - Disable browser's form validation.
Tim Otten [Sat, 24 Jan 2015 05:23:22 +0000 (21:23 -0800)]
CRM-15856 - crmMailing - Disable browser's form validation.

It duplicates Angular's validation and is harder to fine-tune.

9 years agoCRM-15856 - crmUiWizard - Disable "Next" button until the step is complete. Update...
Tim Otten [Sat, 24 Jan 2015 05:22:37 +0000 (21:22 -0800)]
CRM-15856 - crmUiWizard - Disable "Next" button until the step is complete. Update wizards.

9 years agoCRM-15855 - Allow mailings to be saved (but not sent) without name+subject.
Tim Otten [Sat, 24 Jan 2015 05:03:13 +0000 (21:03 -0800)]
CRM-15855 - Allow mailings to be saved (but not sent) without name+subject.

9 years agocrmMailing - Block Save/Delete/Submit while saving/deleting/submitting.
Tim Otten [Sat, 24 Jan 2015 03:17:43 +0000 (19:17 -0800)]
crmMailing - Block Save/Delete/Submit while saving/deleting/submitting.

9 years agoCRM-15855 - crmMailing - Use crmAutosave
Tim Otten [Fri, 23 Jan 2015 11:30:23 +0000 (03:30 -0800)]
CRM-15855 - crmMailing - Use crmAutosave

9 years agoCRM-15855 - Add crmAutosave module
Tim Otten [Fri, 23 Jan 2015 11:30:02 +0000 (03:30 -0800)]
CRM-15855 - Add crmAutosave module

9 years agocrmStatus - Fix for use without a promise.
Tim Otten [Sat, 24 Jan 2015 00:18:36 +0000 (16:18 -0800)]
crmStatus - Fix for use without a promise.

9 years agoCivi\Angular - Docblock improvements.
Tim Otten [Fri, 23 Jan 2015 08:14:31 +0000 (00:14 -0800)]
Civi\Angular - Docblock improvements.

9 years agoMultiple Angular modules - Remove partialUrl() helper
Tim Otten [Fri, 23 Jan 2015 08:02:20 +0000 (00:02 -0800)]
Multiple Angular modules - Remove partialUrl() helper

This helper provided a bit of indirection so that we didn't need to
hard-code crazylong templateUrls.  crmResource now provides that indirection
in a prettier way, so partialUrl() is extraneous.

9 years agoCRM-15855 - crmMailing - For new mailings, automatically save and redirect.
Tim Otten [Fri, 23 Jan 2015 07:53:10 +0000 (23:53 -0800)]
CRM-15855 - crmMailing - For new mailings, automatically save and redirect.

9 years agoCRM-15855 - crmMailingMgr.create - New mailing template should be saveable
Tim Otten [Fri, 23 Jan 2015 07:51:07 +0000 (23:51 -0800)]
CRM-15855 - crmMailingMgr.create - New mailing template should be saveable

9 years agoMerge pull request #4185 from samuelsov/CRM-15330
Dave Greenberg [Fri, 23 Jan 2015 21:09:41 +0000 (13:09 -0800)]
Merge pull request #4185 from samuelsov/CRM-15330

Remove specific handling of name field in getModuleUFGroup

9 years agoMerge pull request #4997 from monishdeb/CRM-15536
Dave Greenberg [Fri, 23 Jan 2015 20:19:49 +0000 (12:19 -0800)]
Merge pull request #4997 from monishdeb/CRM-15536

CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also includ...

9 years agoMerge pull request #4889 from monishdeb/CRM-15728-fix
Dave Greenberg [Fri, 23 Jan 2015 18:42:48 +0000 (10:42 -0800)]
Merge pull request #4889 from monishdeb/CRM-15728-fix

Crm 15728 fix

9 years agoMerge pull request #4998 from colemanw/CRM-15862
colemanw [Fri, 23 Jan 2015 14:58:55 +0000 (09:58 -0500)]
Merge pull request #4998 from colemanw/CRM-15862

CRM-15862 - Improve entityRef defaults and support relationship_type

9 years agoCRM-15862 - Improve entityRef defaults and support relationship_type
Coleman Watts [Fri, 23 Jan 2015 14:54:41 +0000 (09:54 -0500)]
CRM-15862 - Improve entityRef defaults and support relationship_type

9 years agoComment cleanup
Coleman Watts [Fri, 23 Jan 2015 14:29:33 +0000 (09:29 -0500)]
Comment cleanup

9 years agoCRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to...
monishdeb [Fri, 23 Jan 2015 11:43:50 +0000 (17:13 +0530)]
CRM-15536 fix - Scheduled reminders: Clarify "Limit to" and "Also include" UI to prevent user errors

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

9 years agoQA changes
monishdeb [Fri, 23 Jan 2015 09:38:09 +0000 (15:08 +0530)]
QA changes

9 years agotypo fix
monishdeb [Tue, 27 Jan 2015 14:44:40 +0000 (20:14 +0530)]
typo fix

9 years agoOptimization and test changes
monishdeb [Tue, 27 Jan 2015 14:35:50 +0000 (20:05 +0530)]
Optimization and test changes

9 years agoAdded unit-tests and other fixes
monishdeb [Wed, 7 Jan 2015 08:03:52 +0000 (13:33 +0530)]
Added unit-tests and other fixes

9 years agoadditional comments
monishdeb [Fri, 26 Dec 2014 14:27:37 +0000 (19:57 +0530)]
additional comments

9 years agoCRM-15735 fix - Update payment status for pay-later membership renewal ignores Receiv...
monishdeb [Fri, 26 Dec 2014 14:15:01 +0000 (19:45 +0530)]
CRM-15735 fix - Update payment status for pay-later membership renewal ignores Received date

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

9 years agoMerge pull request #4994 from NileemaJadhav/CRM-15821
Dave Greenberg [Fri, 23 Jan 2015 02:12:49 +0000 (18:12 -0800)]
Merge pull request #4994 from NileemaJadhav/CRM-15821

CRM-15821 PCP improvement

9 years agoMerge pull request #4990 from totten/master-mgddoc
Tim Otten [Fri, 23 Jan 2015 00:49:52 +0000 (16:49 -0800)]
Merge pull request #4990 from totten/master-mgddoc

CRM_Core_ManagedEntities - Improve docs.

9 years agoMerge pull request #4991 from totten/4.5-imgcache
Tim Otten [Fri, 23 Jan 2015 00:49:33 +0000 (16:49 -0800)]
Merge pull request #4991 from totten/4.5-imgcache

Allow caching of profile images

9 years agoMerge pull request #4996 from colemanw/CRM-15858
colemanw [Fri, 23 Jan 2015 00:18:41 +0000 (19:18 -0500)]
Merge pull request #4996 from colemanw/CRM-15858

CRM-15858 - Fix changeLog display of custom data

9 years agoCRM-15858 - Fix changeLog display of custom data
Coleman Watts [Thu, 22 Jan 2015 19:10:47 +0000 (14:10 -0500)]
CRM-15858 - Fix changeLog display of custom data

9 years agoCRM-15759 - Fix pseudoconstant matching for api.setvalue
Coleman Watts [Thu, 22 Jan 2015 18:36:19 +0000 (13:36 -0500)]
CRM-15759 - Fix pseudoconstant matching for api.setvalue

9 years agoMerge pull request #4995 from colemanw/CRM-15842
colemanw [Thu, 22 Jan 2015 15:37:01 +0000 (10:37 -0500)]
Merge pull request #4995 from colemanw/CRM-15842

CRM-15842 - Improve default of 'collapsed' checkbox

9 years agoCRM-15842 - Improve default of 'collapsed' checkbox
Coleman Watts [Thu, 22 Jan 2015 15:30:51 +0000 (10:30 -0500)]
CRM-15842 - Improve default of 'collapsed' checkbox