thingsboard-developers

<< < 41 42 43 44 45 > >>

Conflicts resolved

9/11/2018 6:43:27 AM

viktorbasanets

Commit: b02503a

Parents: 0501e9d
d909192

Merge remote-tracking branch 'origin/master' into feature/entity-view

9/10/2018 1:50:47 PM

Volodymyr Babak

Commit: d909192

Parents: 33fc8f0
a12a1eb

Was modified addLocalWsSubscription(...)

9/10/2018 1:53:29 PM

viktorbasanets

Commit: 0501e9d

Parents: 4e39ed5

Minor changes

9/10/2018 1:09:12 PM

viktorbasanets

Commit: 4e39ed5

Parents: 1adb36c

Was added the filds of start-time and end-time

9/10/2018 11:15:11 AM

viktorbasanets

Commit: 1adb36c

Parents: 33fc8f0

Entity view fixes

9/10/2018 9:31:36 AM

Volodymyr Babak

Commit: 33fc8f0

Parents: 5139299

Entity view fixes

9/10/2018 8:42:21 AM

Volodymyr Babak

Commit: 5139299

Parents: 06a0941

Entity view misc fixes

9/10/2018 8:37:46 AM

Volodymyr Babak

Commit: 06a0941

Parents: 5bf9528

Fixes for entity view

9/10/2018 5:11:07 AM

Volodymyr Babak

Commit: 5bf9528

Parents: 009da88

Merge pull request #1043 from ViktorBasanets/master Entity …

9/10/2018 3:36:57 AM

View

VoBa

Commit: 009da88

Parents: b0b6ee0
ae8d8f0