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
Coleman Watts [Sat, 24 Jan 2015 21:27:27 +0000 (16:27 -0500)]
Api explorer improvements
Tim Otten [Sat, 24 Jan 2015 10:32:56 +0000 (02:32 -0800)]
Merge pull request #5000 from totten/master-cbf3
INFRA-132 - Misc
Tim Otten [Sat, 24 Jan 2015 09:18:32 +0000 (01:18 -0800)]
INFRA-132 - Misc
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
Tim Otten [Sat, 24 Jan 2015 08:00:57 +0000 (00:00 -0800)]
INFRA-132 - angular-crmMailingAB/directives.js
Tim Otten [Sat, 24 Jan 2015 06:32:31 +0000 (22:32 -0800)]
CRM-15856 - crmMailing - Disable "Submit Mailing" until the form is valid.
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
Tim Otten [Sat, 24 Jan 2015 06:27:05 +0000 (22:27 -0800)]
CRM-15856 - crmUi - Add generic, field-independent validator (crmUiValidate).
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.
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.
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.
Tim Otten [Sat, 24 Jan 2015 03:17:43 +0000 (19:17 -0800)]
crmMailing - Block Save/Delete/Submit while saving/deleting/submitting.
Tim Otten [Fri, 23 Jan 2015 11:30:23 +0000 (03:30 -0800)]
CRM-15855 - crmMailing - Use crmAutosave
Tim Otten [Fri, 23 Jan 2015 11:30:02 +0000 (03:30 -0800)]
CRM-15855 - Add crmAutosave module
Tim Otten [Sat, 24 Jan 2015 00:18:36 +0000 (16:18 -0800)]
crmStatus - Fix for use without a promise.
Tim Otten [Fri, 23 Jan 2015 08:14:31 +0000 (00:14 -0800)]
Civi\Angular - Docblock improvements.
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.
Tim Otten [Fri, 23 Jan 2015 07:53:10 +0000 (23:53 -0800)]
CRM-15855 - crmMailing - For new mailings, automatically save and redirect.
Tim Otten [Fri, 23 Jan 2015 07:51:07 +0000 (23:51 -0800)]
CRM-15855 - crmMailingMgr.create - New mailing template should be saveable
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
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...
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
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
Coleman Watts [Fri, 23 Jan 2015 14:54:41 +0000 (09:54 -0500)]
CRM-15862 - Improve entityRef defaults and support relationship_type
Coleman Watts [Fri, 23 Jan 2015 14:29:33 +0000 (09:29 -0500)]
Comment cleanup
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
monishdeb [Fri, 23 Jan 2015 09:38:09 +0000 (15:08 +0530)]
QA changes
monishdeb [Tue, 27 Jan 2015 14:44:40 +0000 (20:14 +0530)]
typo fix
monishdeb [Tue, 27 Jan 2015 14:35:50 +0000 (20:05 +0530)]
Optimization and test changes
monishdeb [Wed, 7 Jan 2015 08:03:52 +0000 (13:33 +0530)]
Added unit-tests and other fixes
monishdeb [Fri, 26 Dec 2014 14:27:37 +0000 (19:57 +0530)]
additional comments
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
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
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.
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
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
Coleman Watts [Thu, 22 Jan 2015 19:10:47 +0000 (14:10 -0500)]
CRM-15858 - Fix changeLog display of custom data
Coleman Watts [Thu, 22 Jan 2015 18:36:19 +0000 (13:36 -0500)]
CRM-15759 - Fix pseudoconstant matching for api.setvalue
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
Coleman Watts [Thu, 22 Jan 2015 15:30:51 +0000 (10:30 -0500)]
CRM-15842 - Improve default of 'collapsed' checkbox
NileemaJadhav [Thu, 22 Jan 2015 14:12:49 +0000 (19:42 +0530)]
CRM-15821 Modification in message template and sample data
----------------------------------------
* CRM-15821: Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
https://issues.civicrm.org/jira/browse/CRM-15821
NileemaJadhav [Thu, 22 Jan 2015 13:15:29 +0000 (18:45 +0530)]
CRM-15821 PCP Improvements
----------------------------------------
* CRM-15821: Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
https://issues.civicrm.org/jira/browse/CRM-15821
Monish Deb [Thu, 22 Jan 2015 12:30:05 +0000 (18:00 +0530)]
Merge pull request #4992 from rohankatkar/upgrade
Added missing table "civicrm_mailing_abtest" in 4.6.alpha1.mysql.tpl
Web Access [Thu, 22 Jan 2015 05:56:51 +0000 (11:26 +0530)]
Added comments to missing table civicrm_mailing_abtest in 4.6.alpha1.mysql.tpl
Web Access [Thu, 22 Jan 2015 05:48:54 +0000 (11:18 +0530)]
Added missing table civicrm_mailing_abtest in 4.6.alpha1.mysql.tpl
colemanw [Wed, 21 Jan 2015 23:09:58 +0000 (18:09 -0500)]
Merge pull request #4986 from colemanw/CRM-15789
CRM-15789 - Add helper function for button markup
Coleman Watts [Wed, 21 Jan 2015 21:01:01 +0000 (16:01 -0500)]
CRM-15789 - Put {crmButton} into general use
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Coleman Watts [Wed, 21 Jan 2015 20:28:53 +0000 (15:28 -0500)]
Case ActivityView.tpl cleanup
Dave Greenberg [Wed, 21 Jan 2015 19:35:39 +0000 (11:35 -0800)]
Merge pull request #4966 from NileemaJadhav/CRM-15821-work
CRM-15821 Provide option to notify PCP owner
Coleman Watts [Wed, 21 Jan 2015 02:32:05 +0000 (21:32 -0500)]
CRM-15789 - Move htmlAttributes helper to utils class
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
Coleman Watts [Wed, 21 Jan 2015 02:31:11 +0000 (21:31 -0500)]
Docblock cleanups
Coleman Watts [Wed, 21 Jan 2015 02:08:16 +0000 (21:08 -0500)]
WordReplacement form improvement - auto-check new items and warn unsaved changes
colemanw [Wed, 21 Jan 2015 14:01:08 +0000 (09:01 -0500)]
Merge pull request #4989 from lcdservices/CRM-15851
CRM-15851 search builder fix for custom date fields
NileemaJadhav [Wed, 21 Jan 2015 08:05:54 +0000 (13:35 +0530)]
Modification for 4.6alpha4 upgrade
NileemaJadhav [Wed, 21 Jan 2015 06:55:12 +0000 (12:25 +0530)]
-- Moved upgrade changes to 4.6alpha4 release
NileemaJadhav [Wed, 21 Jan 2015 05:38:06 +0000 (11:08 +0530)]
Resolve conflict
NileemaJadhav [Fri, 16 Jan 2015 13:39:35 +0000 (19:09 +0530)]
CCRM-15821 Provide option to notify PCP owner
NileemaJadhav [Fri, 16 Jan 2015 13:38:35 +0000 (19:08 +0530)]
CRM-15821 Add PCP owner notifications message templates
----------------------------------------
* CRM-15821: Provide option to notify Personal Campaign Page "Owner" when someone donates via their page
https://issues.civicrm.org/jira/browse/CRM-15821
CiviCRM [Wed, 21 Jan 2015 11:19:16 +0000 (03:19 -0800)]
Update version to 4.6.alpha4
Tim Otten [Wed, 21 Jan 2015 09:17:13 +0000 (01:17 -0800)]
Merge pull request #4962 from totten/master-angular-ts
CRM-15832 - AngularJS - Aggregate and localize strings+partials
Tim Otten [Wed, 21 Jan 2015 08:38:09 +0000 (00:38 -0800)]
Allow caching of profile images
I considered refactoring CRM_Utils_System::download() to work with this, but
there are just so many things that need to be done differently or explained
-- it's just not worth it. Calling header() directly winds up being
clearer/simpler.
Tim Otten [Wed, 21 Jan 2015 06:59:16 +0000 (22:59 -0800)]
CRM-15832 - Fix domain used by core Angular apps
The old code was based on a misunderstanding. I thought that we had separate
translation domains for each Civi component. This is half true -- when the
translators work on them, there are separate .po files for each component.
However, when we distribute the final .mo files, the components are
aggregated together into one "civicrm.mo". Thus, at runtime, there is
really only one domain for the core app.
There are other domains the extensions, and there are a couple contexts
within the civicrm domain (eg for states/provinces), but that's irrelevant
to core's CiviCase and CiviMail UIs.
Tim Otten [Wed, 21 Jan 2015 06:42:09 +0000 (22:42 -0800)]
Merge pull request #4987 from totten/master-gitify
CRM-15840 - gitify - Fix for Civi v4.6+
Brian Shaughnessy [Wed, 21 Jan 2015 03:37:54 +0000 (22:37 -0500)]
CRM-15851 search builder fix for custom date fields
colemanw [Wed, 21 Jan 2015 02:43:15 +0000 (21:43 -0500)]
Merge pull request #4988 from lcdservices/CRM-15849
CRM-15849 add where clause for greetings
Brian Shaughnessy [Wed, 21 Jan 2015 02:28:29 +0000 (21:28 -0500)]
CRM-15849: fix translation string, comments
Coleman Watts [Wed, 21 Jan 2015 01:55:03 +0000 (20:55 -0500)]
WordReplacement.tpl cleanup
Coleman Watts [Wed, 21 Jan 2015 01:37:03 +0000 (20:37 -0500)]
CRM-15836 - Fix action buttons on wordReplacement screen
----------------------------------------
* CRM-15836: Inconsistent action button placement
https://issues.civicrm.org/jira/browse/CRM-15836
Brian Shaughnessy [Wed, 21 Jan 2015 01:20:09 +0000 (20:20 -0500)]
CRM-15849 add where clause for greetings
Coleman Watts [Wed, 21 Jan 2015 00:59:06 +0000 (19:59 -0500)]
Comment cleanup
Tim Otten [Tue, 20 Jan 2015 23:11:14 +0000 (15:11 -0800)]
CRM-15840 - gitify - Fix for Civi v4.6+
Dave Greenberg [Tue, 20 Jan 2015 20:29:01 +0000 (12:29 -0800)]
Merge pull request #4984 from davecivicrm/CRM-15819
CRM-15819 - separate permission for Message Templates editing.
NOTE: Test failure unrelated to this PR.
Coleman Watts [Tue, 20 Jan 2015 19:05:04 +0000 (14:05 -0500)]
CRM-15789 - Add helper function for button markup
----------------------------------------
* CRM-15789: Add icons to submit buttons
https://issues.civicrm.org/jira/browse/CRM-15789
colemanw [Tue, 20 Jan 2015 18:14:16 +0000 (13:14 -0500)]
Merge pull request #4983 from colemanw/CRM-15842
CRM-15842 - Improve custom field multiple record display options
Dave Greenberg [Tue, 20 Jan 2015 17:48:31 +0000 (09:48 -0800)]
CRM-15819 - separate permission for Message Templates editing.
----------------------------------------
* CRM-15819: create separate permission for editing message templates
https://issues.civicrm.org/jira/browse/CRM-15819
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
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
Monish Deb [Tue, 20 Jan 2015 09:55:34 +0000 (15:25 +0530)]
Merge pull request #4982 from monishdeb/4.5
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
Tim Otten [Tue, 20 Jan 2015 09:47:52 +0000 (01:47 -0800)]
CRM_Core_ManagedEntities - Improve docs.
Tim Otten [Tue, 20 Jan 2015 08:10:49 +0000 (00:10 -0800)]
Merge pull request #4981 from totten/master-cbf2
INFRA-132 - Additional cleanups following latest merge with drupal/coder 8.x-2.x.
Yashodha Chaku [Tue, 20 Jan 2015 08:04:47 +0000 (13:34 +0530)]
Merge pull request #4980 from xurizaemon/CRM-15844
CRM-15844
monishdeb [Tue, 20 Jan 2015 06:34:51 +0000 (12:04 +0530)]
CRM-15839 fix - Honoree profile doesn't show on Test contribution page
https://issues.civicrm.org/jira/browse/CRM-15839
Tim Otten [Tue, 20 Jan 2015 05:42:23 +0000 (21:42 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 05:33:26 +0000 (21:33 -0800)]
INFRA-132 - Misc
Chris Burgess [Tue, 20 Jan 2015 05:07:47 +0000 (18:07 +1300)]
CRM-15844
Replace missing bracket :(
Tim Otten [Tue, 20 Jan 2015 04:28:23 +0000 (20:28 -0800)]
INFRA-132 - Drupal.WhiteSpace.ScopeIndent.Incorrect
Tim Otten [Tue, 20 Jan 2015 04:03:41 +0000 (20:03 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:57:19 +0000 (19:57 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:27:12 +0000 (19:27 -0800)]
INFRA-132 - Misc
Tim Otten [Tue, 20 Jan 2015 03:20:37 +0000 (19:20 -0800)]
INFRA-132 - Drupal.Classes.ClassCreateInstance.ParenthesisMissing
Tim Otten [Tue, 20 Jan 2015 03:19:56 +0000 (19:19 -0800)]
INFRA-132 - Drupal.WhiteSpace.Comma.NoSpace
Tim Otten [Tue, 20 Jan 2015 03:19:00 +0000 (19:19 -0800)]
INFRA-132 - Squiz.WhiteSpace.SuperfluousWhitespace.EmptyLines
Tim Otten [Tue, 20 Jan 2015 03:15:33 +0000 (19:15 -0800)]
INFRA-132 - Squiz.Scope.MethodScope.Missing
Tim Otten [Tue, 20 Jan 2015 03:11:49 +0000 (19:11 -0800)]
INFRA-132 - Drupal.Array.Array.CommaLastItem
Tim Otten [Tue, 20 Jan 2015 02:46:18 +0000 (18:46 -0800)]
INFRA-132 - phpcbf Drupal.WhiteSpace.ScopeIndent.IncorrectExact
The automated cleanup sometimes screws with long, commented
code blocks and with statements that end "));", so I reviewed
the diff manually fixed any egregious examples.
Chris Burgess [Tue, 20 Jan 2015 01:56:36 +0000 (14:56 +1300)]
CRM-15844
Tim Otten [Tue, 20 Jan 2015 01:48:35 +0000 (17:48 -0800)]
INFRA-132 - Copyright header - Drupal.WhiteSpace.ScopeIndent.IncorrectExact
Tim Otten [Tue, 20 Jan 2015 01:20:28 +0000 (17:20 -0800)]
INFRA-132 - Drupal.Classes.ClassDeclaration
Tim Otten [Tue, 20 Jan 2015 01:45:34 +0000 (17:45 -0800)]
Merge pull request #4979 from xurizaemon/codingstandards-12
Coding standards cleanup sprint.
projects / civicrm-core.git / log