lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
434 Commits 1 Branch 0 Tags
6ee66dc4e17dcb27a41c4be359a26aa3b26a204c
Commit Graph

161 Commits

Author SHA1 Message Date
Kai Zimmermann
f5352b420d Cleaned up a bit 2016-03-15 13:22:43 +01:00
Kai Zimmermann
40e8fdf5e0 Made duration helper a static utility class 2016-03-15 13:06:47 +01:00
Kai Zimmermann
7473c1b226 Merge pull request #56 from bsinno/feature_MECS-86_tenant_specific_polling_configuration 
Feature: tenant specific polling configuration

Note: @fabnon is member of @michahirsch and my organisation
 2016-03-14 16:37:46 +01:00
Kai Zimmermann
4f06b60880 Merge pull request #85 from bsinno/Stabilise_tests 
Should help with selenium test on hawkBit based UIs. Thx.
 2016-03-14 12:57:45 +01:00
Kai Zimmermann
807aaf629c Merge remote-tracking branch 'eclipse/master' into feature_MECS-86_tenant_specific_polling_configuration 
# Conflicts:
#
hawkbit-ui/src/main/java/org/eclipse/hawkbit/ui/tenantconfiguration/Tena
ntConfigurationDashboardView.java
 2016-03-14 09:51:00 +01:00
Kai Zimmermann
a127c30070 Removed unnecessary colon 2016-03-14 07:24:43 +01:00
Kai Zimmermann
81d5c91197 Merge remote-tracking branch 'eclipse/master' into Rollout_migrate_table_to_grid_final 2016-03-14 07:23:30 +01:00
Kai Zimmermann
3f763e7db4 Migrated hardcoded doc links to configurable setup. 2016-03-12 19:08:12 +01:00
Kai Zimmermann
b5a826eb13 Made demo login field optional. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-11 19:30:07 +01:00
asharani-murugesh
e525da0375 Merge branch 'master' into Stabilise_tests 2016-03-11 15:59:10 +01:00
SirWayne
6659e9e9ee Set the event strategy transient 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-11 09:45:12 +01:00
SirWayne
e47d540eb5 Fix event listening for duration field 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-10 10:27:31 +01:00
Kai Zimmermann
42b37c9c06 Merge pull request #74 from bsinno/Sonar_remove_unused_method_parameters 
Looks good, thx for the contribution
 2016-03-09 18:59:07 +01:00
SirWayne
a4cc3df092 Fix test properties 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 15:36:59 +01:00
SirWayne
ed97031faf Merge branch 'master' into 
feature_MECS-86_tenant_specific_polling_configuration

Conflicts:
	hawkbit-autoconfigure/src/main/java/org/eclipse/hawkbit/autoconfigure/security/SecurityManagedConfiguration.java
	hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/configuration/TenantConfigurationKey.java
	hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentfication.java
	hawkbit-dmf-amqp/src/test/java/org/eclipse/hawkbit/amqp/AmqpControllerAuthentficationTest.java
	hawkbit-repository/src/test/resources/application-test.properties


Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-09 13:29:40 +01:00
asharani-murugesh
e073800703 Fixed compilation issue 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-09 09:43:52 +01:00
asharani-murugesh
efc277cc7a Merge branch 'master' into Rollout_migrate_table_to_grid_final 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-09 09:34:41 +01:00
asharani-murugesh
21fb44ff05 Merge branch 'master' into Stabilise_tests 2016-03-08 11:51:41 +01:00
Kai Zimmermann
e8473928c9 Merge pull request #61 from bsinno/Sonar_issue_Fields_and_methods_have_conflicting_names 
👍 looks good, thx
 2016-03-08 08:42:43 +01:00
