Kurund Jalmi [Tue, 27 Jan 2015 16:55:31 +0000 (22:25 +0530)]
Merge pull request #5015 from rohankatkar/CRM-15853
CRM-15853
colemanw [Tue, 27 Jan 2015 15:08:58 +0000 (10:08 -0500)]
Merge pull request #5016 from colemanw/APIExplorer
APIExplorer - lint js
Coleman Watts [Tue, 27 Jan 2015 14:23:58 +0000 (09:23 -0500)]
APIExplorer - lint js
Web Access [Tue, 27 Jan 2015 14:13:17 +0000 (19:43 +0530)]
CRM-15853
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
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.
Tim Otten [Tue, 27 Jan 2015 07:52:15 +0000 (07:52 +0000)]
bin/setup.sh - Reenable bower
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
Tim Otten [Tue, 27 Jan 2015 07:25:46 +0000 (23:25 -0800)]
karma - Specify output for JUnit XML (when used)
Tim Otten [Tue, 27 Jan 2015 05:53:48 +0000 (21:53 -0800)]
INFRA-132 - Misc js
Tim Otten [Tue, 27 Jan 2015 05:46:43 +0000 (21:46 -0800)]
INFRA-132 - Add .jshintrc. Cleanup tests/karama/unit.
Eileen McNaughton [Thu, 8 Jan 2015 11:38:53 +0000 (00:38 +1300)]
remove unnecessary variable
Eileen McNaughton [Tue, 27 Jan 2015 04:59:17 +0000 (17:59 +1300)]
additional test and test tidy-ups
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
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
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
Eileen McNaughton [Tue, 27 Jan 2015 02:03:10 +0000 (15:03 +1300)]
stylistic repair
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
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
Eileen McNaughton [Tue, 27 Jan 2015 01:00:01 +0000 (14:00 +1300)]
fix to previous - don't assume trxn_id required
Eileen McNaughton [Tue, 27 Jan 2015 00:34:49 +0000 (13:34 +1300)]
allow dummy to take mulitple trxn_ids
Eileen McNaughton [Tue, 27 Jan 2015 00:22:53 +0000 (13:22 +1300)]
add flush for cached payment processors
Eileen McNaughton [Tue, 27 Jan 2015 00:21:28 +0000 (13:21 +1300)]
comment fixes
Eileen McNaughton [Mon, 26 Jan 2015 23:59:28 +0000 (12:59 +1300)]
style fixes
Eileen McNaughton [Mon, 26 Jan 2015 23:18:54 +0000 (12:18 +1300)]
rename contribution type to financial type
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
Eileen McNaughton [Mon, 26 Jan 2015 23:03:42 +0000 (12:03 +1300)]
minor tidyups
Eileen McNaughton [Thu, 8 Jan 2015 11:19:27 +0000 (00:19 +1300)]
minor tidyups
Eileen McNaughton [Thu, 8 Jan 2015 04:34:57 +0000 (17:34 +1300)]
CRM-15798 membership_type api tidy-up - preparatory to test fixes
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
Coleman Watts [Mon, 26 Jan 2015 16:38:59 +0000 (11:38 -0500)]
Merge branch 4.5 into master
Coleman Watts [Mon, 26 Jan 2015 16:36:44 +0000 (11:36 -0500)]
APIExplorer.js comment cleanup
colemanw [Mon, 26 Jan 2015 16:21:17 +0000 (11:21 -0500)]
Merge pull request #5002 from colemanw/explorer
API explorer improvements
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
Coleman Watts [Mon, 26 Jan 2015 14:01:12 +0000 (09:01 -0500)]
CRM-15872 - Fix change activity status on contact case tab
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
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 [Sun, 25 Jan 2015 22:15:11 +0000 (17:15 -0500)]
API explorer js style cleanup
Coleman Watts [Sun, 25 Jan 2015 20:31:21 +0000 (15:31 -0500)]
Fix api explorer chaining to use getactions
Coleman Watts [Sun, 25 Jan 2015 19:47:01 +0000 (14:47 -0500)]
CRM-15789 - Add icon to api explorer button
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
projects / civicrm-core.git / log