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

60 Commits

Author SHA1 Message Date
Andrii Shvaika
dd4b874b5f Version set to 3.6.1-SNAPSHOT 2023-09-27 17:38:27 +03:00
YevhenBondarenko
db6f310284 migration to spring boot 3.1 2023-06-05 15:24:47 +02:00
YevhenBondarenko
6fda898851 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.6 2023-05-15 12:09:22 +02:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
Andrii Shvaika
166afbd782 Merge branch 'develop/3.5' into develop/3.6 2023-04-07 15:41:24 +03:00
ViacheslavKlimov
4a20adc62e Alarm related notification rules 2023-03-16 13:12:04 +02:00
YevhenBondarenko
265e33241a version set to 3.6.0-SNAPSHOT 2023-03-10 14:45:49 +01:00
Andrii Shvaika
a203c336f1 Merge with master 2023-01-31 16:20:04 +02:00
Igor Kulikov
cbdc4517e4 Update license header year to 2023 2023-01-31 10:43:56 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
ViacheslavKlimov
a53a50e99f Read-only option in VC repository settings 2022-10-25 12:07:57 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Andrii Shvaika
8de1ee776c Fix conflicts. Refactored RandomStringUtils 2022-08-16 11:26:32 +03:00
Andrii Shvaika
fa0433a7eb Version set to 3.4.1-SNAPSHOT 2022-07-19 15:30:16 +03:00
Andrii Shvaika
58e418578c Fix reordering of chunked entities from git 2022-07-18 15:53:02 +03:00
thingsboard
87325bcd10 Merge remote-tracking branch 'origin/develop/3.4' into feature/work-1581-replace-deprecated-stringutils 2022-07-13 13:33:17 +03:00
Andrii Shvaika
2e852ed7f2 Minor logging fix 2022-07-12 19:26:06 +03:00
thingsboard
c7daaa571e replace StringUtils usages with in-repository implementation 2022-07-12 12:08:52 +03:00
Igor Kulikov
4b5e94e3cc Add Version control REST API methods to Rest Client. Remove redudant branch request parameter from some version control REST API methods. 2022-06-29 17:35:13 +03:00
Andrii Shvaika
e9c9e24e2f Improvements to the chunks processing 2022-06-27 10:35:50 +03:00
Andrii Shvaika
a107c1ac44 Merge branch 'vc-queue-msg-chunking' of github.com:ViacheslavKlimov/thingsboard into develop/3.4 2022-06-24 14:56:47 +03:00
Igor Kulikov
472357109d VC: Detect default remote branch. Fix Entities Version Control REST API mappings to handle branch parameter. 2022-06-23 14:12:03 +03:00
Viacheslav Klimov
d6b516e708 VC queue message chunking 2022-06-22 18:06:50 +03:00
Andrii Shvaika
7bd51cb4ce Public Customer import fix. No commit when no changes 2022-05-31 17:13:50 +03:00
Igor Kulikov
09402f40ac UI: Refactor vc settings to repository settings. Add remove other entities confirm. 2022-05-31 16:16:24 +03:00
Andrii Shvaika
bf03475987 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-31 13:19:28 +03:00
Andrii Shvaika
07b6813465 Separate AutoCommit settings 2022-05-31 13:19:16 +03:00
Igor Kulikov
bb9b58da5b Add author to entity version 2022-05-31 13:09:47 +03:00
Viacheslav Klimov
9c2f96b262 Merge remote-tracking branch 'origin/feature/entities-version-control' into entities-vc-refactoring 
# Conflicts:
#	common/version-control/src/main/java/org/thingsboard/server/service/sync/vc/GitRepository.java
 2022-05-26 15:22:24 +03:00
Viacheslav Klimov
e4ed8c5080 Api for comparing current entity data to specific version; refactoring 2022-05-26 15:10:46 +03:00
Andrii Shvaika
905b60da6a Fix GitRepository.status command, Increased timeout between poll commands. 2022-05-26 12:32:51 +03:00
Igor Kulikov
65dc70c51b UI: Add entity versions text search support. Minor improvements and fixes. 2022-05-26 11:11:58 +03:00
Igor Kulikov
c8abe3ac95 Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 16:26:59 +03:00
Igor Kulikov
ed44304eac UI: Branch select improvements. Entity versions table improvements. 2022-05-25 16:26:39 +03:00
Andrii Shvaika
1fde08c90c Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 12:59:11 +03:00
Andrii Shvaika
4f2e1a25fd Docker compose scripts for TB Version Control Executor 2022-05-25 12:58:55 +03:00
Igor Kulikov
a8966094bb Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-25 12:26:40 +03:00
Igor Kulikov
ca3c95afca UI: Implement entitiy versions table 2022-05-25 12:26:23 +03:00
Andrii Shvaika
701547e38f Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control 2022-05-24 17:32:42 +03:00
Andrii Shvaika
9deb67afe7 Version Control microservice 2022-05-24 17:32:29 +03:00
Igor Kulikov
a5ff23a0a4 Add commit timestamp and timestamp sorting 2022-05-24 14:03:53 +03:00
Andrii Shvaika
49e91341de Merge with feature branch 2022-05-24 12:32:59 +03:00
Andrii Shvaika
1065fd9fbe Implementation of the API 2022-05-24 11:38:03 +03:00
Igor Kulikov
0d57f2f6c2 Use page link to get versions list 2022-05-23 18:19:07 +03:00
Andrii Shvaika
db34f7766f Merge with main branch 2022-05-23 17:55:43 +03:00
Viacheslav Klimov
2a89fc67ae Git api usage improvements 2022-05-23 13:20:00 +03:00