asharani-murugesh
7fda3b9da8 Added missing header 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 16:24:13 +01:00
asharani-murugesh
fd9ff8fdc5 Resolved merge conflicts 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 16:01:29 +01:00
asharani-murugesh
ebcc50965d Addressed review comments 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 15:57:01 +01:00
asharani-murugesh
9da59288e8 Refactored customerfilterUIIT 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 15:24:06 +01:00
Jonathan Philip Knoblauch
8f35b75857 Removed unused target parameter in method forceQuitAction and change assertEquals to assertThat 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 14:44:34 +01:00
asharani-murugesh
6c091a498a Addressed review comments 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 14:15:43 +01:00
Jonathan Philip Knoblauch
cf48ef215a Changed names for editRollout boolean and discardRolllout Button 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 13:14:40 +01:00
SirWayne
f4791743ce Add test case description 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-03-07 12:18:18 +01:00
asharani-murugesh
51ba6b518e Added javadoc 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-07 10:44:22 +01:00
Jonathan Philip Knoblauch
7fec5c8407 Changed name saveDistributionButton to saveDistributionBtn and discardDistributionButton to discardDistributionBtn for consistency 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-07 10:07:06 +01:00
asharani-murugesh
578bd66b28 merged master 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-06 09:26:53 +01:00
Kai Zimmermann
dcea53f4c8 Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-04 18:14:26 +01:00
asharani-murugesh
a9eaacb8b9 Added documenatation 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 14:24:03 +01:00
asharani-murugesh
3854061d4f Sonar issues fixed 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-04 14:17:43 +01:00
Nonnenmacher Fabian (INST-ICM/BSV-AS)
9646e1eabc Fixed review findings 2016-03-04 12:34:39 +01:00
Kai Zimmermann
25832e7e16 Merge remote-tracking branch 'eclipse/master' into cleanup-properties 
# Conflicts:
#
hawkbit-dmf-amqp/src/main/java/org/eclipse/hawkbit/amqp/AmqpProperties.j
ava
 2016-03-04 12:11:35 +01:00
asharani-murugesh
ab2a7b8f8d Merge branch 'master' into Rollout_migrate_table_to_grid 2016-03-04 09:13:18 +01:00
Kai Zimmermann
71653470dc Merge remote-tracking branch 'eclipse/master' into harmonize-test-documentation 2016-03-03 20:59:15 +01:00
Kai Zimmermann
8c5945badd Fixed sort order in UI 2016-03-03 20:53:54 +01:00
Kai Zimmermann
e7173aa846 Cleanup messed up actionstatus sorting. We used sort param but had 
hardcoded sorting in the reposirory. I added also reportAt based
sorting.

Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-03 18:54:50 +01:00
Jonathan Philip Knoblauch
e731543313 Fix for sonar rule: Fields and methods should not have conflicting names 
Signed-off-by: Jonathan Philip Knoblauch <JonathanPhilip.Knoblauch@bosch-si.com>
 2016-03-03 10:52:55 +01:00
asharani-murugesh
a9f8479cf6 Deployment view : Set id for action confirmation popup 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-02 17:43:52 +01:00
Kai Zimmermann
762183ae12 Merge pull request #58 from bsinno/Clean_Code 
👍 merged
 2016-03-02 13:05:12 +01:00
Michael Hirsch
d28ea67e89 remove author tag from javadoc 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-02 11:25:43 +01:00
Kai Zimmermann
6f39769692 Removed out commented code. 
Signed-off-by: Kai Zimmermann <kai.zimmermann@bosch-si.com>
 2016-03-02 10:20:47 +01:00
asharani-murugesh
3a344e2e49 Renamed the component id's 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-02 09:59:22 +01:00
Michael Hirsch
5efcc295bc clean code do early return. 
Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-02 09:00:10 +01:00
Michael Hirsch
229e7c54af introduce a push strategy to the HawkbitUI and a delayed push 
implementation to avoid UI freezes when too many events are dispatched
to the UI

Signed-off-by: Michael Hirsch <michael.hirsch@bosch-si.com>
 2016-03-02 07:33:22 +01:00
asharani-murugesh
7937c16c9b Rollout progress bar custom render changed to html renderer 
Packages refactored

Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-03-01 13:59:57 +01:00
SirWayne
c9c36ea435 Add description for asserts in test cases 
Signed-off-by: SirWayne <dennis.melzer@bosch-si.com>
 2016-02-29 15:34:07 +01:00
asharani-murugesh
bb873e88a7 removed unused import 
Signed-off-by: asharani-murugesh <asharani.murugesh@in.bosch.com>
 2016-02-29 14:42:59 +01:00