-
Notifications
You must be signed in to change notification settings - Fork 292
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Release/2.8.0 #3051
Open
Limraj
wants to merge
326
commits into
develop
Choose a base branch
from
release/2.8.0
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Release/2.8.0 #3051
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…6_Added_assignee_function_for_events
- added 'Event Assign enabled' in System Settings; - corrected migration V2_8_0__AddAssigneeColumnsToEvents, update views;
…aved_notification #2965 Fixed data source saved notification
- fixed "Cannot read properties of null (reading 'src')";
- Added Event Assign enabled button in new UI
- Corrected translations
…sign_Event_enabled_to_System_Settings_in_new_UI #2968 Added option 'Assign Event enabled' to System Settings in new UI
- reset assignee if disabled feature; - refactoring: EventManager, NotifyEventUtils, MiscDwr.acknowledgeAllPendingEvents, MiscDwr.silenceAll, EventService.ackEvents, EventService.silenceEvents, PendingEventService, HighestAlarmLevelService, HighestAlarmLevelServiceWithCache; - added methods in MangoEvent: unassignEvents, ackEvents, silenceEvents;
…n new UI: - corrected names: viewForceFullScreenEnabled, viewHideShortcutDisableFullScreenEnabled; - removed deprecated constructor in JsonSettingsMisc; - fixed labels for: eventPendingCacheEnabled, eventPendingLimit, webResourceUploadsPathł
…rlevel-synoptic-component #2969 Added absolute and percentage svg element and decimal configuration
…gnaling_the_Data_Source_that_has_a_problem # Conflicts: # webapp-resources/messages_de.properties # webapp-resources/messages_en.properties # webapp-resources/messages_es.properties # webapp-resources/messages_fi.properties # webapp-resources/messages_fr.properties # webapp-resources/messages_nl.properties # webapp-resources/messages_pt.properties # webapp-resources/messages_ru.properties # webapp-resources/messages_zh.properties
- Synoptic State now checks the condition when is enabled
…_message_redirecting_to_create_a_new_view #2961 Fixed visibility of message redirecting to create a new view:
…eys_in_other_system_settings_save_window_in_new_UI2 #2972 Fixed translation keys in 'other' system settings save window i…
- corrected en.json;
- Corrected config log4j2.xml for script: ScriptExecutor, ContextualizedScriptRT; - Added new event type DataSourcePointEventType; - Added migration V2_8_0_1__AddTypeRef3ColumnToEvents;
…function_for_events Feature/#2746 added assignee function for events
Added: - Custom text on top inside mainHeader, next to app logo - input area for text to be displayed in main header next to logo - input area for css style of that aforementioned custom text
- Added custom information in system settings for new UI - Added prefix for custom information - Added css styles for custiom information se they are displayed properly - Moved stylesheet to common custom stylesheet instead of special one onyl for custom information - Added migration class V2_8_0_2_AddCustomInformationColumnsToSystemSettings.java
…_that_has_a_problem
feature/#2983_Prevent_XSS_for_URLs
- corrected redirect for error 500 code;
- added serializer: XssStringSerializer; - defined ObjectMapper in xml config(springDispatcher-servlet.xml) and ApplicationBeans.getObjectMapper then use this method when new ObjectMapper; - corrected websocket url in index.js, websocketStore.js, dataPointEdit.jsp; - corrected visible escape text content in EventList.vue; - fixed HttpSenderRT for POST with JSON; - fixed: AuthenticationAPI, ConfigAPI, EventDetectorAPI, EventHandlerAPI, PointPropertiesAPI, PointValueAPI, SystemSettingsAPI, UtilsAPI, ViewAPI, ViewComponentAPI, ViewHierarchyAPI, PointHierarchyController, DataPointsBaseOnNameFilter;
- fixed cssEditor in systemSettings.jsp - replace \n\r to 
 in XssCssStyleSerializer/XssStringSerializer, use innerHTML, added function updateCodeTextEscaped in highlight.jsp, created class XssUtils; - refactoring method: FileUtil.compactFiles; - added methods: DataPointApiService.getDataPointByXid, DataPointApiService.getDataPointByXid, EmportDwr.exportDataPointBy; - deprecated methods/class: DataPointApiService.getConfigurationByXid, EmportDwr.exportJSON, TranslateAPI; - Refactoring API, change return type from String to Map: CustomCssAPI, DataPointAPI, MailingListAPI, ScriptsAPI, SystemSettingsAPI, ViewAPI, AmChartValuesAPI, SynopticPanelAPI, ChangeDataAPI, GetHistoryChangesAPI, ReadDataBaseXIdAPI; - removed unused and deprecated class EventsServiceWebSocket; - corrected translation 'Event Pending Limit' and 'Enabled Event Pending Cache'; - upgrade Jackson lib from 2.8.2 to 2.17.2: jackson-annotations-2.17.2.jar, jackson-core-2.17.2.jar, jackson-databind-2.17.2.jar;
Added: - JUnit 4 test for XssUtils.java class - Logger for org.scada_lts.web.security in log4j2.xml - Minor changes in XssFilter.java
- fixed Synoptic Panel; (XssSynopticPanelSerializer) - added validate svg from Synoptic Panel; - fixed double websocket initialization; - added method ValidationUtils.validSvg;
…event_XSS_for_REST_API_by_escape_String_content2 # Conflicts: # src/com/serotonin/mango/vo/report/SeriesIdentifier.java
- Using class XssProtectUtils (use Spring) instead of Security class from dwr; _ Rename classes: XssProtectHtmlUtils to XssProtectUtils, XssUtils to XssValidatorUtils; - Changed private on public no args constructor for class XssProtectUtils; - Added Data Point information to console log in ScriptExecutor.convertContext;
- Created css class formLongFieldSizing; - Added attribute title and css class formLongFieldSizing in pointProperties.jsp for name fields; - Set width 60%/40% in dataPointEdit.jsp; - Use c:out in pointProperties.jsp for name and description fields;
- Set max-width is 650px
- Fixed XSS Event List on new UI;
- Removed unuse import in PointProperties\index.vue; - Added @XssProtect annotation to fields deviceName, datasourceName, dataSourceXid in DataPointJson, to fields oid, binary0Value in SnmpPointLocatorJson, to fields updateCronPattern in MetaPointLocatorJson, to fields charset in ModbusIpPointLocatorJson;
- Reload the page;
…T_API_by_escape_String_content2 #2985 Prevent XSS for REST API by escape String content:
…oint_properties_page_has_a_limited_visible_length #3036 point name in point properties page has a limited visible length
- removed deprecated methods: DataPointService.save(User user, String value, String xid, int pointValueType); setPoint(User user, DataPointVO point, String valueStr) saveAPI(User user, String value, String xid) - moved TestUtils to utils package;
- Refactoring ValidationUtils.isCyclicDependency
…n_Cyclic_dependency_for_Meta_Data_Point #3055 Added validation Cyclic dependency for Meta Data Point:
…ces list view Added details for BACnet data points in description field on data source list view
Added option to set modbus data point slave id to range from 0 to 255 instead of range from 1 to 255
…_of_list_of_points_in_BacNet_source_in_data_sources_list_view #3058 Improve content of list of points in BacNet source in data sources list view
…profiles view - Added escaping for data source and data point names in users view
…ave_id_to_be_zero #2799 Allow modbus tcp slave id to be zero
…d_data_source_names_are_not_escaped_in_user_profiles_view Fixed data point and data source names are not escaped in user profiles view #3063
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.