civicrm-core.git
9 years agoCRM-15707 fix test generated documentation iinstance
eileenmcnaughton [Mon, 2 Feb 2015 10:09:30 +0000 (10:09 +0000)]
CRM-15707 fix test generated documentation iinstance

9 years agoMerge pull request #5054 from eileenmcnaughton/comments
Eileen McNaughton [Mon, 2 Feb 2015 07:26:08 +0000 (20:26 +1300)]
Merge pull request #5054 from eileenmcnaughton/comments

a few comment fixes

9 years agoMerge pull request #5038 from civicrm/CRM-15877
Yashodha Chaku [Mon, 2 Feb 2015 06:41:45 +0000 (12:11 +0530)]
Merge pull request #5038 from civicrm/CRM-15877

CRM-15877: fix for truncated prefix/suffix in export csv

9 years agoMerge pull request #5048 from totten/master-mailing-misc
Tim Otten [Mon, 2 Feb 2015 04:46:45 +0000 (20:46 -0800)]
Merge pull request #5048 from totten/master-mailing-misc

CRM-15578, CRM-15705 - crmMailing fixes/cleanup

9 years agoMerge pull request #5056 from eileenmcnaughton/master
Eileen McNaughton [Mon, 2 Feb 2015 04:13:56 +0000 (17:13 +1300)]
Merge pull request #5056 from eileenmcnaughton/master

Master

9 years agofix comments, capitalization
Eileen McNaughton [Mon, 2 Feb 2015 04:13:43 +0000 (17:13 +1300)]
fix comments, capitalization

9 years agocomment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:54:00 +0000 (16:54 +1300)]
comment fixes

9 years agoA few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:38:15 +0000 (16:38 +1300)]
A few comment fixes

9 years agoa few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:31:27 +0000 (16:31 +1300)]
a few comment fixes

9 years agocomment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:14:26 +0000 (16:14 +1300)]
comment fixes

9 years agocomment fixes
Eileen McNaughton [Mon, 2 Feb 2015 03:11:44 +0000 (16:11 +1300)]
comment fixes

9 years agocomment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:57:11 +0000 (15:57 +1300)]
comment fixes

9 years agosome comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:49:18 +0000 (15:49 +1300)]
some comment fixes

9 years agoa few comment fixes
Eileen McNaughton [Mon, 2 Feb 2015 02:15:48 +0000 (15:15 +1300)]
a few comment fixes

9 years agowhitespace only
Eileen McNaughton [Mon, 2 Feb 2015 02:45:01 +0000 (15:45 +1300)]
whitespace only

9 years agoCRM-15659 fix reference 'every one month(s).' to 'every month.'
Eileen McNaughton [Mon, 2 Feb 2015 02:21:46 +0000 (15:21 +1300)]
CRM-15659 fix reference 'every one month(s).' to 'every month.'

9 years agoMerge pull request #5053 from eileenmcnaughton/comments
Eileen McNaughton [Mon, 2 Feb 2015 00:43:33 +0000 (13:43 +1300)]
Merge pull request #5053 from eileenmcnaughton/comments

a few comment fixes

9 years agofurther comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 23:32:51 +0000 (12:32 +1300)]
further comment fixes

9 years agoa few comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 23:20:25 +0000 (12:20 +1300)]
a few comment fixes

9 years agoMerge pull request #5051 from eileenmcnaughton/comments
Eileen McNaughton [Sun, 1 Feb 2015 23:02:09 +0000 (12:02 +1300)]
Merge pull request #5051 from eileenmcnaughton/comments

Comment fixes

9 years agocomment fix
Eileen McNaughton [Sun, 1 Feb 2015 21:52:40 +0000 (10:52 +1300)]
comment fix

9 years agoa few comment fixes
Eileen McNaughton [Sun, 1 Feb 2015 21:39:41 +0000 (10:39 +1300)]
a few comment fixes

9 years agofix a few comments
Eileen McNaughton [Sun, 1 Feb 2015 21:31:54 +0000 (10:31 +1300)]
fix a few comments

9 years agoadd a few comment blocks
Eileen McNaughton [Sun, 1 Feb 2015 21:27:57 +0000 (10:27 +1300)]
add a few comment blocks

9 years agoComment fixes
Eileen McNaughton [Sun, 1 Feb 2015 21:17:38 +0000 (10:17 +1300)]
Comment fixes

9 years agoMerge pull request #5041 from colemanw/CRM-15890
colemanw [Sat, 31 Jan 2015 13:27:47 +0000 (08:27 -0500)]
Merge pull request #5041 from colemanw/CRM-15890

