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

1242 Commits

Author SHA1 Message Date
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
Viacheslav Klimov
bc6efa5e1e
[3.3] [PROD-685] Provide user's session expiration when his auth data is changed (#4201) 
* Provide user's session expiration when his auth data is changed

* Provide mock TokenOutdatingService for dao tests

* Increase time gap when checking if token is outdated

* Add license header for TokenOutdatingTest

* Refactor tokens outdating functionality to events usage

* Reset tokens on front-end after changing password
 2021-03-15 17:11:23 +02:00
nickAS21
3f4714c2ce
Lwm2m strategy (#4210) 
* Lwm2m:  back: two strategy

* Lwm2m:  back: add new models

* Lwm2m:  back: del new models
 2021-03-05 17:40:13 +02:00
Vladyslav
207cc8ac1c
Merge pull request #4192 from thingsboard/lwm2m_bug_keyName 
Lwm2m bug key name
 2021-03-04 20:21:26 +02:00
nickAS21
03b647c525 Lwm2m: front: validateObject on the start fix bug 2021-03-04 17:19:07 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +02:00
Igor Kulikov
655052090e Merge branch 'master' into develop/3.3 2021-03-04 12:03:39 +02:00
Igor Kulikov
f29d548d4a Fix timeseries bars tooltip 2021-03-03 18:47:56 +02:00
nickAS21
dc8370c859 Lwm2m: front: validateObject on the start 2021-03-03 17:18:49 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Vladyslav_Prykhodko
8ef06ed5d6 UI: Fixed filter preview text at boolean type in alarm rule 2021-03-03 15:30:57 +02:00
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
deaflynx
f470a7ca30 Minor getEdgeEventContentByEntityType refactoring 2021-03-03 14:38:41 +02:00
deaflynx
f2ac0f6913 Minor getEdgeEventContentByEntityType refactoring 2021-03-03 14:35:58 +02:00
deaflynx
7cef8eada4 getEdgeEventContentByEntityType() added function type 2021-03-03 14:31:13 +02:00
deaflynx
bf41bc5f09 Edge Downlinks refactor, prepareEdgeEventContent moved to Entity Service 2021-03-03 14:30:02 +02:00
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Igor Kulikov
d77ec66203
Merge pull request #4181 from vvlladd28/improvement/twilio-sms-provider 
Twilio SMS provider added support Phone Number's SID or Messaging Service SID
 2021-03-03 05:54:15 -04:00
deaflynx
3c03618d3e Edge Downlinks: deleted @Input tenandId, added Widgets/DeviceProfile fetch methods 2021-03-03 11:52:24 +02:00
Igor Kulikov
16c55b4dda
Merge pull request #4179 from AndrewVolosytnykhThingsboard/activation-link-fix-new 
Activation link fix
 2021-03-03 05:36:04 -04:00
Igor Kulikov
2ac7b122dc
Merge pull request #4173 from vvlladd28/improvement/enities-tables/lable-include-dots 
UI: Added the ability to get the value of a key that contains dots in the name to a table widgets
 2021-03-03 05:26:00 -04:00
Igor Kulikov
2548b8c023
Merge pull request #4165 from vvlladd28/bug/search/spech-character 
UI: fixed text search request include reserved characters
 2021-03-03 05:23:39 -04:00
Igor Kulikov
6c024360ff Fix conflicts 2021-03-03 11:21:54 +02:00
deaflynx
cdd9c867a0 Edge Downlinks: refactored, added missing EdgeEventType 2021-03-03 11:14:51 +02:00
Igor Kulikov
a8088a0655
Merge pull request #4119 from vvlladd28/improvement/js-json-editor/fullscrean 
UI: Added to js/JSON editor always working fullscreen button
 2021-03-03 05:10:02 -04:00
Igor Kulikov
588253daa4
Merge pull request #4113 from ChantsovaEkaterina/improvement/get-alarm-first-entity-info 
Get first entity info: add alarm entity info for single-entity aliases even if no alarms to display
 2021-03-03 05:09:09 -04:00
Igor Kulikov
961455b4af
Merge pull request #4096 from vvlladd28/improvement/timeseries-table/load 
UI: Improvement load and update time into time series table
 2021-03-03 05:05:48 -04:00
deaflynx
d35f9d0edf Merge deaflynx/develop/3.3-edge 2021-03-03 09:29:38 +02:00
Igor Kulikov
99c9c099ba Add Entity Type alias. Fix Key filter value conditional processing. 2021-03-02 15:13:21 +02:00
Vladyslav_Prykhodko
cbc8991b05 UI: Updated value name 2021-03-02 13:21:53 +02:00
Igor Kulikov
0b43762a83 Introduce entities count datasource. 2021-03-02 12:04:45 +02:00
Artem Babak
de3a6b9624 Edge Component: checkIsNewEdge method refactored 2021-03-02 07:25:54 +02:00
Artem Babak
712a14ec22 Merge remote-tracking branch 'origin/develop/3.3-edge' into develop/3.3-edge 2021-03-02 07:24:13 +02:00
Andrew Volostnykh
a600a5050a Refactoring 2021-03-01 19:30:56 +02:00
Vladyslav_Prykhodko
c81854e614 Twilio SMS provider added support Phone Number's SID or Messaging Service SID 2021-03-01 19:16:13 +02:00
Andrew Volostnykh
a2d9899a46 Null activation link and absent expected field in additional info fixed 2021-03-01 15:15:24 +02:00
AndrewVolosytnykhThingsboard
8ea3dcb808 improvement of solution 2021-03-01 12:19:57 +02:00
Vladyslav_Prykhodko
ce9dcd17c6 UI: Add Constant keys in the Device Profile Alarm Rules 2021-02-26 19:26:31 +02:00
Vladyslav_Prykhodko
477ee90e50 UI: Added the ability to get the value of a key that contains dots in the name to a table widgets 2021-02-26 17:34:42 +02:00
Vladyslav_Prykhodko
ece8fcee67 UI: fixed text search include reserved characters 2021-02-25 17:31:24 +02:00
Vladyslav_Prykhodko
7237497946 UI: Fixed merge additional info after save entity; Fixed updated alarm rules count 2021-02-25 15:52:13 +02:00
Chantsova Ekaterina
c3a9e69176 Make file input work properly when there are multiple on page 2021-02-25 10:34:24 +02:00
Vladyslav
d3d6331e15
Merge pull request #4133 from thingsboard/lwm2m_create_device 
Lwm2m: front add validator json for security config value
 2021-02-23 16:39:39 +02:00
Vladyslav_Prykhodko
9a9379d185 UI: Added validation of the obtained value from the cell style function 2021-02-23 11:36:41 +02:00
nickAS21
9c3bf2063b Lwm2m: front fix bug: config profile -> add object if list empty 2021-02-23 11:28:07 +02:00
Volodymyr Babak
10d3dd01bb Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge 2021-02-22 19:08:30 +02:00
nickAS21
d2469420ad Lwm2m: front add validator json for security config device 2021-02-22 14:36:33 +02:00
Andrii Shvaika
4b43cd75f7 Merge branch 'master' into develop/3.3 2021-02-22 13:29:08 +02:00
nickAS21
e0591bc6d0 Lwm2m: front add validator json for security config value delete debug 2021-02-20 09:50:29 +02:00
nickAS21
ce0db8a6ea Lwm2m: double front add validator json for security config value 2021-02-20 09:25:36 +02:00