dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,036 Commits 106 Branches 71 Tags
Commit Graph

14036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YevhenBondarenko
22aaadff85 jdk 17 for windows 2023-05-31 17:26:03 +02:00
Andrew Shvayka
2d0ab04745
Merge pull request #8460 from YevhenBondarenko/feature/java-17 
migrate to java 17
 2023-05-31 18:19:08 +03:00
YevhenBondarenko
c29e0dbf75 Merge branch 'develop/3.6' of github.com:thingsboard/thingsboard into feature/java-17 2023-05-29 14:48:45 +02:00
Andrii Shvaika
6b6e27bd60 Maven dependency fix 2023-05-29 14:07:02 +03:00
Andrii Shvaika
da90c21b6c Merge with develop/3.5.2. Version set to 3.6.0-SNAPSHOT 2023-05-29 13:45:17 +03:00
Andrii Shvaika
2a1259570b Temporary version set to 3.5.2-SNAPSHOT to merge 2023-05-29 13:43:10 +03:00
Igor Kulikov
5c6651fca1 Merge with master 2023-05-26 17:54:26 +03:00
Igor Kulikov
79ced08ad6
Merge pull request #8641 from vvlladd28/bug/timewindow/incorrect-start-value 
Fixed setting time window initialization being called twice
 2023-05-26 17:12:06 +03:00
Vladyslav_Prykhodko
fdd6ebcb2c UI: Revert unnessery changes and change function order 2023-05-26 17:00:38 +03:00
Igor Kulikov
dbb5a8cc8b UI: Improve custom dialog error diagnostics. Improve widget error message formatting. 2023-05-26 16:45:29 +03:00
Igor Kulikov
2f7b1730d5 Merge with master 2023-05-26 13:48:28 +03:00
Igor Kulikov
6ccc21632d Add upgrade script to fix dashboard templates after Angular migration to ver.15 2023-05-26 13:39:15 +03:00
Vladyslav_Prykhodko
ee91cc3033 UI: Refactoring code after review 2023-05-26 12:50:52 +03:00
Vladyslav_Prykhodko
fa8decd293 UI: Fixed timewindows writeValue is being called twice, first time with a phantom null value 2023-05-25 17:38:26 +03:00
Andrii Shvaika
193b37e292 Merge with master 2023-05-24 18:40:57 +03:00
Andrew Shvayka
d33d968aa9
Merge pull request #8605 from deaflynx/fix/prod-1975/edit-json-validation 
Fixed JSON value validations when editing in dialog
 2023-05-24 18:00:27 +03:00
Andrew Shvayka
1ccd7f9fd5
Merge pull request #8533 from thingsboard/feature/notification-configs-vc 
Version control for notification configs
 2023-05-24 17:29:16 +03:00
Andrew Shvayka
151231d11d
Merge pull request #8606 from Seraphym-Tuhai/ui-tests-device-assign 
[3.5.2] UI smoke tests on assign devices
 2023-05-24 17:28:49 +03:00
Andrii Shvaika
138c0e4f8f Simplify upgrage procedure 2023-05-24 17:05:23 +03:00
Andrii Shvaika
8311017b92 Fixed alarm details on alarm clear 2023-05-24 16:51:00 +03:00
Andrew Shvayka
2a0f5479a0
Merge pull request #8620 from thingsboard/refactoring_serch_text_device 
Removed search text from Device Entity
 2023-05-24 14:30:19 +03:00