CRM-15890 - Switch jQuery to use bower version

9 years agoMerge pull request #5047 from colemanw/CRM-15898
colemanw [Sat, 31 Jan 2015 13:21:35 +0000 (08:21 -0500)]
Merge pull request #5047 from colemanw/CRM-15898

CRM-15898 - Use simpler version of title as global

9 years agoCRM-15578 - crmMailing - Fix checkboxes
Tim Otten [Fri, 30 Jan 2015 08:10:46 +0000 (00:10 -0800)]
CRM-15578 - crmMailing - Fix checkboxes

9 years agoCRM-15705 - edit,edit-wizard - Move mailing-name next to subject/recipients/etc
Tim Otten [Fri, 30 Jan 2015 06:37:33 +0000 (22:37 -0800)]
CRM-15705 - edit,edit-wizard - Move mailing-name next to subject/recipients/etc

9 years agocrmMailing - Comments/cleanup
Tim Otten [Fri, 30 Jan 2015 03:25:34 +0000 (19:25 -0800)]
crmMailing - Comments/cleanup

9 years agoCRM-15705 - "Template" field - Remove colored background.
Tim Otten [Fri, 30 Jan 2015 03:00:09 +0000 (19:00 -0800)]
CRM-15705 - "Template" field - Remove colored background.

9 years agoCRM-15890 - bin/setup.sh - Workaround for bower bug
Tim Otten [Sat, 31 Jan 2015 03:08:17 +0000 (19:08 -0800)]
CRM-15890 - bin/setup.sh - Workaround for bower bug

9 years agoCRM-15898 - Use simpler version of title as global
Coleman Watts [Sat, 31 Jan 2015 03:06:45 +0000 (22:06 -0500)]
CRM-15898 - Use simpler version of title as global

----------------------------------------
* CRM-15898: Set <title> in wordpress header
  https://issues.civicrm.org/jira/browse/CRM-15898

9 years agoMerge pull request #5043 from colemanw/CRM-15868
colemanw [Fri, 30 Jan 2015 22:49:55 +0000 (17:49 -0500)]
Merge pull request #5043 from colemanw/CRM-15868

CRM-15868 - Cleanup contact delete/trash hooks

9 years agoCRM-15890 - Make bower dependency version numbers more flexible
Coleman Watts [Fri, 30 Jan 2015 21:42:41 +0000 (16:42 -0500)]
CRM-15890 - Make bower dependency version numbers more flexible

9 years agoMerge pull request #5044 from colemanw/Comment
colemanw [Fri, 30 Jan 2015 21:35:55 +0000 (16:35 -0500)]
Merge pull request #5044 from colemanw/Comment

Comment cleanup - remove @access tag

9 years agoINFRA-132 - Comment cleanup - remove @access tag
Coleman Watts [Fri, 30 Jan 2015 21:34:18 +0000 (16:34 -0500)]
INFRA-132 - Comment cleanup - remove @access tag

9 years agoCRM-15868 - Cleanup contact delete/trash hooks
Coleman Watts [Fri, 30 Jan 2015 21:26:05 +0000 (16:26 -0500)]
CRM-15868 - Cleanup contact delete/trash hooks

9 years agoCRM-15890 - Add lo-dash to bower_components
Coleman Watts [Fri, 30 Jan 2015 16:59:29 +0000 (11:59 -0500)]
CRM-15890 - Add lo-dash to bower_components

9 years agoMerge pull request #5040 from atif-shaikh/CRM-15835
Dave Greenberg [Fri, 30 Jan 2015 16:52:46 +0000 (08:52 -0800)]
Merge pull request #5040 from atif-shaikh/CRM-15835

CRM-15835 - Event registrations total amounts with decimals stored incor...

9 years agoCRM-15890 - accomodate js outside of packages
Coleman Watts [Fri, 30 Jan 2015 16:47:44 +0000 (11:47 -0500)]
CRM-15890 - accomodate js outside of packages

9 years agoDelete unused tpl file
Coleman Watts [Fri, 30 Jan 2015 16:19:05 +0000 (11:19 -0500)]
Delete unused tpl file

9 years agoCRM-15890 - Switch jQuery to use bower version
Coleman Watts [Fri, 30 Jan 2015 16:18:39 +0000 (11:18 -0500)]
CRM-15890 - Switch jQuery to use bower version

9 years agoCRM-15835 - Event registrations total amounts with decimals stored incorrectly when...
atif-shaikh [Fri, 30 Jan 2015 13:55:02 +0000 (19:25 +0530)]
CRM-15835 - Event registrations total amounts with decimals stored incorrectly when CiviCRM thousands separator is a dot

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

