Tim Otten [Tue, 6 Jan 2015 00:41:33 +0000 (16:41 -0800)]
CRM-15578 - civicrm/ajax/attachment - Fix for attachments when debugging is disabled.
The isAJAX() XSS check doesn't work correctly with the Angular file-upload
client. This wasn't previously observed because most development was done in
debug mode.
Remove the isAJAX() XSS check. Instead, protect against XSS with a secure
token.
Tim Otten [Tue, 6 Jan 2015 00:03:24 +0000 (16:03 -0800)]
js/angular-crmCaseType.js - Fix regression in promise
This line was written when crmApi() return jQuery-style promises. It returns
Angular-style promises.
Tim Otten [Mon, 5 Jan 2015 21:53:42 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crm-util.js - Ignore warning about eval
The eval call uses data generated by an implicitly trusted service -- the
local JSON encoder.
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crmMailing.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crmCaseType.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:53:32 +0000 (13:53 -0800)]
INFRA-132 - js/angular-crm-ui.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/view/crm.profile-selector.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/view/crm.designer.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/model/crm.uf.js - Cleanup empty checks to satisfy jshint
Tim Otten [Mon, 5 Jan 2015 21:45:11 +0000 (13:45 -0800)]
INFRA-132 - js/crm.backbone.js - Cleanup empty checks to satisfy jshint
Tim Otten [Sat, 3 Jan 2015 22:59:12 +0000 (14:59 -0800)]
INFRA-132 - Fix jshint warnings in js/*.js
Tim Otten [Sat, 3 Jan 2015 22:58:48 +0000 (14:58 -0800)]
INFRA-132 - Fix jshint warnings in js/jquery/*.js
Tim Otten [Sat, 3 Jan 2015 22:58:25 +0000 (14:58 -0800)]
INFRA-132 - Fix jshint warnings in Backbone-based code
Tim Otten [Sat, 3 Jan 2015 22:57:44 +0000 (14:57 -0800)]
INFRA-132 - Fix jshint warnings in js/angular*.js
colemanw [Mon, 5 Jan 2015 20:18:20 +0000 (15:18 -0500)]
Merge pull request #4845 from colemanw/CRM-15409
CRM-15409 - Fix handling of traditional links in popups
Coleman Watts [Mon, 5 Jan 2015 18:40:25 +0000 (13:40 -0500)]
CRM-15409 - Fix handling of traditional links in popups
kurund [Mon, 5 Jan 2015 17:58:47 +0000 (23:28 +0530)]
Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-01-05-23-28-33
colemanw [Mon, 5 Jan 2015 17:49:03 +0000 (12:49 -0500)]
Merge pull request #4836 from colemanw/edit
Support editable multi-value custom data
Kurund Jalmi [Mon, 5 Jan 2015 17:35:49 +0000 (23:05 +0530)]
Merge pull request #4839 from rohankatkar/Webtests-4.6
Webtests and CRM test fix
Yashodha Chaku [Mon, 5 Jan 2015 11:04:22 +0000 (16:34 +0530)]
Merge pull request #4830 from PalanteJon/CRM-15774
CRM-15774 - Core - Call BAO not DAO on contact create via profile
Yashodha Chaku [Mon, 5 Jan 2015 09:37:20 +0000 (15:07 +0530)]
Merge pull request #4837 from eileenmcnaughton/CRM-15779
CRM-15779 remove duplicate code block
Yashodha Chaku [Mon, 5 Jan 2015 08:54:55 +0000 (14:24 +0530)]
Merge pull request #4841 from civicrm/CRM-14461
CRM-14461: note fields not handled properly for components during export
Yashodha Chaku [Mon, 5 Jan 2015 08:53:51 +0000 (14:23 +0530)]
Merge pull request #4840 from eileenmcnaughton/tidy-ups
minor tidyups
Yashodha Chaku [Mon, 5 Jan 2015 07:13:52 +0000 (12:43 +0530)]
Merge pull request #4832 from williamtheaker/CRM-14749
CRM-14749 Add insert token to Address Display Format
yashodha [Mon, 5 Jan 2015 06:25:02 +0000 (11:55 +0530)]
CRM-14461: note fields not handled properly for components during export
----------------------------------------
* CRM-14461: Participant notes incomplete when exporting participants
https://issues.civicrm.org/jira/browse/CRM-14461
Eileen McNaughton [Mon, 5 Jan 2015 06:07:25 +0000 (19:07 +1300)]
minor tidyups
Rohan Katkar [Mon, 5 Jan 2015 06:04:28 +0000 (11:34 +0530)]
Webtests and CRM test fix
Eileen McNaughton [Mon, 5 Jan 2015 03:23:02 +0000 (16:23 +1300)]
CRM-15779 remove duplicate code block
Coleman Watts [Mon, 5 Jan 2015 03:05:40 +0000 (22:05 -0500)]
CRM-15759 - Improve crmEditable api validation and error handling
Coleman Watts [Mon, 5 Jan 2015 03:04:09 +0000 (22:04 -0500)]
CRM-15759 - Support editable multi-value custom data
Coleman Watts [Mon, 5 Jan 2015 03:00:17 +0000 (22:00 -0500)]
Fix button markup
Eileen McNaughton [Mon, 5 Jan 2015 02:07:21 +0000 (15:07 +1300)]
Merge pull request #4834 from eileenmcnaughton/tidy-up
remove a bunch of unused variable assignments
Eileen McNaughton [Mon, 5 Jan 2015 01:52:45 +0000 (14:52 +1300)]
a couple of comment block fixes
Eileen McNaughton [Mon, 5 Jan 2015 01:14:27 +0000 (14:14 +1300)]
remove a bunch of unused variable assignments
Tim Otten [Sat, 3 Jan 2015 23:03:01 +0000 (15:03 -0800)]
Merge pull request #3857 from totten/master-donquixote
Docblocks and misc cleanup
Tim Otten [Sat, 16 Aug 2014 00:21:19 +0000 (17:21 -0700)]
CRM_Contribute_Page_ContributionPage - Campaign IDs
Fix for case where count()==1. Simplify.
Andreas Hennings [Tue, 11 Feb 2014 22:35:28 +0000 (23:35 +0100)]
CRM_Contribute_Page_ContributionPage: Robust handling of campaign ids.
Andreas Hennings [Tue, 11 Feb 2014 19:41:22 +0000 (20:41 +0100)]
Remove unused.
Andreas Hennings [Tue, 11 Feb 2014 19:35:41 +0000 (20:35 +0100)]
Explicit checks for external symbols.
Andreas Hennings [Tue, 11 Feb 2014 19:35:23 +0000 (20:35 +0100)]
Explicit return NULL.
Andreas Hennings [Tue, 11 Feb 2014 19:35:08 +0000 (20:35 +0100)]
Indentation, whitespace and wrapping.
Andreas Hennings [Tue, 11 Feb 2014 19:30:54 +0000 (20:30 +0100)]
More @todo
Andreas Hennings [Tue, 11 Feb 2014 19:30:20 +0000 (20:30 +0100)]
Docblock improvements
Andreas Hennings [Tue, 11 Feb 2014 18:21:19 +0000 (19:21 +0100)]
Add type conversion to constants, because IDE cannot know for sure they are integer. This might be controversial.
Andreas Hennings [Tue, 11 Feb 2014 18:20:33 +0000 (19:20 +0100)]
More @todo items, possible bugs.
Andreas Hennings [Tue, 11 Feb 2014 18:19:57 +0000 (19:19 +0100)]
More docblock stuff.
Andreas Hennings [Tue, 11 Feb 2014 17:02:01 +0000 (18:02 +0100)]
Add @todo tags in CRM_Utils_Request and CRM_Utils_Type.
Andreas Hennings [Tue, 11 Feb 2014 16:58:22 +0000 (17:58 +0100)]
More docblock improvements.
Tim Otten [Sat, 3 Jan 2015 17:53:03 +0000 (09:53 -0800)]
Merge branch 'giant-rabbit-angular-tests'
Tim Otten [Sat, 3 Jan 2015 17:46:00 +0000 (09:46 -0800)]
crmApp, crmUtil - Tighten scope of crmApp. Move services to crmUtil. Avoid cyclic dependencies.
All services, routes, controllers, and directives should live in specific
Angular modules. When it comes time to display a complete web page, these
modules are aggregated to form crmApp. crmApp is a thin piece of glue whose
sole purpose is aggregation.
Tim Otten [Sat, 3 Jan 2015 17:41:04 +0000 (09:41 -0800)]
crmUtil - Alphabetize services
Tim Otten [Sat, 3 Jan 2015 17:25:25 +0000 (09:25 -0800)]
CRM_Core_Page_Angular - Fix badly merged list of modules.
Also: Alphabetize list so that future issues with modules are easier to recognize.
Tim Otten [Sat, 3 Jan 2015 17:23:58 +0000 (09:23 -0800)]
Merge branch 'angular-tests' of https://github.com/giant-rabbit/civicrm-core into giant-rabbit-angular-tests
williamtheaker [Sat, 3 Jan 2015 06:29:50 +0000 (22:29 -0800)]
CRM-14749 Add insert token to Address Display Format
colemanw [Sat, 3 Jan 2015 04:15:04 +0000 (23:15 -0500)]
Merge pull request #4827 from colemanw/CRM-15759
CRM-15759 - Extend in-place editing to more places
Coleman Watts [Sat, 3 Jan 2015 02:28:12 +0000 (21:28 -0500)]
CRM-15759 - Fix crmEditable textarea handling
Coleman Watts [Sat, 3 Jan 2015 02:14:42 +0000 (21:14 -0500)]
CRM-15759 - Apply crmEditable behavior based on events instead of a template
Jon goldberg [Fri, 2 Jan 2015 22:31:59 +0000 (17:31 -0500)]
CRM-15774 - Core - Call BAO not DAO on contact create via profile
Coleman Watts [Fri, 2 Jan 2015 18:46:57 +0000 (13:46 -0500)]
crmEditable code cleanup
Coleman Watts [Fri, 2 Jan 2015 15:26:08 +0000 (10:26 -0500)]
CRM-15759 - Extend in-place editing to more places
Coleman Watts [Fri, 2 Jan 2015 15:25:02 +0000 (10:25 -0500)]
CRM-15759 - support empty select option in crmEditable
Coleman Watts [Fri, 2 Jan 2015 15:22:47 +0000 (10:22 -0500)]
Remove unused code
Coleman Watts [Fri, 2 Jan 2015 01:34:08 +0000 (20:34 -0500)]
Fix membershipType options lookup and display
Coleman Watts [Thu, 1 Jan 2015 18:28:32 +0000 (13:28 -0500)]
CRM-15759 - Improve support for crmEditable select options
Coleman Watts [Thu, 1 Jan 2015 18:26:20 +0000 (13:26 -0500)]
Fix incorrect participantStatusClass options lookup
colemanw [Fri, 2 Jan 2015 21:01:25 +0000 (16:01 -0500)]
Merge pull request #4828 from colemanw/CRM-15773
CRM-15773 - Use the term Order instead of Weight consistently
Coleman Watts [Fri, 2 Jan 2015 19:29:26 +0000 (14:29 -0500)]
CRM-15773 - Use the term Order instead of Weight consistently
Coleman Watts [Fri, 2 Jan 2015 18:42:46 +0000 (13:42 -0500)]
Warn of deprecated fn $.crmAccordions
This function has been deprecated and will be removed in the future.
Yashodha Chaku [Fri, 2 Jan 2015 15:28:06 +0000 (20:58 +0530)]
Merge pull request #4826 from monishdeb/CRM-15740
CRM-15740 QA fix
monishdeb [Fri, 2 Jan 2015 14:17:04 +0000 (19:47 +0530)]
CRM-15740 QA fix
----------------------------------------
* CRM-15740: Really long URLs cause SQL issue in a trackable mass mail
https://issues.civicrm.org/jira/browse/CRM-15740
Monish Deb [Fri, 2 Jan 2015 13:50:43 +0000 (19:20 +0530)]
Merge pull request #4823 from jitendrapurohit/webtestfixes
webtest fixes 4.6
jitendrapurohit [Fri, 2 Jan 2015 12:34:12 +0000 (18:04 +0530)]
webtest fixes 4.6
Kurund Jalmi [Fri, 2 Jan 2015 12:27:58 +0000 (17:57 +0530)]
Merge pull request #4822 from kurund/indentation-fixes
indentation fixes
kurund [Fri, 2 Jan 2015 11:36:54 +0000 (17:06 +0530)]
indentation fixes
Yashodha Chaku [Fri, 2 Jan 2015 10:45:12 +0000 (16:15 +0530)]
Merge pull request #4817 from williamtheaker/patch-2
Replace wizard-bar radical with heavy checkmark
Kurund Jalmi [Fri, 2 Jan 2015 10:38:21 +0000 (16:08 +0530)]
Merge pull request #4820 from kurund/CRM-15705
CRM-15705
Yashodha Chaku [Fri, 2 Jan 2015 10:18:44 +0000 (15:48 +0530)]
Merge pull request #4821 from jitendrapurohit/webtestcorebugfix
Notification for Updation not shown after Save button is clicked on Mana...
jitendrapurohit [Fri, 2 Jan 2015 09:00:30 +0000 (14:30 +0530)]
Notification for Updation not shown after Save button is clicked on Manage Event Tab for PCP
Yashodha Chaku [Fri, 2 Jan 2015 05:35:06 +0000 (11:05 +0530)]
Merge pull request #4818 from pratikshad/CRM-15770
CRM-15770 fixes issue of empty date processing into membership page for ...
pratikshad [Fri, 2 Jan 2015 04:27:35 +0000 (09:57 +0530)]
CRM-15770 fixes issue of empty date processing into membership page for offline
----------------------------------------
* CRM-15770: if $dateString is 'null' make no attempt to format it
https://issues.civicrm.org/jira/browse/CRM-15770
William Theaker [Fri, 2 Jan 2015 03:42:57 +0000 (19:42 -0800)]
Replace wizard-bar radical with checkmark
Tim Otten [Thu, 1 Jan 2015 22:22:22 +0000 (14:22 -0800)]
Merge pull request #4684 from eileenmcnaughton/CRM-15683-masger
CRM-15678 hookable invalid page handling
Tim Otten [Thu, 1 Jan 2015 18:24:57 +0000 (10:24 -0800)]
CRM-15683 - CRM_Core_Error::handleUnhandledException - Log double exceptions
Tim Otten [Thu, 1 Jan 2015 18:21:43 +0000 (10:21 -0800)]
CRM-15683 - CRM_Core_Invoke - Cleanup comments. Remove duplicate code.
The catch{} block in _invoke() duplicates the code now in LegacyErrorHandler.
Tim Otten [Thu, 11 Dec 2014 00:10:00 +0000 (16:10 -0800)]
CRM-15683 - Add UnhandledExceptionEvent. Fixup LegacyErrorHandler.
Eileen McNaughton [Tue, 9 Dec 2014 00:25:07 +0000 (13:25 +1300)]
CRM-15683 Tim's proposed changes
Eileen McNaughton [Mon, 8 Dec 2014 23:59:13 +0000 (12:59 +1300)]
remove handling for legacy status bounce as not found anywhere in code
Eileen McNaughton [Sun, 7 Dec 2014 22:20:33 +0000 (11:20 +1300)]
CRM-15678 hookable invalid page handling
Conflicts:
CRM/Contribute/Form/ContributionBase.php
Monish Deb [Thu, 1 Jan 2015 17:53:20 +0000 (23:23 +0530)]
Merge pull request #4815 from rohankatkar/Webtests
Webtests Fixes
colemanw [Thu, 1 Jan 2015 15:44:44 +0000 (10:44 -0500)]
Merge pull request #4812 from colemanw/CRM-15495
CRM-15495 - Improve entityRef contact_type filter
Rohan Katkar [Thu, 1 Jan 2015 13:27:30 +0000 (18:57 +0530)]
Webtests Fixes
Monish Deb [Thu, 1 Jan 2015 12:43:51 +0000 (18:13 +0530)]
Merge pull request #4813 from rohankatkar/CRM_15764
CRM- 15764
Chris Burgess [Mon, 29 Dec 2014 20:44:18 +0000 (09:44 +1300)]
CRM-15764. Remove bogus opendir() call.
opendir($cmsIncludePath) appears to have been used as is_dir(), not required since we check file_exists("$cmsIncludePath/file.xxx") and that indicates that the directory exists.
Chris Burgess [Sun, 28 Dec 2014 18:33:42 +0000 (07:33 +1300)]
Merge fix - CRM-15764
Coleman Watts [Thu, 1 Jan 2015 03:54:43 +0000 (22:54 -0500)]
Improve api.getoptions to return nested groups/tags
Coleman Watts [Wed, 31 Dec 2014 21:45:33 +0000 (16:45 -0500)]
CRM-15495 - Improve entityRef contact_type filter
Tim Otten [Wed, 31 Dec 2014 17:53:14 +0000 (09:53 -0800)]
Merge pull request #4809 from totten/master-cs2
Cleanup visibility, final newlines, and CONST
Yashodha Chaku [Wed, 31 Dec 2014 13:19:12 +0000 (18:49 +0530)]
Merge pull request #4804 from atif-shaikh/CRM-15767
CRM-15767 - Back Office "Submit Credit Card Contribution" are not being ...
Monish Deb [Wed, 31 Dec 2014 09:22:17 +0000 (14:52 +0530)]
Merge pull request #4811 from jitendrapurohit/CRM-15733
CRM-15733 fix Contining a saved mailing doesn't load included or exclude...
jitendrapurohit [Wed, 31 Dec 2014 07:30:46 +0000 (13:00 +0530)]
CRM-15733 fix Contining a saved mailing doesn't load included or excluded previous mailing recipients