WSO2 Builder
|
52b0165275
|
[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ada2669ecf
|
[WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50
|
8 years ago |
warunalakshitha
|
97a53a7387
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
warunalakshitha
|
9fa4eedca5
|
Add Scheduled for push notification sending
|
8 years ago |
warunalakshitha
|
3c1e4ba205
|
Add new classes for improve Performance of push notifications
|
8 years ago |
WSO2 Builder
|
543e603298
|
[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5010a3eebf
|
[WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49
|
8 years ago |
WSO2 Builder
|
eb8ba53092
|
[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
4764bff47e
|
[WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48
|
8 years ago |
ayyoob
|
f834001d22
|
merged with origin
|
8 years ago |
WSO2 Builder
|
c1b5a649f6
|
[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6ccccb67b4
|
[WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47
|
8 years ago |
WSO2 Builder
|
1ecb4edbd7
|
[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
48a8f43cb3
|
[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46
|
8 years ago |
WSO2 Builder
|
16d97d62be
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8891784b99
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45
|
8 years ago |
ayyoob
|
c28f820455
|
added missing apis - operation and device management
|
8 years ago |
WSO2 Builder
|
f7d1a7cf99
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
4b85af950c
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44
|
8 years ago |
WSO2 Builder
|
b9e614e383
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d37951ef3f
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43
|
8 years ago |
WSO2 Builder
|
fc15f43b31
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
27b84bfc22
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42
|
8 years ago |
WSO2 Builder
|
5496159f9d
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ef94e90366
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41
|
8 years ago |
WSO2 Builder
|
a826370019
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
4654a4db45
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40
|
8 years ago |
WSO2 Builder
|
8b7e458592
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6297993560
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39
|
8 years ago |
WSO2 Builder
|
802c83de39
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
98dda03784
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38
|
8 years ago |
WSO2 Builder
|
f3e119cd78
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8f8a49a80
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37
|
8 years ago |
WSO2 Builder
|
0e5895ec78
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d6080159cb
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36
|
8 years ago |
WSO2 Builder
|
3f8f8b3ab9
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6a9a5ba9c8
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
|
8 years ago |
WSO2 Builder
|
e8ee33e7a4
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6cc898d2ab
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
|
8 years ago |
WSO2 Builder
|
a26a4bb539
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
000601911f
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
|
8 years ago |
WSO2 Builder
|
50c9eb9ba4
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ca79804c5c
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
|
8 years ago |
WSO2 Builder
|
a35205c480
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ac379c9bf9
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
|
8 years ago |
WSO2 Builder
|
de25f3afe3
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
55ecafe7f4
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
|
8 years ago |
WSO2 Builder
|
15d57f71ad
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3af9e1729a
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
|
8 years ago |
WSO2 Builder
|
322f39596e
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
18244d6c96
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
|
8 years ago |
WSO2 Builder
|
12f21868dc
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
4328c3c39d
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
|
8 years ago |
WSO2 Builder
|
c6bb8e0128
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
da9002ba9f
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
|
8 years ago |
WSO2 Builder
|
6114f4b2d5
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ea8f19f26d
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
|
8 years ago |
WSO2 Builder
|
d433525145
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
35ee3eca3a
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
|
8 years ago |
WSO2 Builder
|
4e0afb7d39
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
33f1448c82
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
|
8 years ago |
WSO2 Builder
|
e95e96f06c
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5d55413e02
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
|
8 years ago |
Susinda
|
e23aaa6647
|
Adding Hasunie's fix on initialOperations implementation
|
8 years ago |
WSO2 Builder
|
ae3300afde
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6646c0c56f
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
|
8 years ago |
WSO2 Builder
|
21cdcdd21a
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
23be60ebd0
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
|
8 years ago |
WSO2 Builder
|
7f98d37835
|
[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
b03936ca49
|
[WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
|
8 years ago |
charitha
|
14dfc1b538
|
Fix minor issues found with jmeter tests
|
8 years ago |
WSO2 Builder
|
82888e1d20
|
[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
b11c2e451b
|
[WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
|
8 years ago |
WSO2 Builder
|
67a091ff5a
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
dcc2088455
|
[WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
|
8 years ago |
WSO2 Builder
|
927b2d451d
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
dfe9b1ff9c
|
[WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
|
8 years ago |
Kamidu Sachith Punchihewa
|
559fe98cc9
|
Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
|
8 years ago |
WSO2 Builder
|
54a278a1bc
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3bc46c4d2d
|
[WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
|
8 years ago |
WSO2 Builder
|
1bc8f5c28d
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
1483503790
|
[WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
|
8 years ago |
Milan Perera
|
a5f41ef734
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
|
8 years ago |
WSO2 Builder
|
5dc55bb5b5
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
c7fe9c3a20
|
[WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
|
8 years ago |
lakshani
|
26f2e2d2ae
|
added role query param to getdevices restapis
|
8 years ago |
WSO2 Builder
|
c17bead1fc
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
14100d3cc8
|
[WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
|
8 years ago |
ayyoob
|
b42505c1fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
|
8 years ago |
WSO2 Builder
|
cd7e0feaa6
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
abb150d9bd
|
[WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
|
8 years ago |
ayyoob
|
3423ef025d
|
merged with upstream
|
8 years ago |
ayyoob
|
e74b4e23c4
|
removed apim dependency from cdmf
|
8 years ago |
WSO2 Builder
|
002fb8719b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
04f32902fd
|
[maven-release-plugin] prepare release v2.0.10
|
8 years ago |
WSO2 Builder
|
5c207897ad
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
233d14edbd
|
[maven-release-plugin] prepare release v2.0.9
|
8 years ago |
Rasika Perera
|
8e6855a203
|
Adding DEFAULT_DEVICE_USER on adding user
|
8 years ago |
Rasika Perera
|
5ce413012e
|
Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN
|
8 years ago |
WSO2 Builder
|
eedecf00ed
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ef57fc463b
|
[maven-release-plugin] prepare release v2.0.8
|
8 years ago |
WSO2 Builder
|
585b9bde4d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
d206148841
|
[maven-release-plugin] prepare release v2.0.7
|
8 years ago |
WSO2 Builder
|
5411d93103
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3ea83b925a
|
[maven-release-plugin] prepare release v2.0.6
|
8 years ago |
ayyoob
|
b20a2e0997
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Maninda
|
00a5a07373
|
Fixed some security issues found after running FindBugs security scan.
|
8 years ago |
ayyoob
|
db2ddc7bed
|
policy manager refactored to support tenancy
|
8 years ago |
Maninda
|
0fb5a577b8
|
Fixed some issues found in FindBugs security analysis.
|
8 years ago |
WSO2 Builder
|
6aea6195e9
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
3db5b289ac
|
[maven-release-plugin] prepare release v2.0.5
|
8 years ago |
WSO2 Builder
|
ed47094964
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8d409a7248
|
[maven-release-plugin] prepare release v2.0.4
|
8 years ago |
madhawap
|
d486ad14fd
|
Task operation config related changes
|
8 years ago |
Rasika Perera
|
1465c56822
|
Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
This reverts commit f9b6939cb7 .
|
8 years ago |
WSO2 Builder
|
f9b6939cb7
|
[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
|
8 years ago |
Rasika Perera
|
42930fe8c4
|
Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
This reverts commit 78b9052c37 .
|
8 years ago |
WSO2 Builder
|
78b9052c37
|
[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
|
8 years ago |
WSO2 Builder
|
a59edee410
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
8f9b21b41b
|
[maven-release-plugin] prepare release v2.0.3
|
8 years ago |
charitha
|
d8881244fd
|
Fix issue in task operation
|
8 years ago |
madhawap
|
b889f6e384
|
adding separate tasks for each device type
|
8 years ago |
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
8 years ago |
madhawap
|
2b00645779
|
refactored code
|
8 years ago |
madhawap
|
bec4ae681d
|
Seperate out task operations
|
8 years ago |
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
8 years ago |
charitha
|
726bbcd35d
|
Merged with upstream
|
8 years ago |
charitha
|
c07d77b85d
|
Updated group sharing model
|
8 years ago |
Madawa Soysa
|
2f431504fe
|
creating groups from ownership and changing group owner
This commit includes following changes,
Creating groups using the device ownership
Changing the default system group owner to wso2.system.user
|
8 years ago |
Madawa Soysa
|
c29bf24a75
|
Adding mobile devices to default groupes based on device ownership
Adding mobile devices to default system generated groups based on the device ownership (BYOD, COPE)
|
8 years ago |
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
8 years ago |
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
ayyoob
|
44ac6b13b5
|
changes in UI after refactoring
|
8 years ago |
charitha
|
ac30e7eb3e
|
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
|
8 years ago |
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
8 years ago |
charitha
|
1bfba25c5e
|
Remove user list and role list attributes from group object
Move group components to same devicemgt package levels
|
8 years ago |
charitha
|
5f68953b11
|
Merge branch 'master' into IoTS-1.0.0
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
|
8 years ago |
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
charitha
|
670ca7c228
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
|
8 years ago |
madhawap
|
7b8518a9db
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
8 years ago |
charitha
|
ce5d63925a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
charitha
|
e89b4015b6
|
Introduced pagination
|
8 years ago |
Shavindri
|
f0164b5a01
|
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
8 years ago |
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
8 years ago |
charitha
|
d1d6eefd17
|
Upgrading grouping backend
|
8 years ago |
Chatura Dilan Perera
|
c16cc4cae1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
ed4bca7032
|
[maven-release-plugin] prepare release v1.2.2
|
8 years ago |
warunalakshitha
|
25ed0cf370
|
Fix build issue with swagger version
|
8 years ago |
warunalakshitha
|
397c1daa2a
|
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
|
8 years ago |
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
8 years ago |
Ace
|
154a6082ce
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
|
8 years ago |
Ace
|
33d8829540
|
Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
|
8 years ago |
Ace
|
87ad1e0e71
|
Fixing intermittent jackson bind issue
|
8 years ago |
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
8 years ago |
harshanl
|
75df243a33
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Ace
|
6a8a5cbd5a
|
Merging with master
|
8 years ago |
harshanl
|
4169d3b2bd
|
Fixed EMM-1554
|
8 years ago |
Rasika Perera
|
d9b25eda08
|
Adding deviceName into notifications
|
8 years ago |
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
thusithakalugamage
|
0d02e88955
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
kamidu
|
878daae5c5
|
Permission modifications
|
8 years ago |
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
mharindu
|
115099c8fe
|
Implemented permission based authorization
|
8 years ago |
mharindu
|
24930b3042
|
Partial commit of migration
|
8 years ago |
kamidu
|
cd77ce692e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
kamidu
|
abb3aea9a9
|
fixes for notification isses
|
8 years ago |
harshanl
|
a77564ac2d
|
Added status for each device in Activity response
|
8 years ago |
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
8 years ago |
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
8 years ago |
hasuniea
|
6db619317c
|
fixing app-install issue
|
8 years ago |
mharindu
|
7346313d27
|
Modified scope management service
|
8 years ago |
harshanl
|
671ba46fae
|
Removed unnecessary properties from EnrollmentInfo object
|
8 years ago |
hasuniea
|
349c3bdb63
|
fixing App Version not updating in portal after being initially set
|
8 years ago |
harshanl
|
8fa311e119
|
Removed unnecessary properties from EnrollmentInfo object
|
8 years ago |
harshanl
|
f82ce82648
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
8 years ago |
mharindu
|
eb5216091e
|
Fixed conflicts and merged
|
8 years ago |
madhawap
|
d315e739e4
|
fix for the iOS device operations blocker
|
8 years ago |
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
8 years ago |
Chatura Dilan
|
7af8ecc686
|
Added userstore for role listing
|
8 years ago |
mharindu
|
827567733c
|
Fixed scope update issue in API update
|
8 years ago |
mharindu
|
b3d309583d
|
Fixed issues in scope service
|
8 years ago |
mharindu
|
7f1e2fdf0b
|
Implemented scope management service
|
8 years ago |
mharindu
|
0f904e21d8
|
Fixed conflicts and merged
|
8 years ago |
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
8 years ago |
mharindu
|
ac75ff1d71
|
Fixed conflict and merged
|
9 years ago |
mharindu
|
49623a4693
|
Implemented scope based authorization
|
9 years ago |
Chatura Dilan
|
2befefc967
|
Added OS build date
|
9 years ago |
madhawap
|
b55a164457
|
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
|
9 years ago |
madhawap
|
dbf938416b
|
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
|
9 years ago |
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
9 years ago |
madhawap
|
88feb5a852
|
Add Pagination to Notification end points
|
9 years ago |
prabathabey
|
3813856be8
|
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
|
9 years ago |
geethkokila
|
c07914eb36
|
Adding the activity count for the activty paginantion
|
9 years ago |
geethkokila
|
236eb90ce2
|
Fixing the limit and offset for activity
|
9 years ago |
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
9 years ago |
inoshperera
|
d71f0c6e6d
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
inoshperera
|
037acbe5bb
|
fixing platform configuration appearing twice issue.
|
9 years ago |
prabathabey
|
1a29a9f58f
|
Further fixing retrieving application list with device info
|
9 years ago |
prabathabey
|
d3ce96585f
|
Fixing issues in returning application list in the device response
|
9 years ago |
prabathabey
|
b24250f3f2
|
Returning device info within the device bean itself
|
9 years ago |
prabathabey
|
fe22bfc125
|
Renaming 'recieved' to 'received'
|
9 years ago |
hasuniea
|
dfc673b08f
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
hasuniea
|
1443c7757e
|
fixing code issues
|
9 years ago |
prabathabey
|
fc3d6cccbf
|
Fixing Issues in notification management APIs
|
9 years ago |
charitha
|
e2c03adec4
|
FIx for https://wso2.org/jira/browse/IOTS-169
|
9 years ago |
hasuniea
|
9c3c08b4ca
|
fix UnAuthorizedDeviceAccessException.java
|
9 years ago |
prabathabey
|
5ed982beb4
|
Adding more improvements to the JAX-RS APIs of CDM-F
|
9 years ago |
prabathabey
|
fd7a137b07
|
Improving jax-rs APIS of CDM-F
|
9 years ago |
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
9 years ago |
inoshperera
|
db3dc0517b
|
adding activity status related details.
|
9 years ago |
prabathabey
|
425c0e7498
|
Improving swagger annotations of CDM-F core APIs further
|
9 years ago |
geethkokila
|
62c84319d8
|
Fixing the device search for application list
|
9 years ago |
prabathabey
|
37aa05f79c
|
Committing improved swagger annotated cdm-f APIs
|
9 years ago |
geethkokila
|
6328d35797
|
Changing the device info object by adding the application list
|
9 years ago |
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
9 years ago |
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
9 years ago |
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
9 years ago |
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
9 years ago |
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
9 years ago |
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
9 years ago |
ayyoob
|
51d46213c2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
9 years ago |
Madhawa Perera
|
43648e4692
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
b5741b420c
|
Adding swagger annotations to beans
|
9 years ago |
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
9 years ago |
ayyoob
|
48912a05bb
|
merged with upstream
|
9 years ago |
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
9 years ago |
Madhawa Perera
|
26c10f84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
66c12a8b1c
|
Adding swagger annotations to beans
|
9 years ago |
geethkokila
|
3bec779e0b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
9 years ago |
inosh-perera
|
797c7a02d0
|
adding swagger annotation to beans
|
9 years ago |
Madhawa
|
07c5362104
|
Adding swagger annotations to beans and some modifications to api interfaces
|
9 years ago |
inosh-perera
|
c945d63038
|
fixing issues in swagger dependancy
|
9 years ago |
ayyoob
|
ec7727e8bf
|
removed method and type from features
|
9 years ago |