WSO2 Builder
3014089807
[WSO2 Release] [Jenkins #2890 ] [Release 3.0.216] prepare for next development iteration
7 years ago
WSO2 Builder
3dd8c8bf2f
[WSO2 Release] [Jenkins #2890 ] [Release 3.0.216] prepare release v3.0.216
7 years ago
Rasika Perera
7db642a9be
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1629
7 years ago
kamidu
bb0920ef7f
code reformatted to resolve the exsisted code formatting issues
7 years ago
kamidu
3bcb1b729c
improve the java script code of changing the text and visibility
...
Improved the logic in order to remove the unesssary text changes and visibility changes. and fix the code formatting issues found in the code.
7 years ago
kamidu
9cc76da4c2
Fix git issue https://github.com/wso2/product-iots/issues/1629
...
Fixes wso2/product-iots#1629
7 years ago
WSO2 Builder
2cd3b81aaa
[WSO2 Release] [Jenkins #2888 ] [Release 3.0.215] prepare for next development iteration
7 years ago
WSO2 Builder
8301dda57d
[WSO2 Release] [Jenkins #2888 ] [Release 3.0.215] prepare release v3.0.215
7 years ago
Rasika Perera
6c2f4e3c8d
Merge pull request #1165 from rasika/fix-1624
...
Adding additional validations to improve stability of the product
7 years ago
WSO2 Builder
6f6c3e2051
[maven-release-plugin] prepare for next development iteration
7 years ago
WSO2 Builder
a47115d92d
[maven-release-plugin] prepare release v3.0.214
7 years ago
Rasika Perera
003ae9883b
Fixing https://github.com/wso2/product-iots/issues/1629
7 years ago
charitha
3cf0d12181
Updated license year
7 years ago
charitha
c542c3efe9
Implemented operation response publishing to analytics
7 years ago
WSO2 Builder
b5ed177338
[WSO2 Release] [Jenkins #2878 ] [Release 3.0.212] prepare for next development iteration
7 years ago
WSO2 Builder
8569092e00
[WSO2 Release] [Jenkins #2878 ] [Release 3.0.212] prepare release v3.0.212
7 years ago
charitha
439fae4f8d
Fixed https://github.com/wso2/product-iots/issues/1630
7 years ago
WSO2 Builder
d4a2b807aa
[WSO2 Release] [Jenkins #2876 ] [Release 3.0.211] prepare for next development iteration
7 years ago
WSO2 Builder
97324f8c19
[WSO2 Release] [Jenkins #2876 ] [Release 3.0.211] prepare release v3.0.211
7 years ago
Ruwan
16cd6056a9
Merge pull request #1167 from ruwany/master
...
Fix for https://github.com/wso2/product-iots/issues/1399
7 years ago
WSO2 Builder
b885931c26
[WSO2 Release] [Jenkins #2874 ] [Release 3.0.210] prepare for next development iteration
7 years ago
WSO2 Builder
e1a5b3ec43
[WSO2 Release] [Jenkins #2874 ] [Release 3.0.210] prepare release v3.0.210
7 years ago
Ace
bc9450b7ff
merging with upstream
7 years ago
Ace
327f49cfd9
Fix for https://github.com/wso2/product-iots/issues/1399
7 years ago
Rasika Perera
ab352015b7
Fixes for the https://github.com/wso2/product-iots/issues/1624
7 years ago
Rasika Perera
8a09e44c3e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into fix-1624
7 years ago
WSO2 Builder
b428ecb931
[WSO2 Release] [Jenkins #2872 ] [Release 3.0.209] prepare for next development iteration
7 years ago
WSO2 Builder
091da0326d
[WSO2 Release] [Jenkins #2872 ] [Release 3.0.209] prepare release v3.0.209
7 years ago
Rasika Perera
c5622c7b0b
Fixing https://github.com/wso2/product-iots/issues/1624
7 years ago
WSO2 Builder
45f778d2e4
Merge commit '774c20a09a0bb12b11dbec7c4ec9d5fb491575e2' into 1d9c0cda-191e-4c45-9fd9-32a2aa0808a4
7 years ago
WSO2 Builder
774c20a09a
[WSO2 Release] [Jenkins #2871 ] [Release 3.0.208] prepare for next development iteration
7 years ago
WSO2 Builder
4d35797a55
[WSO2 Release] [Jenkins #2871 ] [Release 3.0.208] prepare release v3.0.208
7 years ago
Rasika Perera
f3860e42f7
Fixing https://github.com/wso2/product-iots/issues/1624
7 years ago
Rasika Perera
5347930d95
Merge branch 'master' into fix-1623
7 years ago
Rasika Perera
a406dd0540
Merge pull request #1163 from rasika/fix-1611
...
Isolating Geo Location Enabling Configuration
7 years ago
Rasika Perera
c46a2037fe
Fixing https://github.com/wso2/product-iots/issues/1611
7 years ago
Rasika Perera
68a5415e0b
Fixing https://github.com/wso2/product-iots/issues/1623
7 years ago
Rasika Perera
3a9261536e
Renamed isEnabled into Enabled for the consistency
7 years ago
Rasika Perera
08f4f04101
Fixing a typo
7 years ago
WSO2 Builder
8776317dfe
[WSO2 Release] [Jenkins #2869 ] [Release 3.0.207] prepare for next development iteration
7 years ago
WSO2 Builder
21c406fe01
[WSO2 Release] [Jenkins #2869 ] [Release 3.0.207] prepare release v3.0.207
7 years ago
Rasika Perera
394f45f4bd
Fixing https://github.com/wso2/product-iots/issues/1611
7 years ago
geethkokila
ca92c5029f
Changing the variable name
7 years ago
geethkokila
7c4ca89beb
Removing extra lines
7 years ago
geethkokila
5c2c7dfc2a
Removing commented lines
7 years ago
geethkokila
8f1d15c690
Removing commented lines
7 years ago
geethkokila
03570f3ad7
Improvements to policy monitoring framework
...
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
7 years ago
geethkokila
1a957666e3
Improvements to policy monitoring framework
...
This fixes the isseu where policy monitoring is configured per device type, they were not used. With this fix, main policy monitoring config is with cdm-config.xml and per device type can be enabled separately in the device type related xml file.
7 years ago
WSO2 Builder
d8caf3baea
[WSO2 Release] [Jenkins #2867 ] [Release 3.0.206] prepare for next development iteration
7 years ago
WSO2 Builder
944d640d5f
[WSO2 Release] [Jenkins #2867 ] [Release 3.0.206] prepare release v3.0.206
7 years ago
Madhawa Perera
e56fb5f4de
New Activity Info Provider API resource which accept an array of activity IDs to get activity information ( #1161 )
...
* New Activity Info Provider API resource which accept an array of activity IDs to get activity information
* Modifications to the new activity info provider api
* Add acceptable activity list count validation
* Modifications to the new activity provider API resource
* Added license header to the test class
* Modifications to the new activity provider api
7 years ago
WSO2 Builder
15bea25074
[WSO2 Release] [Jenkins #2865 ] [Release 3.0.205] prepare for next development iteration
7 years ago
WSO2 Builder
f9484f286f
[WSO2 Release] [Jenkins #2865 ] [Release 3.0.205] prepare release v3.0.205
7 years ago
WSO2 Builder
a4a1587cb3
Merge commit '955de2159ce36a8e784cd203466b5f8d9405e3ba' into b141a02b-f6a3-4cd5-b234-bea699286e00
7 years ago
WSO2 Builder
955de2159c
[WSO2 Release] [Jenkins #2864 ] [Release 3.0.204] prepare for next development iteration
7 years ago
WSO2 Builder
d7c66d1d67
[WSO2 Release] [Jenkins #2864 ] [Release 3.0.204] prepare release v3.0.204
7 years ago
Rasika Perera
67a12dc57b
Merge pull request #1158 from Kamidu/master
...
validation improvements
7 years ago
Rasika Perera
6651dbb64a
Fixed a typo
7 years ago
Rasika Perera
b24095779a
Fixing https://github.com/wso2/product-iots/issues/1142
7 years ago
kamidu
e086ecf28a
correct olad formatting issues
7 years ago
WSO2 Builder
4883a5779d
[WSO2 Release] [Jenkins #2862 ] [Release 3.0.203] prepare for next development iteration
7 years ago
WSO2 Builder
4546e323cf
[WSO2 Release] [Jenkins #2862 ] [Release 3.0.203] prepare release v3.0.203
7 years ago
WSO2 Builder
eae50efeee
[WSO2 Release] [Jenkins #2860 ] [Release 3.0.202] prepare for next development iteration
7 years ago
WSO2 Builder
6646a2f445
[WSO2 Release] [Jenkins #2860 ] [Release 3.0.202] prepare release v3.0.202
7 years ago
kamidu
46d85a3833
removing console logs
7 years ago
kamidu
cdff923aab
validation improvements
7 years ago
WSO2 Builder
086eeecb01
[WSO2 Release] [Jenkins #2858 ] [Release 3.0.201] prepare for next development iteration
7 years ago
WSO2 Builder
74d5a5b469
[WSO2 Release] [Jenkins #2858 ] [Release 3.0.201] prepare release v3.0.201
7 years ago
geethkokila
0e3069b0da
Changing the generic application retrieval to get the application ids
...
This fixes the issue caused due to retrieving the application details by submiting the device id, becasue at the first storing of the application, they are not stored agaist a device. It get's mapped later with the device. Hence it caused a null pointer
7 years ago
WSO2 Builder
c57dec9f30
[WSO2 Release] [Jenkins #2856 ] [Release 3.0.200] prepare for next development iteration
7 years ago
WSO2 Builder
b51c9e9d4c
[WSO2 Release] [Jenkins #2856 ] [Release 3.0.200] prepare release v3.0.200
7 years ago
geethkokila
b652d025c8
This commits fixes the issues of having the Application memory info and is-active flag with the DM_APPLICATION table, because those values should go to to DM_APPLICATION_MAPPING table. Change of the tables has happened.
7 years ago
WSO2 Builder
531f209b2c
[WSO2 Release] [Jenkins #2854 ] [Release 3.0.199] prepare for next development iteration
7 years ago
WSO2 Builder
2415a8d7fa
[WSO2 Release] [Jenkins #2854 ] [Release 3.0.199] prepare release v3.0.199
7 years ago
WSO2 Builder
ae743d0fbd
[WSO2 Release] [Jenkins #2852 ] [Release 3.0.198] prepare for next development iteration
7 years ago
WSO2 Builder
7691579570
[WSO2 Release] [Jenkins #2852 ] [Release 3.0.198] prepare release v3.0.198
7 years ago
charitha
1c904e72f6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha
50269aacc6
Fixed https://github.com/wso2/product-iots/issues/1218
7 years ago
WSO2 Builder
ffedebe554
[WSO2 Release] [Jenkins #2850 ] [Release 3.0.197] prepare for next development iteration
7 years ago
WSO2 Builder
63ebfd7837
[WSO2 Release] [Jenkins #2850 ] [Release 3.0.197] prepare release v3.0.197
7 years ago
Ruwan
b6792f89f1
Merge pull request #1152 from ruwany/master
...
Fixing https://github.com/wso2/product-iots/issues/1579
7 years ago
Ace
e054a49aea
Adding fix for https://github.com/wso2/product-iots/issues/1579
7 years ago
WSO2 Builder
8531895e67
[WSO2 Release] [Jenkins #2848 ] [Release 3.0.196] prepare for next development iteration
7 years ago
WSO2 Builder
c5e9ae3c1a
[WSO2 Release] [Jenkins #2848 ] [Release 3.0.196] prepare release v3.0.196
7 years ago
Rasika Perera
ca0089b49e
https://github.com/wso2/product-iots/issues/1573 Removed android-web-agent, Fixed download URL
7 years ago
WSO2 Builder
17abcc8192
[WSO2 Release] [Jenkins #2846 ] [Release 3.0.195] prepare for next development iteration
7 years ago
WSO2 Builder
c4dfe974f1
[WSO2 Release] [Jenkins #2846 ] [Release 3.0.195] prepare release v3.0.195
7 years ago
WSO2 Builder
e08669a51d
Merge commit 'becdfba15e826cf60eb64a8400cdb9b3ff58ec4d' into 2df7da8d-e5ad-4a38-9c5e-0a2f0d200522
7 years ago
WSO2 Builder
becdfba15e
[WSO2 Release] [Jenkins #2845 ] [Release 3.0.194] prepare for next development iteration
7 years ago
WSO2 Builder
b70504bc8b
[WSO2 Release] [Jenkins #2845 ] [Release 3.0.194] prepare release v3.0.194
7 years ago
Rasika Perera
8997b4ba53
Merge pull request #1150 from rasika/fix-1547
...
Fixing https://github.com/wso2/product-iots/issues/1547
7 years ago
Rasika Perera
4770b9b603
Fixing https://github.com/wso2/product-iots/issues/1547
7 years ago
WSO2 Builder
36d1839ce2
[WSO2 Release] [Jenkins #2843 ] [Release 3.0.193] prepare for next development iteration
7 years ago
WSO2 Builder
a67433442e
[WSO2 Release] [Jenkins #2843 ] [Release 3.0.193] prepare release v3.0.193
7 years ago
Rasika Perera
83ae57a044
Merge pull request #1147 from rasika/fix-1553
...
Fixing cannot publish policies without enrolling a device
7 years ago
WSO2 Builder
8d26327a9d
[WSO2 Release] [Jenkins #2841 ] [Release 3.0.192] prepare for next development iteration
7 years ago
WSO2 Builder
4d16377ddf
[WSO2 Release] [Jenkins #2841 ] [Release 3.0.192] prepare release v3.0.192
7 years ago
Rasika Perera
e254d4ccc8
Fixing https://github.com/wso2/product-iots/issues/1553 and https://github.com/wso2/product-iots/issues/1546
7 years ago
kamidu
6daf95b78d
Change the config placement for improve the separatability
7 years ago
kamidu
33b27234a0
Enable the new configuration for testing
7 years ago
kamidu
2505d4907a
Fixing https://github.com/wso2/product-iots/issues/1565
7 years ago
WSO2 Builder
5783a74110
[WSO2 Release] [Jenkins #2838 ] [Release 3.0.191] prepare for next development iteration
7 years ago
WSO2 Builder
7a7613a0cb
[WSO2 Release] [Jenkins #2838 ] [Release 3.0.191] prepare release v3.0.191
7 years ago
Ace
42f36e5a9a
Fixing test failure
7 years ago
Rasika Perera
7b8ba259e4
Merge pull request #1134 from madhawap/vf-dev-3
...
Added an API to filter activities by operation code
7 years ago
Madawa Soysa
e786fa410b
Checking if the user store manager class is a sub class of the default
...
This commit is to modify the current logic which checks if the UserStoreManager class is equal to the JDBCUserStoreManager class to support subclasses of the JDBCUserStoreManager class to return correct total user count.
In this commit, instead of comparing the string name, tests the UserStoreManager instance is a type of JDBCUserStoreManager.
Resolves wso2/product-iots#1556
7 years ago
Kamidu Sachith Punchihewa
d397d73777
Merge pull request #1139 from rasika/fix-1544
...
Fixing devicemgt roles not created for newly created tenants
7 years ago
Kamidu Sachith Punchihewa
48e67df534
Merge pull request #1141 from ruwany/master
...
Notification center enhancements
7 years ago
Ace
e2ce619166
Adding UI enhancements and including unit tests
7 years ago
WSO2 Builder
b8643213b6
[WSO2 Release] [Jenkins #2831 ] [Release 3.0.190] prepare for next development iteration
7 years ago
WSO2 Builder
34dc4038e6
[WSO2 Release] [Jenkins #2831 ] [Release 3.0.190] prepare release v3.0.190
7 years ago
kamidu
049c6bcdae
Enaled policy description on effective policy view
7 years ago
Rasika Perera
08e40d3989
Fixing error log
7 years ago
Rasika Perera
2e7bd0626d
Fixing https://github.com/wso2/product-iots/issues/1544
7 years ago
Ace
fb6c98b969
Restricting clear notifications to tenant domain only
7 years ago
Ace
15991f626d
Adding clear notifications button to notification listing page
7 years ago
Ace
29c0692286
removing un-necessary logs
7 years ago
Ace
c506d90698
removing un-necessary logs
7 years ago
Ace
9ac89d1ebe
merging with upstream
7 years ago
Ace
855f294ed2
improving notifications management
7 years ago
Madawa Soysa
6fed9f7823
Changing the order by parameter when getNextPendingOperation called
...
Changing the order by parameter to UPDATED_TIMESTAMP.
Resolves wso2/product-iots#1539
7 years ago
WSO2 Builder
2a01c77ef9
[WSO2 Release] [Jenkins #2827 ] [Release 3.0.189] prepare for next development iteration
7 years ago
WSO2 Builder
ce604ed214
[WSO2 Release] [Jenkins #2827 ] [Release 3.0.189] prepare release v3.0.189
7 years ago
lasantha
1a8816f531
fixed build failure
7 years ago
Madawa Soysa
8df3999cbc
Merge pull request #1135 from Kamidu/master
...
Enable roles containing the filter to be listed in role listing
7 years ago
Madawa Soysa
30da164121
Merge pull request #1136 from lasanthaDLPDS/vf-dev-api
...
Adding v0.9 API version for device management and certificate management
7 years ago
lasantha
11310a9145
default API set to newly added API and fixed it by using context parameters
7 years ago
kamidu
e10cf66813
Enable roles containing the filter to be listed in role listing
7 years ago
WSO2 Builder
5262f516f4
[WSO2 Release] [Jenkins #2822 ] [Release 3.0.188] prepare for next development iteration
7 years ago
WSO2 Builder
2bfe4bbfe7
[WSO2 Release] [Jenkins #2822 ] [Release 3.0.188] prepare release v3.0.188
7 years ago
madhawap
16f70454ad
Added an API to filter activities by operation code
7 years ago
kamidu
1413ff5268
Fixing https://github.com/wso2/product-iots/issues/1526
7 years ago
WSO2 Builder
3ce2d1c3b2
[WSO2 Release] [Jenkins #2820 ] [Release 3.0.187] prepare for next development iteration
7 years ago
WSO2 Builder
ae71fafc10
[WSO2 Release] [Jenkins #2820 ] [Release 3.0.187] prepare release v3.0.187
7 years ago
Ace
aa654ea5bf
Fix for https://github.com/wso2/product-iots/issues/1525
7 years ago
WSO2 Builder
6fe5b6909f
[WSO2 Release] [Jenkins #2818 ] [Release 3.0.186] prepare for next development iteration
7 years ago
WSO2 Builder
ff97ffbfcc
[WSO2 Release] [Jenkins #2818 ] [Release 3.0.186] prepare release v3.0.186
7 years ago
Ace
e06d8f9e13
merging with upstream
7 years ago
Ace
62c6882fa2
Fixing server startup issue when configured with PostgreSQL DB
7 years ago
lasantha
9a7745d915
Adding new API version for backward compatibility
7 years ago
WSO2 Builder
689373a58f
[WSO2 Release] [Jenkins #2816 ] [Release 3.0.185] prepare for next development iteration
7 years ago
WSO2 Builder
babc4a9e9a
[WSO2 Release] [Jenkins #2816 ] [Release 3.0.185] prepare release v3.0.185
7 years ago
charitha
2bb12deb9c
Fixed https://github.com/wso2/product-iots/issues/1511
7 years ago
WSO2 Builder
5e70f5f469
[WSO2 Release] [Jenkins #2814 ] [Release 3.0.184] prepare for next development iteration
7 years ago
WSO2 Builder
304e942c31
[WSO2 Release] [Jenkins #2814 ] [Release 3.0.184] prepare release v3.0.184
7 years ago
Ruwan
88ac37b767
Merge pull request #1126 from lasanthaDLPDS/master
...
Adding new API endpoints
7 years ago
Ruwan
33c58ac518
Merge pull request #1125 from Gathika94/add-emm-analytics
...
Unit Tests for getGeoDevicesLocations API
7 years ago
WSO2 Builder
ce4b03eed4
[WSO2 Release] [Jenkins #2812 ] [Release 3.0.183] prepare for next development iteration
7 years ago
WSO2 Builder
28195c7f77
[WSO2 Release] [Jenkins #2812 ] [Release 3.0.183] prepare release v3.0.183
7 years ago
sameera910409
c8d56f66ea
added update device properties functionality for device types
7 years ago
lasantha
aa4f7c13c5
Fixing issue in get device API
7 years ago
Gathika94
d67877cfb1
unit tests for geo device locations api- minor changes
7 years ago
Gathika94
5308108899
unit tests- minor changes
7 years ago
Gathika94
fd5ada61af
unit tests for geo device locations api
7 years ago
lasantha
fe576c0aac
Adding required API endpoints to mograte from prior verisons of IoTS 3.1.0 to IoTS 3.1.0
7 years ago
WSO2 Builder
6603015614
[WSO2 Release] [Jenkins #2808 ] [Release 3.0.182] prepare for next development iteration
7 years ago
WSO2 Builder
bb731cb264
[WSO2 Release] [Jenkins #2808 ] [Release 3.0.182] prepare release v3.0.182
7 years ago
charitha
6cb3ffa3ca
Fixed build failure due to incorrect class name
7 years ago
charitha
3c23a3cf5e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha
1449698a3c
OSGi improvement to #977
7 years ago
Gathika94
7a2fc90a15
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics
7 years ago
Gathika94
c22a7f1882
minor ui changes
7 years ago
Gathika94
356063a247
removed warnings created in geo deivice locations dashboard
7 years ago
WSO2 Builder
b2fc6b4cad
[WSO2 Release] [Jenkins #2805 ] [Release 3.0.181] prepare for next development iteration
7 years ago
WSO2 Builder
a55619b333
[WSO2 Release] [Jenkins #2805 ] [Release 3.0.181] prepare release v3.0.181
7 years ago
Gathika94
89eff7b7bd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into add-emm-analytics
7 years ago
Gathika94
81b036678a
minor changes in device locations UI
7 years ago
WSO2 Builder
3d522e7c62
[WSO2 Release] [Jenkins #2804 ] [Release 3.0.180] prepare for next development iteration
7 years ago
WSO2 Builder
08382cc965
[WSO2 Release] [Jenkins #2804 ] [Release 3.0.180] prepare release v3.0.180
7 years ago
Charitha Goonetilleke
61f88b54ff
Merge pull request #1122 from warunalakshitha/remote-control
...
Add remote control configurations as remove unused methods
7 years ago
Gathika94
cec1e1393e
removed unnecessary files
7 years ago
Gathika94
dcac19480f
removed unnecessary files
7 years ago
warunalakshitha
2313928741
Add remote control configurations as remove unused methods
7 years ago
Gathika94
f4af47fae4
added unit and page
7 years ago
Gathika94
2e082fbbb7
removed unnecessary classes
7 years ago
WSO2 Builder
4c68ddd752
[WSO2 Release] [Jenkins #2802 ] [Release 3.0.179] prepare for next development iteration
7 years ago
WSO2 Builder
f28b740e9c
[WSO2 Release] [Jenkins #2802 ] [Release 3.0.179] prepare release v3.0.179
7 years ago
Gathika94
ad061d09a6
device details can be get through the api
7 years ago
Gathika94
f5d1ab7403
backend api working properly
7 years ago
Gathika94
c74a56cb45
geo hash algorithm
7 years ago
Gathika94
d3eb32b5cc
working on ui features
7 years ago
Gathika94
4eb66f4e6b
api for getting devices in geo grid working fine
7 years ago
charitha
f2fbf97b91
Reverting to column name based return of the generated keys as Statement.RETURN_GENERATED_KEYS are not handled consistently by H2 engine
7 years ago
charitha
a966dc2655
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
WSO2 Builder
16750a6f96
[WSO2 Release] [Jenkins #2800 ] [Release 3.0.178] prepare for next development iteration
7 years ago
WSO2 Builder
46c732a2a9
[WSO2 Release] [Jenkins #2800 ] [Release 3.0.178] prepare release v3.0.178
7 years ago
charitha
0f7e8b6435
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
7 years ago
charitha
713c6a6755
Merge branch 'patch-1' of https://github.com/thomsonimjd/carbon-device-mgt
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
7 years ago
dunithd
7cdea248f7
Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
...
# Resolving Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
7 years ago
Dunith Dhanushka
7f9cf0ffea
Merge branch 'master' of git://github.com/wso2/carbon-device-mgt
...
# Resolving Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
7 years ago
WSO2 Builder
22fac48873
[WSO2 Release] [Jenkins #2798 ] [Release 3.0.177] prepare for next development iteration
7 years ago
WSO2 Builder
62678dd003
[WSO2 Release] [Jenkins #2798 ] [Release 3.0.177] prepare release v3.0.177
7 years ago
WSO2 Builder
41db467d7b
[WSO2 Release] [Jenkins #2797 ] [Release 3.0.176] prepare for next development iteration
7 years ago
WSO2 Builder
af3f8a976f
[WSO2 Release] [Jenkins #2797 ] [Release 3.0.176] prepare release v3.0.176
7 years ago
Ace
4b2955984f
Resolving conflicts for Remote Control feature on behalf of Waruna
7 years ago
WSO2 Builder
3097d8394f
[WSO2 Release] [Jenkins #2795 ] [Release 3.0.175] prepare for next development iteration
7 years ago
WSO2 Builder
85f895d4a8
[WSO2 Release] [Jenkins #2795 ] [Release 3.0.175] prepare release v3.0.175
7 years ago
Menaka Jayawardena
a9150da115
Added class level comments.
7 years ago
Menaka Jayawardena
46555cfe3a
Fixing code formatting issues in SearchManagementTestCases.
7 years ago
Menaka Jayawardena
a9f2a0a228
Fixing code formatting issues in PermissionManagerServiceTests
7 years ago