713 Commits

Author SHA1 Message Date
Igor Kulikov
a1e8ed8ff4 Merge branch 'master' into develop/2.3 2019-01-30 19:28:26 +02:00
Igor Kulikov
136526cd80 Merge conflicts 2019-01-30 19:26:00 +02:00
Igor Kulikov
d50db7a3dd
Merge pull request #1409 from andyesys/master
Add German UI translation
2019-01-30 19:11:54 +02:00
Igor Kulikov
755d0f56c1 Merge branch 'master' into develop/2.3 2019-01-30 17:09:38 +02:00
Igor Kulikov
908cd0ef64 Improve device/asset/entityView type autocomplete. 2019-01-30 17:03:32 +02:00
Maksym Dudnik
43b0ac6b5b Added polygon functional for OpenStreet, Tencent and Google Latest Value Maps 2019-01-30 11:21:07 +02:00
Igor Kulikov
d4208ec2e7 Merge branch 'master' into develop/2.3 2019-01-28 13:53:35 +02:00
Valerii Sosliuk
94827253e4 device type expression in mqtt extension config is not required 7781297 (#1402)
* Fix NPE in netty-mqtt client on puback

* Fix gateway mqtt extension configuration - filter is not required

* device type expression in mqtt extension config is not required
2019-01-25 12:45:41 +02:00
andyesys
00c733f73e Added German translation. 2019-01-21 16:04:31 +01:00
Igor Kulikov
4893200a1e Merge branch 'master' into develop/2.3 2019-01-17 11:57:06 +02:00
Valerii Sosliuk
5aced98ce3 Fix NPE in Netty-mqtt client (#1398)
* Fix NPE in netty-mqtt client on puback

* Fix gateway mqtt extension configuration - filter is not required
2019-01-16 17:17:50 +02:00
aestal
64d3006cb9 Update Spanish translation (#1380)
* Icon section

* Widget-config section

* Widgets-bundle section

* Widget section

* User section

* Tenant section

* Rulenode section

* Rulechain section

* login section

* grid section

* extension section

* event section

* entity section

* device section

* dashboard section

* customer section

* common section

* audit-log section

* attribute section

* asset section

* alarm section

* admin section

* action section

* access section

* More improvements

* Added missing messages

* Missing messages translation

* Entity View Spanish translation
2019-01-11 22:56:06 +02:00
Maksym Dudnik
49d623391e map-widget2_and_subscription_file_update 2019-01-10 11:14:30 +02:00
Maksym Dudnik
0a950a4916 added_initBounds_param_to_prevent_fit_to_bounds_on_every_update 2019-01-10 11:14:30 +02:00
Maksym Dudnik
61fd0867e2 map-widget2_and_subscription_file_update 2019-01-04 11:52:56 +02:00
Maksym Dudnik
2d36e730d3 added_initBounds_param_to_prevent_fit_to_bounds_on_every_update 2019-01-03 10:12:29 +02:00
dvk2018
9590c37720 Add 'Reconnect' and 'RTU over TCP' options to TCP Modbus extension configuration. 2018-12-25 15:09:16 +02:00
dvk2018
8e590a5294 Add missing commas in JSON. 2018-12-25 15:08:02 +02:00
dvk2018
adde20bd4f Update russian locale. 2018-12-25 15:08:02 +02:00
Igor Kulikov
1d1fd7711f Implemented permissions check using Access Control Service. 2018-12-05 15:35:46 +02:00
Andrew Shvayka
ace40c5236 Versions set to 2.3.0-SNAPSHOT 2018-12-04 15:16:14 +02:00
Igor Kulikov
0f0d521d74 Version set to 2.2.1-SNAPSHOT 2018-11-29 18:38:18 +02:00
Igor Kulikov
cdf0b0484b Version set to 2.2.0 2018-11-29 12:27:24 +02:00
Igor Kulikov
5f2bfd93de Fix deprecated maps settings. 2018-11-27 13:27:51 +02:00
Igor Kulikov
693b58478b Hide fixed table header in entity attributes table when in widget selection mode. 2018-11-26 13:15:11 +02:00
Igor Kulikov
0725c8e916
Merge pull request #1272 from ascentio-tech/create_package-lock
Updating npm version to create package-lock.json
2018-11-23 13:42:00 +02:00
Igor Kulikov
6801c34c90 Add datasource as variable to dsData for map widget functions. 2018-11-23 13:22:04 +02:00
Igor Kulikov
63f73c9d1e Add original entity field to datasource. 2018-11-23 12:54:16 +02:00
Igor Kulikov
d7a23f4048
Merge pull request #1263 from Terny22/improvement/map-widgets
Added label/tooltip-function settings to Map-widgets
2018-11-23 12:32:31 +02:00
Gonzalo Matheu
b710bc19ba Update npm version to 6.4.1 and including generated package-lock.json 2018-11-21 15:09:59 -03:00
Gonzalo Matheu
b11c38bd2d Correct mispelled flot.curvedlines (was flow-curvedlines) dependency on ui/package.json 2018-11-21 13:47:20 -03:00
Sergey Tarnavskiy
0fa9285029 fixed label/tooltip updating 2018-11-21 17:58:42 +02:00
Igor Kulikov
834a9c9c25 Fixed header support. 2018-11-20 16:26:30 +02:00
Sergey Tarnavskiy
5b0784f252 Added label/tooltip-functions 2018-11-20 13:58:22 +02:00
Igor Kulikov
0d01071df5
Update login.controller.js 2018-11-15 20:42:52 +02:00
Igor Kulikov
4f7ce892ec
Update login.routes.js 2018-11-15 20:42:10 +02:00
mp-loki
74bf131930 Redirect to a previous page after login 2018-11-15 16:40:26 +02:00
mp-loki
5f16cbe23c Merge remote-tracking branch 'upstream/master' 2018-11-15 16:40:09 +02:00
Igor Kulikov
9392395bd4 Log WS Errors to console. 2018-11-15 12:14:16 +02:00
Igor Kulikov
ad8ef894e4 Don't show WS Error 1006 on UI 2018-11-14 18:10:20 +02:00
Igor Kulikov
0b664e9d93 Improve WS errors handling. 2018-11-14 11:09:36 +02:00
Igor Kulikov
289a5f5feb Handle WS errors. 2018-11-13 14:45:06 +02:00
mp-loki
f026a30171 Redirect to a previous page after login 2018-11-09 23:24:35 +02:00
mp-loki
75bb8cc6b2 Redirect to a previous page after login 2018-11-09 22:58:11 +02:00
Igor Kulikov
7180ff6a83 Freeze split.js version. 2018-11-08 20:49:21 +02:00
Igor Kulikov
f6fccebd52 UI fixes 2018-10-30 15:35:42 +02:00
Igor Kulikov
fd251f0d9a Fix Turkish localization. Update angular material version to 1.1.9. Fix 0 digital gauges value when no animation. 2018-10-29 18:28:15 +02:00
Igor Kulikov
e887c125de
Merge pull request #1187 from jktu2870/bugs
Some corrections for UI
2018-10-26 13:09:05 +03:00
Andrew Shvayka
0ede9eee82 Few minor improvements 2018-10-26 12:07:15 +03:00
oleg
9c414a9511 UI. Outsource CSS should be added before custom CSS 2018-10-24 13:56:27 +03:00