Andrii Shvaika
f05f2e2053 Remove SearchText from Device 2023-05-24 14:17:00 +03:00
Igor Kulikov
f1be847bfb UI: Leaflet Map - add latitude/longitude validation. Improve code style. 2023-05-24 13:52:57 +03:00
Andrii Shvaika
fa41086e6d Refactoring improvements 2023-05-24 13:40:37 +03:00
ViacheslavKlimov
597696eabc Try to fix testNotificationRuleDisabling 2023-05-24 13:12:33 +03:00
ViacheslavKlimov
508a990ab1 Merge remote-tracking branch 'origin/develop/3.5.2' into feature/notification-configs-vc 2023-05-23 15:20:21 +03:00
Seraphym-Tuhai
04bd8d5da1 fix locator, changing the page link value from 10 to 30 2023-05-23 12:51:14 +03:00
Seraphym-Tuhai
9a057f2995 refactoring tests on delete several devices 2023-05-23 12:50:06 +03:00
Seraphym-Tuhai
253e82b6c8 add Feature and Description, add test on assign several devices 2023-05-23 12:49:42 +03:00
Seraphym-Tuhai
c53ed73ac2 add tests on assign, add tabs, refactoring 2023-05-23 12:49:05 +03:00
Igor Kulikov
ee6523368c Merge branch 'master' into develop/3.5.2 2023-05-23 09:38:56 +03:00
Igor Kulikov
d8608d4de8 UI: minor code style fix 2023-05-23 09:37:58 +03:00
Andrii Shvaika
b322ef449a Merge remote-tracking branch 'origin/master' into develop/3.5.2 2023-05-22 18:03:48 +03:00
Igor Kulikov
e797880280
Merge pull request #8600 from vvlladd28/bug/file-input/browse-file-buttton 
Fix handle action "browser file" in file input components
 2023-05-22 17:52:17 +03:00
Igor Kulikov
e7f2f4d5e1
Merge pull request #8581 from ArtemDzhereleiko/AD/bug-fix/attribute-table-select-cell 
Fixed select cell width for attribute table
 2023-05-22 17:51:27 +03:00
Igor Kulikov
2710772cee
Merge pull request #8578 from ArtemDzhereleiko/AD/bug-fix/custom-translate-alarm-type 
Custom translate for alarm type
 2023-05-22 17:50:56 +03:00
Igor Kulikov
4733fcec5a
Merge pull request #8546 from ArtemDzhereleiko/AD/bug-fix/api-usage-fill-color 
Fixed Api usage widget fill color
 2023-05-22 17:50:06 +03:00
Andrii Shvaika
bf63eaccfe Merge branch 'master' into develop/3.5.2 2023-05-22 17:50:05 +03:00
Igor Kulikov
6dab35d451
Merge pull request #8539 from ArtemDzhereleiko/AD/bug-fix/control-widget-title 
Fixed control widgets setting change
 2023-05-22 17:48:56 +03:00
Igor Kulikov
78d99eb815
Merge pull request #8531 from ArtemDzhereleiko/AD/bug-fix/mat-icon-tooltip 
Fixed mat suffix icon tooltip
 2023-05-22 17:48:16 +03:00
Igor Kulikov
469b1ecda7
Merge pull request #8529 from ArtemDzhereleiko/AD/bug-fix/queue-form 
Fixed queue bugs
 2023-05-22 17:47:19 +03:00
Andrew Shvayka
07cba2b16c
Merge pull request #8598 from dashevchenko/xxe_fixed 
Fixed xxe vulnerability
 2023-05-22 17:46:51 +03:00
Igor Kulikov
8dc37a5e90
Merge pull request #8506 from JavierNR/feature/spanish3.5 
Spanish locale update
 2023-05-22 17:46:41 +03:00
Vladyslav_Prykhodko
a2693238c6 UI: Fix handle action "browser file" in file input components 2023-05-22 17:37:00 +03:00
Igor Kulikov
650b5c5b92 Update pkg.upgradeVersion variable 2023-05-22 16:33:04 +03:00
Igor Kulikov
9ae1f1e329 Version set to 3.5.2-SNAPSHOT 2023-05-22 16:32:24 +03:00
Igor Kulikov
62ab844840 Merge with master 2023-05-22 16:31:52 +03:00
Igor Kulikov
59cc8244b5 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:31:19 +03:00
Igor Kulikov
c422e39724 Version set to 3.5.1-SNAPSHOT 2023-05-22 16:26:54 +03:00
Igor Kulikov
e8ba135f70 Merge branch 'develop/3.5.1' into develop/3.5.2 2023-05-22 16:20:34 +03:00