9 years agospace fix
yashodha [Fri, 30 Jan 2015 11:24:05 +0000 (16:54 +0530)]
space fix

9 years agoCRM-15877: fix for truncated prefix/suffix in export csv
yashodha [Fri, 30 Jan 2015 11:21:02 +0000 (16:51 +0530)]
CRM-15877: fix for truncated prefix/suffix in export csv

----------------------------------------
* CRM-15877: prefix_id truncated on contacts export
  https://issues.civicrm.org/jira/browse/CRM-15877

9 years agoMerge pull request #5036 from totten/master-ang-php53
Tim Otten [Fri, 30 Jan 2015 06:34:13 +0000 (22:34 -0800)]
Merge pull request #5036 from totten/master-ang-php53

CRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3

9 years agoMerge pull request #5037 from davecivicrm/CRM-15721
Dave Greenberg [Fri, 30 Jan 2015 01:19:43 +0000 (17:19 -0800)]
Merge pull request #5037 from davecivicrm/CRM-15721

CRM-15721 - Add Payment Processor Name to View Contribution page.

9 years agoMerge pull request #5030 from davecivicrm/CRM-15883
Dave Greenberg [Thu, 29 Jan 2015 23:50:43 +0000 (15:50 -0800)]
Merge pull request #5030 from davecivicrm/CRM-15883

CRM-15883 - Suppressing Stationery path field from PDF Letter action sin...

9 years agoCRM-15721 - Add Payment Processor Name to View Contribution page.
Dave Greenberg [Thu, 29 Jan 2015 23:48:20 +0000 (15:48 -0800)]
CRM-15721 - Add Payment Processor Name to View Contribution page.

----------------------------------------
* CRM-15721: Associate contributions with the payment processor used to make it
  https://issues.civicrm.org/jira/browse/CRM-15721

9 years agoCRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3
Tim Otten [Thu, 29 Jan 2015 23:25:40 +0000 (15:25 -0800)]
CRM-15832 - Civi\Angular\Page\Main - Fix PHP 5.3

9 years agoCRM-15883 - Suppressing Stationery path field from PDF Letter action since it is...
Dave Greenberg [Thu, 29 Jan 2015 22:31:15 +0000 (14:31 -0800)]
CRM-15883 - Suppressing Stationery path field from PDF Letter action since it is not currently supported. New commit to fix formatting compaints related to commenting out a section of code.

----------------------------------------
* CRM-15883: Need to remove inoperative "stationery" box from page format when using Print PDF letter?
  https://issues.civicrm.org/jira/browse/CRM-15883

9 years agoMerge pull request #5031 from eileenmcnaughton/infra-fix
Eileen McNaughton [Thu, 29 Jan 2015 19:32:05 +0000 (08:32 +1300)]
Merge pull request #5031 from eileenmcnaughton/infra-fix

infra updated incorrectly set public functions to private on payment cla...

9 years agoMerge pull request #5029 from davecivicrm/CRM-15884
Dave Greenberg [Thu, 29 Jan 2015 17:52:35 +0000 (09:52 -0800)]
Merge pull request #5029 from davecivicrm/CRM-15884

CRM-15884 fix typo in variable name related to earlier code cleanup.

9 years agoMerge pull request #5027 from colemanw/CRM-15705
colemanw [Thu, 29 Jan 2015 14:01:57 +0000 (09:01 -0500)]
Merge pull request #5027 from colemanw/CRM-15705

CRM-15705 - Mailing UI improvements

9 years agoMerge pull request #5025 from JohnFF/patch-7
Yashodha Chaku [Thu, 29 Jan 2015 04:19:07 +0000 (09:49 +0530)]
Merge pull request #5025 from JohnFF/patch-7

Fixed incorrect CSS tag

9 years agoMerge pull request #5026 from JohnFF/patch-8
Yashodha Chaku [Thu, 29 Jan 2015 04:18:41 +0000 (09:48 +0530)]
Merge pull request #5026 from JohnFF/patch-8

Fixed incorrect CSS tag

9 years agoMerge pull request #5024 from JohnFF/patch-6
Yashodha Chaku [Thu, 29 Jan 2015 04:18:13 +0000 (09:48 +0530)]
Merge pull request #5024 from JohnFF/patch-6

Fixed incorrect CSS tag

9 years agoMerge pull request #5023 from JohnFF/patch-5
Yashodha Chaku [Thu, 29 Jan 2015 04:17:11 +0000 (09:47 +0530)]
Merge pull request #5023 from JohnFF/patch-5

Fixed incorrect CSS tag

