2478 Commits

Author SHA1 Message Date
Igor Kulikov
775a6e829e Merge 2019-06-27 09:48:05 +03:00
Igor Kulikov
1403ef8f99 Merge branch 'feature/SceemaGroup' of git://github.com/HollyFang/thingsboard into HollyFang-feature/SceemaGroup 2019-06-27 09:31:07 +03:00
Igor Kulikov
c95d620889 Merge branch 'kardashov-google_pubsub' 2019-06-27 09:29:29 +03:00
Igor Kulikov
4c01b25182 Fix conflicts 2019-06-27 09:28:59 +03:00
Igor Kulikov
5c70739e05
Merge pull request #1724 from elbstack/1686-No-response-to-client-side-RPC-via-CoAP
1686 no response to client side rpc via co ap
2019-06-27 09:15:58 +03:00
Igor Kulikov
20540b1c2b Merge branch 'vvlladd28-feature/device_label' 2019-06-26 18:54:56 +03:00
Igor Kulikov
04722e5e8f Fix conflicts 2019-06-26 18:54:41 +03:00
Igor Kulikov
3d8aaf69e8 Merge branch 'vvlladd28-feature/import_device' 2019-06-26 18:42:50 +03:00
Igor Kulikov
eaddbbaf23 Fix conflicts 2019-06-26 18:42:29 +03:00
Igor Kulikov
4b1bfe9352 Merge branch 'HollyFang-locale-zh_CN' 2019-06-26 17:38:55 +03:00
Igor Kulikov
462af3a489 Merge Chinese translation for entity-view #1711 2019-06-26 17:37:47 +03:00
Igor Kulikov
af7d5ddd76 Merge branch 'master' of github.com:thingsboard/thingsboard 2019-06-26 17:19:15 +03:00
Igor Kulikov
a3c512c159 DataKey chips dnd improvements. Update AngularJS Material version to 1.1.19. 2019-06-26 17:18:11 +03:00
VoBa
12b2aa0086
Merge pull request #1807 from thingsboard/feature/period-in-seconds-pattern-alarm-originator
Added alarm originator source; Added period in seconds use metadata p…
2019-06-26 12:25:48 +03:00
Igor Kulikov
b185080ae9
Merge pull request #1808 from vvlladd28/improvement/fix_bugs_after_merge
Improvement/fix bugs after merge
2019-06-26 12:07:54 +03:00
Volodymyr Babak
4aee1a9c9f Added alarm originator source; Added period in seconds use metadata pattern 2019-06-26 11:43:11 +03:00
Vladyslav_Prykhodko
2092eadcc6 Improve style not found message to function entity 2019-06-26 11:20:29 +03:00
Vladyslav_Prykhodko
a70cbda1f9 Improve translation 2019-06-26 11:18:02 +03:00
Igor Kulikov
1c394a4231
Merge pull request #1790 from vvlladd28/feature/rpc-button-call
Add new control widget button
2019-06-25 21:17:22 +03:00
Igor Kulikov
f7fae1e4a7
Merge pull request #1779 from PetrTodorov/master
Add Czech UI translation
2019-06-25 21:14:07 +03:00
Igor Kulikov
3467cb4659 Merge branch 'pgrisu-features/widget_entity_datakeys_mixed_creation_order' 2019-06-25 20:43:14 +03:00
Igor Kulikov
39da7835ab Improve chips dragging. Minor bug fixes. 2019-06-25 20:41:53 +03:00
Igor Kulikov
e4e3b0450e Merge branch 'features/widget_entity_datakeys_mixed_creation_order' of git://github.com/pgrisu/thingsboard into pgrisu-features/widget_entity_datakeys_mixed_creation_order 2019-06-25 18:49:55 +03:00
Igor Kulikov
ea0a25443c
Merge pull request #1698 from pgrisu/features/add_hide_empty_lines_options_on_timeseries_table_widget
add hide empty lines option to timeseries-table widget
2019-06-25 18:43:16 +03:00
Igor Kulikov
457fc4423a
Merge branch 'master' into features/add_hide_empty_lines_options_on_timeseries_table_widget 2019-06-25 18:41:25 +03:00
Igor Kulikov
e0ffd509af
Merge pull request #1672 from pgrisu/features/add_row_and_cell_action_sources_on_timeseries_table_widget
Add rowClick and actionButtonClick action sources to timeseries_table widget…
2019-06-25 18:28:37 +03:00
Igor Kulikov
9b7d10804b
Merge pull request #1664 from pgrisu/features/allow-widget-timewindow-hiding
Allow widget timewindow hiding
2019-06-25 18:21:06 +03:00
Igor Kulikov
6826ca8b8b
Merge pull request #1524 from vvlladd28/bugs/widget_longed_title
fix widget title longed
2019-06-25 18:16:01 +03:00
Vladyslav_Prykhodko
b3fa72999c Change license 2019-06-24 17:30:55 +03:00
Vladyslav_Prykhodko
0656cabed9 Fix cassandra update script 2019-06-24 16:29:50 +03:00
Vladyslav_Prykhodko
e4d7cb186a Fix update file 2019-06-24 15:19:58 +03:00
Stanislav Kardashov
b2aa22d37c add Google Cloud PubSub support 2019-06-24 14:10:27 +03:00
Vladyslav_Prykhodko
c35eff1cde Update database schema 2019-06-24 12:34:40 +03:00
Vladyslav Prykhodko
6a93307d28 add expression 2019-06-22 01:01:46 +03:00
Igor Kulikov
227c22e3cb Fix Docker files 2019-06-21 18:48:41 +03:00
Vladyslav_Prykhodko
8294240a03 Add new field to add/edit device 2019-06-20 18:18:12 +03:00
Igor Kulikov
66193a348c Improve debian packaging scripts. 2019-06-20 13:31:38 +03:00
Vladyslav_Prykhodko
6f0a944142 Add new control widget button 2019-06-18 19:42:26 +03:00
HollyFang
4dde2eec1a add SceemaGroup so that it can display better when there are many configuration item 2019-06-13 14:50:54 +08:00
PetrTodorov
d116ed2a7e Added Czech translation. 2019-06-11 21:08:54 +02:00
Vladyslav_Prykhodko
3dd78ea41d Fix translate 2019-06-10 17:34:05 +03:00
Vladyslav_Prykhodko
4b2d0ccfc1 Clear code 2019-06-10 17:09:05 +03:00
Vladyslav_Prykhodko
8d4d1070a4 Add translation, help, refactorin 2019-06-10 17:05:20 +03:00
Mike Lohmann
d0a0e48dc7
#1686 removed accidently committed log message 2019-06-07 15:31:32 +02:00
Mike Lohmann
60eece3556
#1686 removed accidently added p tags from header 2019-06-07 15:31:32 +02:00
Mike Lohmann
2db79aa556
Issue #1686 Introduced ScheduledFuture in SessionMap to be able to cancel
deregisterSession call after successful responses in CoAP to avoid
5.03 responses after ACK.
2019-06-07 15:31:32 +02:00
Mike Lohmann
6b47046bdb
Issue #1686 Add registerSyncSession to case TO_SERVER_RPC_REQUEST to enable
CoAP RPC Server request calls.
2019-06-07 15:31:32 +02:00
Vladyslav Prykhodko
62186267e4 finish refactored JS code 2019-06-07 00:54:35 +03:00
Vladyslav_Prykhodko
15e74792f0 Add import assets and start refactorin 2019-06-06 19:43:07 +03:00
Vladyslav_Prykhodko
b3f7fa8b50 Add part send 2019-06-06 15:29:50 +03:00