9 years agoinfra updated incorrectly set public functions to private on payment classes
Eileen McNaughton [Thu, 29 Jan 2015 04:11:14 +0000 (17:11 +1300)]
infra updated incorrectly set public functions to private on payment classes
this doesn't fix that - it just adapts one instance to not call doDirectPayment & to instead call doPayment
doPayment is now preferred (decision from there rests in payment system) but since doPayment
throws exceptions not changing an masse - however, the api is 'exception-native'

9 years agoMerge pull request #5017 from eileenmcnaughton/rebase
Eileen McNaughton [Thu, 29 Jan 2015 03:42:35 +0000 (16:42 +1300)]
Merge pull request #5017 from eileenmcnaughton/rebase

CRM-15798 adjust membership date calculation for multiyear membership

9 years agoCRM-15883 - Suppressing Stationery path field from PDF Letter action since it is...
Dave Greenberg [Thu, 29 Jan 2015 00:53:22 +0000 (16:53 -0800)]
CRM-15883 - Suppressing Stationery path field from PDF Letter action since it is not currently supported.

----------------------------------------
* CRM-15883: Need to remove inoperative "stationery" box from page format when using Print PDF letter?
  https://issues.civicrm.org/jira/browse/CRM-15883

9 years agofix mixup of variable name during rebasing
Eileen McNaughton [Thu, 29 Jan 2015 00:36:53 +0000 (13:36 +1300)]
fix mixup of variable name during rebasing

9 years agoremove extraneous semi-colon
Eileen McNaughton [Thu, 29 Jan 2015 00:20:09 +0000 (13:20 +1300)]
remove extraneous semi-colon

9 years agoremove another unused variable
Eileen McNaughton [Wed, 28 Jan 2015 20:54:32 +0000 (09:54 +1300)]
remove another unused variable

9 years agoremove unused variable & improve spelling, commments
Eileen McNaughton [Wed, 28 Jan 2015 20:49:51 +0000 (09:49 +1300)]
remove unused variable & improve spelling, commments

9 years agoedit test comments and add tests
Eileen McNaughton [Wed, 28 Jan 2015 20:42:18 +0000 (09:42 +1300)]
edit test comments and add tests

9 years agoCRM-15798 additional tests
Eileen McNaughton [Wed, 28 Jan 2015 09:26:50 +0000 (22:26 +1300)]
CRM-15798 additional tests

9 years agoCRM-15798 add appropriate tests
Eileen McNaughton [Thu, 8 Jan 2015 04:39:48 +0000 (17:39 +1300)]
CRM-15798 add appropriate tests

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 agoCRM-15884 fix typo in variable name related to earlier code cleanup.
Dave Greenberg [Thu, 29 Jan 2015 00:14:31 +0000 (16:14 -0800)]
CRM-15884 fix typo in variable name related to earlier code cleanup.

----------------------------------------
* CRM-15884: Delete Membership fails due to typo in variable name
  https://issues.civicrm.org/jira/browse/CRM-15884

9 years agoCRM-15705 - Abstract dialog resizing for reusability
Coleman Watts [Wed, 28 Jan 2015 19:18:42 +0000 (14:18 -0500)]
CRM-15705 - Abstract dialog resizing for reusability

9 years agoCRM-15705 - Fix tab header appearance
Coleman Watts [Wed, 28 Jan 2015 16:40:51 +0000 (11:40 -0500)]
CRM-15705 - Fix tab header appearance

9 years agoCRM-15705 - Standardize token menu label and icon
Coleman Watts [Wed, 28 Jan 2015 15:02:27 +0000 (10:02 -0500)]
CRM-15705 - Standardize token menu label and icon

9 years agoCRM-15705 - Add button icons to angular popup
Coleman Watts [Wed, 28 Jan 2015 15:01:50 +0000 (10:01 -0500)]
CRM-15705 - Add button icons to angular popup

9 years agoFixed incorrect CSS tag
John E Prescott [Wed, 28 Jan 2015 15:45:01 +0000 (15:45 +0000)]
Fixed incorrect CSS tag

9 years agoFixed incorrect CSS tag
John E Prescott [Wed, 28 Jan 2015 15:44:36 +0000 (15:44 +0000)]
Fixed incorrect CSS tag

9 years agoFixed incorrect CSS tag
John E Prescott [Wed, 28 Jan 2015 15:44:06 +0000 (15:44 +0000)]
Fixed incorrect CSS tag

9 years agoFixed incorrect CSS tag
John E Prescott [Wed, 28 Jan 2015 15:42:10 +0000 (15:42 +0000)]
Fixed incorrect CSS tag

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.