prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
2016-05-26 18:00:45 +05:30 |
|
ayyoob
|
5532db6dd4
|
Fixed https://wso2.org/jira/browse/IOTS-177
|
2016-05-26 17:10:37 +05:30 |
|
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-26 12:53:20 +05:30 |
|
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
2016-05-26 12:52:49 +05:30 |
|
mharindu
|
52388ed33d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-26 12:44:36 +05:30 |
|
mharindu
|
106be76118
|
Fixed issues of API publishing to gateway
|
2016-05-26 12:41:20 +05:30 |
|
hasuniea
|
c281b6a6f0
|
SCEP csr sign feature
|
2016-05-25 18:14:28 +05:30 |
|
hasuniea
|
7281abf876
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 18:11:29 +05:30 |
|
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
2016-05-25 17:59:12 +05:30 |
|
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
2016-05-25 17:45:37 +05:30 |
|
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
2016-05-25 17:37:21 +05:30 |
|
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
2016-05-25 16:26:29 +05:30 |
|
Milan Perera
|
67e5a5a23a
|
Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
|
2016-05-25 14:56:36 +05:30 |
|
GPrathap
|
78475963e3
|
added entry for websocket url
|
2016-05-25 14:38:46 +05:30 |
|
inoshperera
|
deb4195f7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 13:54:42 +05:30 |
|
hasuniea
|
ad1a4cbd6a
|
fixed code conflicts
|
2016-05-25 13:51:46 +05:30 |
|
hasuniea
|
e2e517d7ca
|
SCEP endpoint
|
2016-05-25 13:44:42 +05:30 |
|
inoshperera
|
a40e44899a
|
syncing REST apis of core and product EMM
|
2016-05-25 12:38:24 +05:30 |
|
Ruwan
|
98f8ace1ff
|
Merge pull request #274 from rasika90/master
Adding licence headers for server-side handlebar templates
|
2016-05-25 11:45:12 +05:30 |
|
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
2016-05-25 11:42:44 +05:30 |
|
Rasika Perera
|
d7f4a39075
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 11:34:51 +05:30 |
|
Rasika Perera
|
b879927dc1
|
Adding licence headers for handlebar templates
|
2016-05-25 11:28:24 +05:30 |
|
geethkokila
|
afba711969
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 08:16:14 +05:30 |
|
dilanua
|
7530a98f6b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-24 18:27:06 +05:30 |
|
dilanua
|
339512e287
|
Updating comments in dashboard analytics feature
|
2016-05-24 18:26:47 +05:30 |
|
inoshperera
|
d7fe6d5e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-24 17:46:17 +05:30 |
|
Milan Perera
|
356c8f125e
|
Merge pull request #273 from ayyoob/transport
added webapp publisher missing bundle
|
2016-05-24 15:44:17 +05:30 |
|
ayyoob
|
feaf6b2b35
|
added webapp publisher missing bundle
|
2016-05-24 15:35:48 +05:30 |
|
dilanua
|
4663d78060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 17:14:52 +05:30 |
|
dilanua
|
47e17e4a51
|
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
|
2016-05-23 17:14:29 +05:30 |
|
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 16:51:38 +05:30 |
|
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
2016-05-23 16:51:26 +05:30 |
|
inosh
|
1341884957
|
resolving conflicts
|
2016-05-23 14:14:05 +05:30 |
|
inosh
|
60b42715d6
|
syncing admin api from product emm
|
2016-05-23 14:11:25 +05:30 |
|
geethkokila
|
16b809b255
|
Fixing the conflicts
|
2016-05-23 11:21:48 +05:30 |
|
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:37 +05:30 |
|
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:22 +05:30 |
|
Prabath Abeysekara
|
830b3fc075
|
Merge pull request #272 from wso2/release-1.1.0
Release 1.1.0 and upgrading the versions
|
2016-05-23 10:08:13 +05:30 |
|
dilanua
|
8c4752ede3
|
Adding more comments to dashboard analytics data service interface
|
2016-05-22 16:54:07 +05:30 |
|
dilanua
|
975a3b915f
|
Properly layering beans and custom exceptions in dashboard analytics feature
|
2016-05-22 08:12:25 +05:30 |
|
dilanua
|
a7c7452e2e
|
Adding final updates to dashboard analytics feature
|
2016-05-20 17:10:37 +05:30 |
|
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 16:43:16 +05:30 |
|
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
2016-05-20 16:43:02 +05:30 |
|
mharindu
|
65612f724f
|
Fixed compile issue
|
2016-05-20 16:02:56 +05:30 |
|
mharindu
|
8746c228f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-20 15:53:06 +05:30 |
|
mharindu
|
2dbcf86f3d
|
Added retrying mechanism to webapp publisher
|
2016-05-20 15:52:50 +05:30 |
|
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
2016-05-20 12:43:47 +05:30 |
|
dilanua
|
b9a9fb3169
|
Adding class & method comments, constants to dashboard analytics feature
|
2016-05-19 12:37:12 +05:30 |
|
Ace
|
083e0f6eaa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-19 08:22:54 +05:30 |
|
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
2016-05-19 08:22:29 +05:30 |
|
ayyoob
|
e8a66a7a37
|
resolved build issue
|
2016-05-19 02:46:05 +05:30 |
|
mharindu
|
52b300c06a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-19 00:42:27 +05:30 |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
2016-05-19 00:42:14 +05:30 |
|
sumedharubasinghe
|
ae93e0c9a7
|
Merge pull request #268 from ayyoob/transport
resolving create application issues
|
2016-05-19 00:40:20 +05:30 |
|
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
2016-05-19 00:30:41 +05:30 |
|
ayyoob
|
8a38abbae6
|
resolving create application issues
|
2016-05-19 00:26:34 +05:30 |
|
prabathabey
|
5e03c5ed30
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-19 00:20:57 +05:30 |
|
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
2016-05-19 00:20:45 +05:30 |
|
Ruwan
|
99c2446dc8
|
Merge pull request #267 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
2016-05-19 00:14:33 +05:30 |
|
charitha
|
7eb111078a
|
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
2016-05-19 00:07:40 +05:30 |
|
sumedharubasinghe
|
067f0a8050
|
Merge pull request #266 from ayyoob/transport
added api application registration filter
|
2016-05-18 23:17:43 +05:30 |
|
mharindu
|
bca1b4b059
|
Fixed conflicts
|
2016-05-18 22:01:38 +05:30 |
|
mharindu
|
9f93570b29
|
Fixed issues in webapp-publisher
|
2016-05-18 22:00:16 +05:30 |
|
ayyoob
|
ba47af3186
|
added api application registration filter
|
2016-05-18 19:33:04 +05:30 |
|
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
2016-05-18 18:48:43 +05:30 |
|
geethkokila
|
958288f8ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-18 14:57:01 +05:30 |
|
geethkokila
|
c7dd386c94
|
Adding new apis for device informations
|
2016-05-18 14:56:46 +05:30 |
|
dilanua
|
2886ead44b
|
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
|
2016-05-18 14:26:43 +05:30 |
|
mharindu
|
49cb4787c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-18 11:49:35 +05:30 |
|
mharindu
|
82b90522a0
|
Migrated to APIM 5.0.4
|
2016-05-18 11:49:20 +05:30 |
|
sumedharubasinghe
|
61ef87c658
|
Merge pull request #265 from rasika90/IOTS-114
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
2016-05-18 11:26:18 +05:30 |
|
Rasika Perera
|
bc3f64a77a
|
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
2016-05-18 11:24:38 +05:30 |
|
charitha
|
075b5a8901
|
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
|
2016-05-18 10:10:21 +05:30 |
|
sumedharubasinghe
|
6a69a3a895
|
Merge pull request #261 from charithag/master
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
2016-05-18 02:20:00 +05:30 |
|
sumedharubasinghe
|
2f6c1dfbdd
|
Merge pull request #263 from ayyoob/transport
few fixes in JWT client after testing with multi tenancy
|
2016-05-18 02:18:33 +05:30 |
|
ayyoob
|
c0240c5cbc
|
few fixes in JWT client after testing with multi tenancy
|
2016-05-18 02:09:12 +05:30 |
|
charitha
|
aadf87e5d9
|
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
2016-05-17 23:33:33 +05:30 |
|
Rasika Perera
|
be970bfc9d
|
Fixing IOTS-117 Domain needs to be marked as a mandatory field
|
2016-05-17 23:05:32 +05:30 |
|
mharindu
|
89026c2b7f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-17 20:33:23 +05:30 |
|
charitha
|
6dc0a9dd38
|
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
2016-05-17 18:40:39 +05:30 |
|
mharindu
|
894e11c1c4
|
Fixed the JWT verifier issue
|
2016-05-17 15:39:16 +05:30 |
|
mharindu
|
9ebf2ab6d9
|
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
|
2016-05-17 15:33:17 +05:30 |
|
charitha
|
ddc47cd862
|
Fix for https://wso2.org/jira/browse/IOTS-161
|
2016-05-17 14:25:28 +05:30 |
|
charitha
|
0ccaa9fe81
|
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
|
2016-05-17 13:57:47 +05:30 |
|
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-17 12:25:57 +05:30 |
|
mharindu
|
efc9fc3265
|
Fixed conflicts
|
2016-05-17 08:58:54 +05:30 |
|
mharindu
|
16a8f61f79
|
Refactored jwt authenticator
|
2016-05-17 08:48:55 +05:30 |
|
dilanua
|
d5950afe7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-17 05:55:05 +05:30 |
|
dilanua
|
c90f4471a8
|
Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
|
2016-05-17 05:54:40 +05:30 |
|
charitha
|
9480c71522
|
Fixed script error
|
2016-05-16 21:57:48 +05:30 |
|
charitha
|
e0fc7c4018
|
Fix for https://wso2.org/jira/browse/IOTS-110
|
2016-05-16 21:01:33 +05:30 |
|
ayyoob
|
cbdf5dd175
|
added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504
|
2016-05-16 20:41:30 +05:30 |
|
ayyoob
|
2ceff61811
|
refactors jet authenticator to pick tenant specific key store
|
2016-05-16 19:44:31 +05:30 |
|
charitha
|
81524ae32c
|
Fix for https://wso2.org/jira/browse/IOTS-156
|
2016-05-16 18:37:49 +05:30 |
|
mharindu
|
ace6c2dbfc
|
Fixed issues in JWT Authenticator
|
2016-05-16 18:13:00 +05:30 |
|
charitha
|
3d9ae8d1f6
|
Fix for https://wso2.org/jira/browse/IOTS-152
|
2016-05-16 17:50:58 +05:30 |
|
charitha
|
e7c5ef78d0
|
Removed unnecessary jaggery apis
|
2016-05-16 17:03:36 +05:30 |
|
mharindu
|
b77f5358e8
|
Removed external dependancies from webapp publisher component
|
2016-05-16 14:23:52 +05:30 |
|
mharindu
|
83ec18c38d
|
Removed external dependancies from webapp publisher component
|
2016-05-16 14:20:34 +05:30 |
|
mharindu
|
c68b92c7b4
|
Fixed conflicts
|
2016-05-16 14:12:28 +05:30 |
|
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-16 11:55:35 +05:30 |
|
mharindu
|
659cdcc50c
|
Implemented extended scope validator and improved webapp publisher to support Synapse
|
2016-05-16 11:47:04 +05:30 |
|
mharindu
|
f2ac5c5cad
|
Implemented extended scope validator and improved webapp publisher to support Synapse
|
2016-05-16 11:46:30 +05:30 |
|
Ruwan
|
8f0840e3df
|
Merge pull request #254 from ayyoob/transport
updated authentication in api
|
2016-05-15 20:07:02 +05:30 |
|
ayyoob
|
168033b19d
|
updated authentication in api
|
2016-05-15 17:46:13 +05:30 |
|
charitha
|
685c52a453
|
Bug fixes
|
2016-05-15 13:13:30 +05:30 |
|
Ace
|
cbc505c459
|
changing profile name
|
2016-05-15 01:35:57 +05:30 |
|
Ace
|
4517a7f1aa
|
Making API publish destination configurable and other changes
|
2016-05-15 01:15:11 +05:30 |
|
Ace
|
6d9f2f92a4
|
Making API publish destination configurable
|
2016-05-15 01:12:45 +05:30 |
|
ayyoob
|
b3075cf1bc
|
removing application related roles
|
2016-05-14 00:10:39 +05:30 |
|
ayyoob
|
51d46213c2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-05-13 15:03:11 +05:30 |
|
charitha
|
973e1ce40f
|
Fix issues in group api
|
2016-05-13 13:52:35 +05:30 |
|
charitha
|
0a838923cb
|
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/api/Group.java
|
2016-05-13 12:43:53 +05:30 |
|
Madhawa Perera
|
43648e4692
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 08:07:44 +05:30 |
|
Madhawa Perera
|
b5741b420c
|
Adding swagger annotations to beans
|
2016-05-13 08:07:28 +05:30 |
|
prabathabey
|
71180e686e
|
Improving swagger annotations
|
2016-05-13 07:39:09 +05:30 |
|
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
2016-05-13 07:12:03 +05:30 |
|
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
2016-05-13 07:07:55 +05:30 |
|
ayyoob
|
48912a05bb
|
merged with upstream
|
2016-05-13 05:23:19 +05:30 |
|
prabathabey
|
9e4b4d2205
|
Improving swagger annotations
|
2016-05-13 04:02:42 +05:30 |
|
ayyoob
|
bee9a106cc
|
removed method and type from feature
|
2016-05-13 02:53:08 +05:30 |
|
Madhawa Perera
|
94aacb1625
|
Adding swagger annotations to beans
|
2016-05-13 02:38:10 +05:30 |
|
Madhawa Perera
|
fca80273bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 01:39:43 +05:30 |
|
Madhawa Perera
|
5d1bf67630
|
Adding swagger annotations to beans
|
2016-05-13 01:31:33 +05:30 |
|
inosh-perera
|
b2383617e1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 01:30:22 +05:30 |
|
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
2016-05-13 01:30:17 +05:30 |
|
Madhawa Perera
|
6227e93d2f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 01:25:44 +05:30 |
|
Madhawa Perera
|
087adafeb7
|
Adding swagger annotations to beans
|
2016-05-13 01:25:29 +05:30 |
|
geethkokila
|
ccea046240
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 01:10:10 +05:30 |
|
geethkokila
|
4e4e660fa1
|
Adding the swagger documentation to the activity id resource
|
2016-05-13 01:09:56 +05:30 |
|
Madhawa Perera
|
26c10f84ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-13 00:34:54 +05:30 |
|
Madhawa Perera
|
66c12a8b1c
|
Adding swagger annotations to beans
|
2016-05-13 00:34:38 +05:30 |
|
geethkokila
|
3bec779e0b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-13 00:27:27 +05:30 |
|
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
2016-05-13 00:25:13 +05:30 |
|
inosh-perera
|
797c7a02d0
|
adding swagger annotation to beans
|
2016-05-13 00:24:59 +05:30 |
|
Madhawa
|
07c5362104
|
Adding swagger annotations to beans and some modifications to api interfaces
|
2016-05-12 23:11:23 +05:30 |
|
mharindu
|
ed1eb217ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-12 23:03:15 +05:30 |
|
inosh-perera
|
c945d63038
|
fixing issues in swagger dependancy
|
2016-05-12 23:01:21 +05:30 |
|
Madhawa
|
85f485df4c
|
Few changes to interfaces with swagger annotations
|
2016-05-12 22:19:17 +05:30 |
|
Madhawa
|
b6e7827920
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-12 22:12:35 +05:30 |
|
Madhawa
|
fffc7f3205
|
Adding swagger annotations to beans
|
2016-05-12 22:12:23 +05:30 |
|
Hasunie
|
17f3a10ec4
|
Merge pull request #243 from hasuniea/master
added annotation for ConfigurationEntry
|
2016-05-12 22:04:56 +05:30 |
|
ayyoob
|
ec7727e8bf
|
removed method and type from features
|
2016-05-12 22:01:48 +05:30 |
|
mharindu
|
fd39b31369
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-12 22:00:24 +05:30 |
|
mharindu
|
1f21144668
|
Renamed EMM permission to CDMF
|
2016-05-12 22:00:15 +05:30 |
|
hasuniea
|
e633d28013
|
added annotation for ConfigurationEntry
|
2016-05-12 22:00:09 +05:30 |
|
Madhawa
|
ae13f7f889
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
2016-05-12 21:58:34 +05:30 |
|
Madhawa
|
707da02c7e
|
Adding swagger annotations to beans
|
2016-05-12 21:58:23 +05:30 |
|
Kasun Delgolla
|
da1a60615c
|
Merge pull request #239 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
|
2016-05-12 21:49:13 +05:30 |
|
hasuniea
|
e4dfe63548
|
code conflicts
|
2016-05-12 21:15:53 +05:30 |
|
hasuniea
|
1267db52ce
|
added swagger annotations for TenantConfiguration
|
2016-05-12 21:11:51 +05:30 |
|
Milan Perera
|
fb9c824e40
|
Merge pull request #241 from ayyoob/transport
Few fixes after testing
|
2016-05-12 20:26:56 +05:30 |
|
inoshperera
|
97db3e42d6
|
Merge pull request #242 from madhawap/master
Added swagger annotations to the interfaces
|
2016-05-12 20:24:42 +05:30 |
|
inosh-perera
|
5597c752ac
|
Adding sawgger annotations to admin Jax-rs apis.
|
2016-05-12 20:17:20 +05:30 |
|
Madhawa
|
783d5e1746
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
added swagger annotation to the interfaces
|
2016-05-12 20:17:09 +05:30 |
|
Madhawa
|
b407797ab0
|
added swagger annotation to the interfaces
|
2016-05-12 20:16:52 +05:30 |
|
ayyoob
|
34f1f4dfe2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-05-12 13:41:08 +05:30 |
|
inoshperera
|
cdb91924e2
|
Merge pull request #240 from madhawap/master
Interfaces for the existing api classes in order to add swagger definitions
|
2016-05-12 11:37:43 +05:30 |
|
Madhawa
|
36c3a057dc
|
created interfaces for the api classes in order add swagger definitions
|
2016-05-12 11:25:20 +05:30 |
|
inosh-perera
|
db5dafa9e9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-12 10:38:07 +05:30 |
|
inosh-perera
|
67b210fe86
|
adding mutual ssl support in clustered setup
|
2016-05-12 10:37:58 +05:30 |
|
Madhawa
|
f5915cbf5d
|
created interfaces for the api classes in order add swagger definitions
|
2016-05-12 10:32:49 +05:30 |
|
Madhawa
|
46e0c4ea8b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Created interfaces for the api classes in order to add swagger definitions.
|
2016-05-12 09:52:33 +05:30 |
|
Madhawa
|
7b04d9f0b0
|
created interfaces for the api classes in order add swagger definitions
|
2016-05-12 09:51:43 +05:30 |
|
ayyoob
|
ac587c3353
|
fixes after testing
|
2016-05-12 02:42:29 +05:30 |
|
dilanua
|
bb3bcdfd2d
|
Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
|
2016-05-11 20:01:02 +05:30 |
|
charitha
|
18957b0110
|
Add required jagerry modules for the app
|
2016-05-11 19:30:55 +05:30 |
|
charitha
|
0c8f1ce770
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 16:54:06 +05:30 |
|
charitha
|
73222e347b
|
Fixed https://wso2.org/jira/browse/IOTS-104
|
2016-05-11 15:59:35 +05:30 |
|
hasuniea
|
a675c02350
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 15:23:39 +05:30 |
|
dilanua
|
14c07846b2
|
Adding mssql support to dashboard analytics feature
|
2016-05-11 14:21:13 +05:30 |
|
prabathabey
|
285c870d6a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 12:40:28 +05:30 |
|
prabathabey
|
bc894f2517
|
Adding Swagger-annotation dependency to carbon-device-mgt
|
2016-05-11 12:38:15 +05:30 |
|
hasuniea
|
c98a162174
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 11:36:12 +05:30 |
|
mharindu
|
b58e2b13c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 10:50:46 +05:30 |
|
mharindu
|
5ad8d2938e
|
Fixed issues of publishing APIs to synapse gateway
|
2016-05-11 10:50:32 +05:30 |
|
Ruwan
|
93b1d618b6
|
Merge pull request #237 from charithag/master
Enable group analytics
|
2016-05-10 21:45:39 +05:30 |
|
charitha
|
576a7d83ad
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-10 21:33:46 +05:30 |
|
charitha
|
7ff993a7b7
|
Enable group analytics
|
2016-05-10 21:31:51 +05:30 |
|
dilanua
|
4cabe359a0
|
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
|
2016-05-10 18:53:41 +05:30 |
|
dilanua
|
0534cd0a7e
|
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
|
2016-05-10 18:52:44 +05:30 |
|
dilanua
|
adec59e934
|
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
|
2016-05-10 15:26:20 +05:30 |
|
dilanua
|
2a9e2a47e8
|
Adding inter-mediate code improvements to dashboard analytics feature
|
2016-05-10 07:26:49 +05:30 |
|
dilanua
|
0ab4035b37
|
Adding H2, MySQL Support for dashboard analytics feature
|
2016-05-09 12:33:11 +05:30 |
|
hasuniea
|
ddc87d6726
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-09 11:12:57 +05:30 |
|
dilanua
|
a23e578537
|
Adding inter-mediate development code bits for dashboard analytics feature
|
2016-05-08 17:43:05 +05:30 |
|
dilanua
|
17e958d838
|
Adding inter-mediate development code bits for dashboard analytics feature
|
2016-05-08 17:42:01 +05:30 |
|
ayyoob
|
0b6acdc929
|
Added file seperator
|
2016-05-08 02:44:24 +05:30 |
|
hasuniea
|
245e90e6f6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-06 12:54:05 +05:30 |
|
dilanua
|
7b43d28298
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-06 12:54:04 +05:30 |
|
dilanua
|
d568c6e8bd
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-05 16:12:15 +05:30 |
|
dilanua
|
945e188917
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-05 12:03:11 +05:30 |
|
dilanua
|
82ffcb012b
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-05 11:51:31 +05:30 |
|
dilanua
|
9786908b35
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-05 11:49:09 +05:30 |
|
hasuniea
|
686774068a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-05 10:26:01 +05:30 |
|
Rasika Perera
|
18edc21a04
|
Adding group permissions validation for operations
|
2016-05-04 04:14:09 +05:30 |
|
Rasika Perera
|
5c680b3f65
|
Fixing issue on group permission validating
|
2016-05-04 04:13:39 +05:30 |
|
sumedharubasinghe
|
d7064c9230
|
Merge pull request #233 from ayyoob/das-ext
removed unused code
|
2016-05-04 03:14:35 +05:30 |
|
Charitha Goonetilleke
|
ca62c2ef73
|
Fix grouped device listing
|
2016-05-04 02:47:45 +05:30 |
|
Charitha Goonetilleke
|
e01b62086f
|
Fix parameter mismatch
|
2016-05-04 01:47:50 +05:30 |
|
ayyoob
|
442f8c38fe
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
|
2016-05-04 01:20:18 +05:30 |
|
ayyoob
|
5f302fce63
|
removed unused code and resolved host issues
|
2016-05-04 01:19:56 +05:30 |
|
Charitha Goonetilleke
|
8c62d9d64c
|
Add authorization check for shared devices in groups
|
2016-05-04 00:07:48 +05:30 |
|
Charitha Goonetilleke
|
92784120bd
|
Add group sharing UI functionality
|
2016-05-03 23:28:26 +05:30 |
|
Charitha Goonetilleke
|
d15e52491a
|
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
|
2016-05-03 19:57:36 +05:30 |
|
Rasika Perera
|
33eed1f6cd
|
Adding permissions for roles updating
|
2016-05-03 19:52:52 +05:30 |
|
Rasika Perera
|
b6c33a0aec
|
Fixing group roles listing
|
2016-05-03 19:49:09 +05:30 |
|
Charitha Goonetilleke
|
b705352fb7
|
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
|
2016-05-03 19:32:05 +05:30 |
|
Charitha Goonetilleke
|
f74a5b7a59
|
Merge remote-tracking branch 'rasika/master'
|
2016-05-03 19:31:31 +05:30 |
|
Rasika Perera
|
938eda7c46
|
Adding group permissions checking
|
2016-05-03 19:29:12 +05:30 |
|
Rasika Perera
|
9cb24d8cec
|
Adding enum to hold default role to default permissions mapping
|
2016-05-03 19:18:58 +05:30 |
|
Rasika Perera
|
142ab10eea
|
Code refactoring
|
2016-05-03 19:18:07 +05:30 |
|
hasuniea
|
5f8a41eb12
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-03 16:02:15 +05:30 |
|
Rasika Perera
|
64a262d3e4
|
Fixing 404 on groups listing
|
2016-05-03 15:34:50 +05:30 |
|
Rasika Perera
|
4eb588ac60
|
Group Constants moved to common
|
2016-05-03 14:37:34 +05:30 |
|
geethkokila
|
d32e822055
|
Fixing the shutdown errors
|
2016-05-03 14:10:30 +05:30 |
|
Rasika Perera
|
38cdd94f3c
|
Adding group permission checking for Device Access Authorizations
|
2016-05-03 00:33:19 +05:30 |
|
dilanua
|
af973dacc6
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-02 18:45:23 +05:30 |
|
Rasika Perera
|
07c0aa1045
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-02 18:12:03 +05:30 |
|
dilanua
|
d9015b92a0
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-02 15:27:32 +05:30 |
|
dilanua
|
c828a5264b
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-02 15:15:45 +05:30 |
|
geethkokila
|
a0d260e6a3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-02 14:36:52 +05:30 |
|
geethkokila
|
e2d67fc92c
|
Adding the changes for device search
|
2016-05-02 14:36:14 +05:30 |
|
Kasun Delgolla
|
d1def26602
|
Committing group listing back end pagination UI
|
2016-05-02 12:56:22 +05:30 |
|
dilanua
|
f2f153a2b4
|
Adding temporary development code bits for dashboard analytics feature
|
2016-05-01 09:51:09 +05:30 |
|
geethkokila
|
f200f37c80
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-30 19:37:38 +05:30 |
|
geethkokila
|
f2128762f0
|
Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them
|
2016-04-30 19:37:23 +05:30 |
|
inosh-perera
|
486190f182
|
adding more error logs for client certificate not present scenario
|
2016-04-30 14:44:22 +05:30 |
|
geethkokila
|
c0dd2c423e
|
Fixing the build failure on java 8
|
2016-04-29 22:44:01 +05:30 |
|
geethkokila
|
3396a5066d
|
Adding changes for the updated time of device info and device location
|
2016-04-29 22:30:07 +05:30 |
|
hasuniea
|
59f1d04c44
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-29 19:30:33 +05:30 |
|
geethkokila
|
d4f2a95972
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-29 17:35:13 +05:30 |
|
charithag
|
fd531555a3
|
Fix bugs
|
2016-04-29 13:34:46 +05:30 |
|
charithag
|
a2cb6937c1
|
Fix device listing page title
|
2016-04-29 12:46:53 +05:30 |
|
charithag
|
68361f01ed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-29 12:30:00 +05:30 |
|
geethkokila
|
aa3e7a9eda
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-29 11:03:18 +05:30 |
|
dilanua
|
b8972c9019
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-29 05:40:34 +05:30 |
|
geethkokila
|
3dd830c7d0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 19:53:56 +05:30 |
|
geethkokila
|
6f9851413e
|
Adding the changes for operation activity id
|
2016-04-28 19:53:42 +05:30 |
|
dilanua
|
330e1a1e19
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 18:11:44 +05:30 |
|
dilanua
|
46117b4e84
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-28 18:10:52 +05:30 |
|
hasuniea
|
441d2e171f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 17:50:30 +05:30 |
|
mharindu
|
548f71ca2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 16:43:24 +05:30 |
|
mharindu
|
c824e63f1e
|
Refactored and fixed findbug issues in OAuth extension
|
2016-04-28 16:43:13 +05:30 |
|
mharindu
|
04fa0f4874
|
Implemented new password grant handler
|
2016-04-28 14:50:52 +05:30 |
|
mharindu
|
6db9b21623
|
Code cleanup in webapp publisher
|
2016-04-28 14:49:34 +05:30 |
|
dilanua
|
49513ba79b
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-28 14:26:22 +05:30 |
|
dilanua
|
b9be51d50d
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-28 12:18:43 +05:30 |
|
mharindu
|
6f8bb64e1c
|
Fixed merge conflicts
|
2016-04-28 11:59:03 +05:30 |
|
mharindu
|
ffc7542d4d
|
Modified authorization to support API gateway
|
2016-04-28 11:36:34 +05:30 |
|
hasuniea
|
61e7324f41
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 10:49:48 +05:30 |
|
charithag
|
25ea00f26f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 08:02:55 +05:30 |
|
charithag
|
b1683c1ccb
|
Add capability to assign device in to a group and bug fixes
|
2016-04-28 08:01:46 +05:30 |
|
dilanua
|
053d14b317
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-28 06:28:13 +05:30 |
|
Ace
|
a06327b731
|
refactoring and bug fixes
|
2016-04-27 20:43:13 +05:30 |
|
geethkokila
|
5a77e08fd5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 17:57:05 +05:30 |
|
charithag
|
6e84f0a5a3
|
Fix font issue
|
2016-04-27 16:37:05 +05:30 |
|
charithag
|
2a006684cc
|
Fix formatting
|
2016-04-27 16:07:14 +05:30 |
|
charithag
|
fb52c5845d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 15:41:41 +05:30 |
|
charithag
|
bcbde92143
|
Update new analytics components.
|
2016-04-27 15:40:49 +05:30 |
|
dilanua
|
36e5357cfd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 15:21:30 +05:30 |
|
Ace
|
985d07cbc7
|
Cleaning up code
|
2016-04-27 14:53:12 +05:30 |
|
dilanua
|
2a55c50ad1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 13:58:58 +05:30 |
|
dilanua
|
2b62eac4f5
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-27 13:58:53 +05:30 |
|
charithag
|
1e709bc394
|
Update new analytics components and remove obsoletes.
|
2016-04-27 13:43:37 +05:30 |
|
geethkokila
|
4029c86da4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 10:26:51 +05:30 |
|
geethkokila
|
2fb42518b6
|
Adding the changes for the device group with policy.
|
2016-04-27 10:26:47 +05:30 |
|
charithag
|
f6281c8ef0
|
Add jax-rs endpoints to modify and remove devices.
Update clientside js to work with secured apis
|
2016-04-26 20:50:39 +05:30 |
|
Charitha Goonetilleke
|
15a6e4b63b
|
Fix formatting issues
|
2016-04-26 19:54:19 +05:30 |
|
charithag
|
d8a9b642ff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-26 18:57:25 +05:30 |
|
charithag
|
42d11b9d78
|
Add tenant aware dynamic units routing
|
2016-04-26 18:56:41 +05:30 |
|
prabathabey
|
52b81dd3eb
|
Fixing compilation failures
|
2016-04-26 17:38:16 +05:30 |
|
prabathabey
|
f5f177a858
|
Wrapping all device provisioning related info in ProvisioningConfig
|
2016-04-26 17:16:48 +05:30 |
|
prabathabey
|
779ed5eac2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-26 16:43:45 +05:30 |
|
prabathabey
|
9068a3d893
|
Fixing compilation failures caused due to API changes
|
2016-04-26 16:40:30 +05:30 |
|
Prabath Abeysekara
|
6ddd5db8cc
|
Merge pull request #221 from ayyoob/das-ext
Added device type specific graph loader
|
2016-04-26 16:35:43 +05:30 |
|
prabathabey
|
2133762792
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-26 15:59:34 +05:30 |
|
prabathabey
|
95d3b97c5f
|
Code cleanup
|
2016-04-26 15:59:22 +05:30 |
|
ayyoob
|
e0f47cba19
|
Added device type specific graph loader
|
2016-04-26 15:58:21 +05:30 |
|
charithag
|
6d5635465e
|
Add missing UI functionalities
|
2016-04-26 15:49:44 +05:30 |
|
Ruwan
|
f04705dda5
|
Merge pull request #213 from charithag/patch-1
Fix formatting
|
2016-04-26 11:45:29 +05:30 |
|
charithag
|
61b43ce5d8
|
Rename packages in device mgt jax-rs apis
|
2016-04-26 11:42:51 +05:30 |
|
Rasika Perera
|
22031c476c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-26 11:36:03 +05:30 |
|
charithag
|
646d87968c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-25 22:37:34 +05:30 |
|
charithag
|
dfb7e9a9c8
|
Fix permissions
|
2016-04-25 22:36:41 +05:30 |
|
prabathabey
|
aef892fece
|
Code cleanup
|
2016-04-25 21:08:14 +05:30 |
|
prabathabey
|
a10a693507
|
Fixing find bugs reported issues
|
2016-04-25 21:07:57 +05:30 |
|
prabathabey
|
f2ba20baeb
|
Code cleanup
|
2016-04-25 20:42:10 +05:30 |
|
prabathabey
|
47572d08f5
|
Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
|
2016-04-25 20:29:11 +05:30 |
|
Rasika Perera
|
480d6d5b7e
|
Remove redundant log messages
|
2016-04-25 19:41:04 +05:30 |
|
geethkokila
|
4cf37bb16c
|
Fixing the compilation error on the proprietory plugins.
|
2016-04-24 08:54:31 +05:30 |
|
dilanua
|
7027a3553a
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-24 08:24:43 +05:30 |
|
dilanua
|
2f2e8f391a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-23 22:52:25 +05:30 |
|
dilanua
|
c3bc22519a
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-23 22:51:58 +05:30 |
|
ayyoob
|
5e1ad22480
|
few changes on download api
|
2016-04-23 20:30:14 +05:30 |
|
ayyoob
|
1c0807a513
|
added userstore null check for permission scope validator
|
2016-04-23 00:07:12 +05:30 |
|
ayyoob
|
9f98f538de
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
|
2016-04-22 20:59:23 +05:30 |
|
ayyoob
|
b99d10e075
|
few changes invoker util to support file downloading
|
2016-04-22 20:57:22 +05:30 |
|
dilanua
|
274aa0ecd3
|
Adding temporary development code bits for cdmf-product dashboard feature
|
2016-04-22 10:48:42 +05:30 |
|
hasuniea
|
a196cb93bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-22 09:33:18 +05:30 |
|
dilanua
|
a888cf39c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-21 13:32:58 +05:30 |
|
Ruwan
|
c6fbc8f1fe
|
Merge pull request #216 from GPrathap/master
fixed some bugs which caused while enabling SSO in IoT Server
|
2016-04-20 23:48:48 +05:30 |
|
GPrathap
|
84492d70ac
|
added constants for authentications types
|
2016-04-20 22:10:04 +05:30 |
|
GPrathap
|
55a95cca86
|
bug fixes
|
2016-04-20 22:08:30 +05:30 |
|
Rasika Perera
|
8e7052e012
|
adding JSON strigify on payload if contentType is json
|
2016-04-20 22:03:01 +05:30 |
|
Rasika Perera
|
69e38b3c98
|
adding JSON strigify on payload if contentType is json
|
2016-04-20 22:02:31 +05:30 |
|
Rasika Perera
|
6ec5b7a85a
|
Reading Http Method from Features
|
2016-04-20 13:42:25 +05:30 |
|
Rasika Perera
|
2d44ec234b
|
Now operations are auto generated and supports query params, path params and form params.
|
2016-04-20 13:38:36 +05:30 |
|
Rasika Perera
|
bb33b4ea12
|
Parameterizing Content-Type and Accept headers.
|
2016-04-20 13:37:42 +05:30 |
|
charithag
|
a5a1529853
|
Fix issues in device listing page and device details page
|
2016-04-19 14:54:37 +05:30 |
|
Charitha Goonetilleke
|
05858da548
|
Fix formatting
|
2016-04-18 18:31:15 +05:30 |
|
charithag
|
c0e4c6b461
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-18 17:59:59 +05:30 |
|
hasuniea
|
92fec891cf
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-18 17:48:14 +05:30 |
|
ayyoob
|
64bd0fc061
|
removed fix for web app publishing start up issue when synapse gateway is used
|
2016-04-18 17:16:51 +05:30 |
|
charithag
|
6d8c3e5315
|
Fix default permission issues
|
2016-04-18 16:44:03 +05:30 |
|
charithag
|
516155dae5
|
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
2016-04-18 16:39:35 +05:30 |
|
ayyoob
|
12db341d33
|
few changes on web app publisher after testing
|
2016-04-18 03:00:06 +05:30 |
|
ayyoob
|
d3418462d9
|
few changes in api manager application registration
|
2016-04-17 12:18:49 +05:30 |
|
ayyoob
|
9d4defaa01
|
check whether the subscriber exist before creating
|
2016-04-15 23:10:11 +05:30 |
|
ayyoob
|
afe965e787
|
adding code review changes on JWT and API App registration
|
2016-04-14 19:55:55 +05:30 |
|
dilanua
|
3daa42ca5d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-11 12:10:21 +05:30 |
|
hasuniea
|
30fff8fd1c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-11 09:41:52 +05:30 |
|
charithag
|
ab4b61401c
|
Fixing UI and implementation issues occurred after restructuring.
|
2016-04-08 16:19:15 +05:30 |
|
charithag
|
4a72c789f2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-08 16:14:17 +05:30 |
|
charithag
|
0133cddc68
|
Fixing UI and implementation issues occurred after restructuring.
|
2016-04-08 16:12:37 +05:30 |
|
dilanua
|
c7af1a1e23
|
Adding temporary development code bits of dashboard analytics feature
|
2016-04-08 15:22:36 +05:30 |
|
dilanua
|
ce8d4b53a2
|
Adding temporary development code bits of dashboard analytics feature
|
2016-04-08 15:10:01 +05:30 |
|
Lakshman
|
993a387e7c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-08 11:26:58 +05:30 |
|
hasuniea
|
0bbb1eacd1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-08 11:02:21 +05:30 |
|
charithag
|
3dc23c5708
|
Fixing UI and implementation issues occurred after restructuring.
|
2016-04-07 20:41:10 +05:30 |
|
charithag
|
06a7fd2f1a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-07 11:56:14 +05:30 |
|
charithag
|
905f9ae4c1
|
Fixing UI issues occured after restructuring.
|
2016-04-07 11:55:48 +05:30 |
|
Kasun Delgolla
|
4e57e5bc85
|
Committing restructuring mdm-admin + UI merging style fixes
|
2016-04-07 10:42:56 +05:30 |
|
Lakshman
|
551aaf172b
|
formatting change
|
2016-04-06 19:32:41 +05:30 |
|
Lakshman
|
7174d000e0
|
override hash and equals function in Device to avoid duplicates in collections
|
2016-04-06 19:05:11 +05:30 |
|
hasuniea
|
abd018afd6
|
refactored imports in Certificate Generator
|
2016-04-04 14:24:40 +05:30 |
|
hasuniea
|
6ec710b250
|
merged code updates
|
2016-04-04 14:13:35 +05:30 |
|
Ruwan
|
a192bfa85c
|
Merge pull request #207 from rasika90/master
Adding uuf template app into cdmf-base-ui
|
2016-04-01 19:29:58 +05:30 |
|
Rasika Perera
|
3e34aeeff4
|
Fixing "Cannot write to cached file" issue
|
2016-04-01 18:00:22 +05:30 |
|
Rasika Perera
|
5911c873f3
|
Adding uuf template app
|
2016-04-01 15:06:32 +05:30 |
|
Kasun Delgolla
|
04de876265
|
Merge pull request #206 from charithag/master
Restructure group related UIs
|
2016-04-01 13:53:46 +05:30 |
|
charithag
|
99d004b6a6
|
Restructure group related UIs
|
2016-04-01 13:30:44 +05:30 |
|
Prabath Abeysekara
|
30e5666750
|
Merge pull request #205 from charithag/master
Refactor group management
|
2016-04-01 12:57:20 +05:30 |
|
geethkokila
|
d6923a1343
|
Fixing the issue in single condition
|
2016-04-01 00:25:09 +05:30 |
|
inosh-perera
|
9661502524
|
fixing issue with certificate delete
|
2016-03-31 20:08:20 +05:30 |
|
mharindu
|
afbfaf4c1d
|
Fixed for EMM-1305
|
2016-03-31 19:33:19 +05:30 |
|
mharindu
|
a3741bda7e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-31 19:32:10 +05:30 |
|
mharindu
|
a2a1e8115d
|
Fixed conflicts and merged
|
2016-03-31 18:45:52 +05:30 |
|
mharindu
|
72591eff44
|
Fixed modify enrollment bug
|
2016-03-31 18:44:55 +05:30 |
|
inosh-perera
|
f0fd86fcf7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-31 18:16:09 +05:30 |
|
inosh-perera
|
7cd1722829
|
making certificates searchable
|
2016-03-31 18:15:15 +05:30 |
|
geethkokila
|
7318502697
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-31 18:07:55 +05:30 |
|
geethkokila
|
e60a383f4d
|
Adding fixes to the device search
|
2016-03-31 18:07:05 +05:30 |
|
charithag
|
f6d224a623
|
Refactor group management
|
2016-03-31 17:50:29 +05:30 |
|
charithag
|
d22570dadb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-31 16:57:21 +05:30 |
|
charithag
|
bf58342d81
|
Refactor group management
|
2016-03-31 16:27:53 +05:30 |
|
Prabath Abeysekara
|
f1081f7029
|
Merge pull request #204 from ayyoob/merge-latest
Merged device type multitenant implementation.
|
2016-03-31 16:27:35 +05:30 |
|
ayyoob
|
733884cba7
|
added web app tenant authorisation for tenant for non managed api scenario
|
2016-03-31 15:10:37 +05:30 |
|
ayyoob
|
3a3e9cc649
|
changed analytics components to released version
|
2016-03-31 05:55:03 +05:30 |
|
ayyoob
|
1b4a9227d8
|
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
|
2016-03-31 04:24:30 +05:30 |
|
geethkokila
|
73a82f743f
|
Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes
|
2016-03-30 23:56:44 +05:30 |
|
ayyoob
|
83057acd9a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
|
2016-03-30 23:42:47 +05:30 |
|
inosh-perera
|
41ba2f4f0a
|
adding database changes
|
2016-03-30 19:08:42 +05:30 |
|
geethkokila
|
fbc7c0807c
|
Skipping the validation of task operations
|
2016-03-30 14:10:17 +05:30 |
|
ayyoob
|
fc725fa767
|
removed analytics
|
2016-03-30 13:45:39 +05:30 |
|
ayyoob
|
81ae512f13
|
Merge pull request #6 from ayyoob/merge-devicetype
merge device type
|
2016-03-30 12:20:02 +05:30 |
|
ayyoob
|
026d4ef018
|
removed analytics
|
2016-03-30 12:17:46 +05:30 |
|
charithag
|
40f863fd57
|
Fix bundle imports for java 8
|
2016-03-30 10:00:56 +05:30 |
|
charithag
|
0a8e00fd1e
|
Merged with upstream and resolved conflicts.
|
2016-03-30 02:00:47 +05:30 |
|
charithag
|
3e4ccf6337
|
Add missing features and component from IoTS-1.0.0-M4
|
2016-03-30 01:44:04 +05:30 |
|
geethkokila
|
888971ae39
|
Fixing the oracl and postgres sql datasources and removing the start and end from the search context
|
2016-03-29 22:46:09 +05:30 |
|
charithag
|
2f0a3388a6
|
Implemented missing methods in group management.
|
2016-03-29 18:01:21 +05:30 |
|
geethkokila
|
aa63b5f592
|
Fixing the application memory usage and adding location based search
|
2016-03-29 17:48:36 +05:30 |
|
charithag
|
3fd141acdf
|
Add missing parts and test to group management.
|
2016-03-29 17:07:56 +05:30 |
|
charithag
|
d1ee1fd578
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-29 12:41:48 +05:30 |
|
charithag
|
fa2f61f48a
|
Add missing parts in group management
|
2016-03-29 12:41:38 +05:30 |
|
ayyoob
|
284a6645f0
|
import required packages
|
2016-03-29 12:07:58 +05:30 |
|
ayyoob
|
4554aadd82
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-29 11:42:14 +05:30 |
|
ayyoob
|
c45895685b
|
Added device type multi tenancy capability.
|
2016-03-29 11:40:58 +05:30 |
|
ayyoob
|
021378df3b
|
added org.wso2.carbon import package
|
2016-03-28 23:05:47 +05:30 |
|
ayyoob
|
e06565728e
|
removed duplicate imports and improper imports
|
2016-03-28 20:46:38 +05:30 |
|
charithag
|
062a843ca2
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
2016-03-28 13:28:49 +05:30 |
|
prabathabey
|
ffbc0904a6
|
Fixing build failures caused by missing package imports
|
2016-03-27 21:51:45 +05:30 |
|
prabathabey
|
22e579ff15
|
Fixing build failures causde by missing references to certain packages
|
2016-03-27 21:17:05 +05:30 |
|
prabathabey
|
3a7ef33c16
|
Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup
|
2016-03-27 16:58:11 +05:30 |
|
prabathabey
|
284ca1b8e8
|
Removing obsolete source structures
|
2016-03-27 16:08:22 +05:30 |
|
prabathabey
|
12c4ba10af
|
Code cleanup
|
2016-03-27 16:04:15 +05:30 |
|
prabathabey
|
36161f6288
|
Merging extended device management functionalities
|
2016-03-27 16:02:40 +05:30 |
|
prabathabey
|
5e7985dae6
|
merging group-mgt implementation
|
2016-03-27 16:01:06 +05:30 |
|
prabathabey
|
b584131160
|
Fixing build failures in device.mgt.analytics.data.publisher bundle
|
2016-03-27 13:18:18 +05:30 |
|
prabathabey
|
85ecae22e0
|
Renaming backend-oauth-authenticator module to org.wso2.carbon.identity.authenticator.backend.oauth
|
2016-03-27 13:06:35 +05:30 |
|
prabathabey
|
3fa17c12a7
|
merging jwt client extension component
|
2016-03-27 13:02:35 +05:30 |
|
prabathabey
|
43926b64b4
|
Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher
|
2016-03-27 13:01:26 +05:30 |
|
prabathabey
|
1a43cf6a55
|
Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base
|
2016-03-27 03:06:39 +05:30 |
|
prabathabey
|
5dcd9dfe4a
|
Merging device analytics feature impl to master
|
2016-03-27 00:23:37 +05:30 |
|
prabathabey
|
e537e2d841
|
Adding device.mgt base ui framework
|
2016-03-25 14:46:19 +05:30 |
|
geethkokila
|
e9da24c9e8
|
Changing the snapshot versions from 1.0.4 to 1.1.0
|
2016-03-24 11:41:52 +05:30 |
|
geethkokila
|
3a3df04331
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-21 10:33:49 +05:30 |
|
geethkokila
|
41191d6df0
|
Adding the search feature to device mgt plugin
|
2016-03-21 10:33:35 +05:30 |
|
inosh-perera
|
ef117ffa74
|
adding mutual SLL authentication and certificate management DAOs
|
2016-03-17 14:14:59 +05:30 |
|
geethkokila
|
1826c9ee49
|
Doing a partial commit for pull
|
2016-03-14 12:02:36 +05:30 |
|
geethkokila
|
be890c2e9a
|
Doing a partial commit
|
2016-03-14 11:55:25 +05:30 |
|
geethkokila
|
7a809c1c01
|
Doing a partial commit
|
2016-03-14 11:48:43 +05:30 |
|
prabathabey
|
3726a57d96
|
Making email-sender a separate component and code cleanup
|
2016-03-13 00:51:54 +05:30 |
|
prabathabey
|
0b31042aa2
|
More improvements to the email sending functionality
|
2016-03-12 15:42:08 +05:30 |
|
prabathabey
|
535c74a962
|
Improving email sender functionality
|
2016-03-12 12:46:36 +05:30 |
|
hasuniea
|
0a1e11d192
|
fixed import issue
|
2016-02-24 07:46:53 +05:30 |
|
Kamidu Sachith
|
5fb94ebe0f
|
Code refractoring and Formatting
|
2016-02-12 20:56:30 +05:30 |
|
Prabath Abeysekara
|
a6905b52b1
|
Merge pull request #160 from hasuniea/master
Refactored certificateGenerator
|
2016-02-12 13:47:46 +05:30 |
|
hasuniea
|
4bafb72bb4
|
refcatored certificate Generator
|
2016-02-05 11:48:31 +05:30 |
|
Dileesha Rajapakse
|
8ac485d66d
|
Fixed Pagination issues in Device and Operation Oracle DAO classes
|
2016-02-02 17:53:47 +05:30 |
|
Dileesha Rajapakse
|
9204ed900d
|
Fixed Pagination issues in Oracle DAO classes
|
2016-02-02 16:37:26 +05:30 |
|
Kamidu Sachith
|
dda94437ee
|
code clean up and refactoring
|
2016-01-28 18:58:40 +05:30 |
|
Kamidu Sachith
|
370badf9d3
|
Preventing infromation leakage
|
2016-01-28 18:58:24 +05:30 |
|
geethkokila
|
e0e0a57c11
|
[maven-release-plugin] prepare for next development iteration
|
2016-01-05 18:15:38 +05:30 |
|
geethkokila
|
cebb88e712
|
[maven-release-plugin] prepare release v1.0.3
|
2016-01-05 18:15:28 +05:30 |
|
geethkokila
|
e66d291947
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-30 14:19:05 +05:30 |
|
geethkokila
|
f416a73e75
|
[maven-release-plugin] prepare release v1.0.2
|
2015-12-30 14:18:57 +05:30 |
|
geethkokila
|
d0a2c5521c
|
Commenting this due to policy compliance warn will block the device
|
2015-12-24 11:09:32 +05:30 |
|
geethkokila
|
185a59fbd4
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-23 22:39:29 +05:30 |
|
geethkokila
|
b3580d754b
|
[maven-release-plugin] prepare release v1.0.1
|
2015-12-23 22:39:20 +05:30 |
|
prabathabey
|
1fe9371558
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
2015-12-23 21:41:10 +05:30 |
|
harshanl
|
402b843e5d
|
Updated task schedule service to fix EMM-1145, EMM-1100
|
2015-12-23 19:35:50 +05:30 |
|
prabathabey
|
cbee88c7d0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-23 18:14:42 +05:30 |
|
prabathabey
|
77c4c34858
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
2015-12-23 18:13:39 +05:30 |
|
harshanl
|
8d4c09c20f
|
Fixed EMM-1139
|
2015-12-23 17:10:12 +05:30 |
|
prabathabey
|
e04a60104d
|
Improve logging in RemoteDCRClient
|
2015-12-23 16:55:35 +05:30 |
|
harshanl
|
9a7093a0f7
|
Fixed EMM-1146 issue
|
2015-12-23 15:29:45 +05:30 |
|
prabathabey
|
ed2fa14952
|
Fixing https://wso2.org/jira/browse/EMM-1135
|
2015-12-22 23:51:46 +05:30 |
|
prabathabey
|
7a27e88551
|
Changing the log levels configured in log4j.properties files used as part of test configurations
|
2015-12-22 22:43:26 +05:30 |
|
inosh-perera
|
6d7f024e8e
|
fixing java 8 build brake due to missing null check
|
2015-12-22 19:23:52 +05:30 |
|
geethkokila
|
4e9255fbc9
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-22 08:28:42 +05:30 |
|
geethkokila
|
ceb60adb34
|
[maven-release-plugin] prepare release v1.0.0
|
2015-12-22 08:28:33 +05:30 |
|
harshanl
|
d1cb7a3df2
|
Merge branch 'hasuniea-master'
|
2015-12-22 07:40:55 +05:30 |
|
hasuniea
|
1b51ad0228
|
refactored csr request authentication
|
2015-12-22 06:58:48 +05:30 |
|
prabathabey
|
8578ff60ca
|
Fixing the issue where client type is not honoured in dynamic client registration service
|
2015-12-22 06:15:55 +05:30 |
|
Dilshan Edirisuriya
|
094423e0b9
|
Fixing EMM-1129
|
2015-12-21 23:11:29 +05:30 |
|
prabathabey
|
2b0e1eecab
|
Committing logic that stores BST within request metadata
|
2015-12-21 22:50:30 +05:30 |
|
prabathabey
|
7e65b837d1
|
Committing logic that stores BST within request metadata
|
2015-12-21 22:48:47 +05:30 |
|
harshanl
|
bb9e07b742
|
Fixed BSTValidator
|
2015-12-21 21:41:34 +05:30 |
|
prabathabey
|
ed8242fc66
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 20:22:14 +05:30 |
|
prabathabey
|
a7b447b7db
|
Adding BST authenticator
|
2015-12-21 20:21:51 +05:30 |
|
Kamidu Sachith
|
6b2c3289dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 17:39:08 +05:30 |
|
Kamidu Sachith
|
c6e2c01caa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 16:45:52 +05:30 |
|
Kamidu Sachith
|
2d23eb86eb
|
Improve runtime performance
|
2015-12-21 16:38:42 +05:30 |
|
pasinduj
|
8628e5e523
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 15:03:46 +05:30 |
|
pasinduj
|
c7b53f7110
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 14:44:23 +05:30 |
|
harshanl
|
a61fe6171a
|
Refactored pagination code
|
2015-12-21 14:22:09 +05:30 |
|
prabathabey
|
67e1bfb012
|
Making attribute names schema compliant and code cleanup
|
2015-12-21 12:23:59 +05:30 |
|
prabathabey
|
0cdc139a0b
|
Adding updated webapp authenticator config
|
2015-12-21 11:57:50 +05:30 |
|
prabathabey
|
edf21ae5c8
|
Improving performance of token validation service invocation
|
2015-12-21 11:33:22 +05:30 |
|
prabathabey
|
11957f1e47
|
Pooling OAuth token validator stub initialization
|
2015-12-21 11:00:42 +05:30 |
|
pasinduj
|
08387e178d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 09:37:21 +05:30 |
|
prabathabey
|
b5b4e50b25
|
Revert "Improving performance of webapp authenticator valve implementation"
This reverts commit 36462e2e4e.
|
2015-12-19 13:28:24 +05:30 |
|
prabathabey
|
337afa5da2
|
Revert "Further optimizing webapp authenticator valve implementation"
This reverts commit 262e53ddcc.
|
2015-12-19 13:27:45 +05:30 |
|
prabathabey
|
262e53ddcc
|
Further optimizing webapp authenticator valve implementation
|
2015-12-19 13:09:31 +05:30 |
|
prabathabey
|
28a2e918e7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-19 12:07:19 +05:30 |
|
prabathabey
|
36462e2e4e
|
Improving performance of webapp authenticator valve implementation
|
2015-12-19 12:07:08 +05:30 |
|
Dileesha Rajapakse
|
b25438097e
|
Fixed issues in EnrollmentDAOImpl
|
2015-12-18 23:26:01 +05:30 |
|
Harshan Liyanage
|
c600b2a3c9
|
Merge pull request #99 from Kamidu/master
Removing unwanted debug comments
|
2015-12-18 22:40:13 +05:30 |
|
harshanl
|
6441c201e5
|
Added search support for pagination
|
2015-12-18 22:17:07 +05:30 |
|
Kamidu Sachith
|
230dbd1331
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-18 20:38:30 +05:30 |
|
Kamidu Sachith
|
057a55a3ab
|
Removing unwanted debug comments
|
2015-12-18 20:38:14 +05:30 |
|
Kasun Delgolla
|
773d78df3f
|
Merge pull request #98 from Kamidu/master
Code clean up and formatting
|
2015-12-18 18:12:07 +05:30 |
|
prabathabey
|
8585abff8d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-18 18:00:55 +05:30 |
|
prabathabey
|
05020c960d
|
Upgrading Carbon kernel and identity versions
|
2015-12-18 17:59:42 +05:30 |
|
Kamidu Sachith
|
30768bba71
|
Code clean up and formatting
|
2015-12-18 17:54:50 +05:30 |
|
Kamidu Sachith
|
3fbc3ea40f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-18 15:26:45 +05:30 |
|
Kamidu Sachith
|
7b544f3545
|
Fix the disable failier of the authenticator
|
2015-12-18 15:26:26 +05:30 |
|
Dileesha Rajapakse
|
eb680da572
|
Fixed EMM-1103
|
2015-12-17 14:57:28 +05:30 |
|
harshanl
|
91ece82eca
|
Updated operation DAO to sort data in DESC order of timestamp.
|
2015-12-17 12:52:42 +05:30 |
|
pasinduj
|
3899e8779f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-17 11:50:21 +05:30 |
|
harshanl
|
d4b6ba5e36
|
Added pagination support for operation management apis.
|
2015-12-17 10:32:06 +05:30 |
|
pasinduj
|
ddefa19e0f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-17 09:41:19 +05:30 |
|
Kasun Delgolla
|
d5f87f4dc1
|
Committing policy compliance monitoring issue
|
2015-12-16 14:38:32 +05:30 |
|
pasinduj
|
9a50455a29
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-14 08:57:36 +05:30 |
|
harshanl
|
00cf61c44c
|
Fixed EMM-1069 and refactore DCR services
|
2015-12-11 20:04:22 +05:30 |
|
pasinduj
|
7be1de1b85
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-11 11:30:41 +05:30 |
|
harshanl
|
08ebd7f881
|
Added DCR proxy endpoint & refactored code.
|
2015-12-11 11:10:53 +05:30 |
|
geethkokila
|
93a295f8a7
|
Fixing the dynamic imports
|
2015-12-10 18:25:45 +05:30 |
|
harshanl
|
20a03c42fc
|
Merged with master
|
2015-12-10 16:52:35 +05:30 |
|
harshanl
|
89e6f0786d
|
Refactored dynamic-client module to use remote services.
|
2015-12-10 16:50:33 +05:30 |
|
pasinduj
|
a9a502ac74
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-10 09:15:17 +05:30 |
|
geethkokila
|
49ae3298f4
|
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
|
2015-12-09 20:06:28 +05:30 |
|
geethkokila
|
ba7acabb04
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-09 20:03:07 +05:30 |
|
geethkokila
|
865f5a500e
|
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
|
2015-12-09 20:02:58 +05:30 |
|
Kamidu Sachith
|
6f57200864
|
Hanlde dependancy in dynamic client registration by removing recursive dependancy
|
2015-12-09 14:40:33 +05:30 |
|
pasinduj
|
f49f13501f
|
modified dbscripts removing policy ID forigen key from one table
|
2015-12-08 15:35:01 +05:30 |
|
pasinduj
|
81911bace0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-08 13:26:35 +05:30 |
|
pasinduj
|
a390df68ec
|
modified dbscripts to remove foriegn key reference
|
2015-12-08 11:42:04 +05:30 |
|
harshanl
|
92af749276
|
Fixed build break
|
2015-12-07 20:53:07 +05:30 |
|
harshanl
|
740124136b
|
Refactored backend oauth authenticator component and added logic to validate OAuth token from local & remote servers.
|
2015-12-07 20:25:47 +05:30 |
|
harshanl
|
5b9c44655d
|
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
|
2015-12-03 20:20:26 +05:30 |
|
harshanl
|
30e8dc885c
|
Fixed EMM-1034
|
2015-12-03 20:13:10 +05:30 |
|
pasinduj
|
9c7ebdafdb
|
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
|
2015-12-03 18:30:45 +05:30 |
|
inosh-perera
|
b5a6280c8d
|
refactoring comments
|
2015-12-03 11:28:12 +05:30 |
|
inosh-perera
|
d4403c6d87
|
adding new table to h2 script
|
2015-12-03 10:16:10 +05:30 |
|
inosh-perera
|
ff6e316406
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-02 07:55:58 +05:30 |
|
inosh-perera
|
3b1a3073f5
|
certificate persistance and ritrival from the database
|
2015-12-02 07:55:35 +05:30 |
|
harshanl
|
73906f7cda
|
Fixed EMM-1003
|
2015-11-30 22:20:33 +05:30 |
|
harshanl
|
d95a198ad6
|
Fixed EMM-1001
|
2015-11-30 19:56:47 +05:30 |
|
Kamidu Sachith
|
53064516d3
|
Fix for the Jira Issue EMM-989
|
2015-11-26 16:02:16 +05:30 |
|
Kamidu Sachith
|
8573a284e0
|
Enable Domain name in the invitation main
|
2015-11-26 11:39:11 +05:30 |
|
manoj
|
e1dc3d2ea3
|
add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation
|
2015-11-20 22:14:18 +05:30 |
|
manoj
|
99f82e4817
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-20 12:52:32 +05:30 |
|
harshanl
|
b4d17b888b
|
fixed secondary user-store related issues & multi-tenancy issues
|
2015-11-20 00:43:01 +05:30 |
|
geethkokila
|
c1eea6894d
|
Fixing the feature remove from the policy
|
2015-11-19 14:45:08 +05:30 |
|
manoj
|
a04658af14
|
App Manager integration
|
2015-11-19 10:21:59 +05:30 |
|
manoj
|
79c268cb41
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-19 10:18:01 +05:30 |
|
Dileesha Rajapakse
|
767ea70436
|
Refactored CommandOperation DAO class
|
2015-11-18 22:05:15 +05:30 |
|
Dileesha Rajapakse
|
8bd9295f81
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 19:28:40 +05:30 |
|
Dileesha Rajapakse
|
f3cfb79bac
|
Refactored Operation DAO classes
|
2015-11-17 19:28:32 +05:30 |
|
harshanl
|
f0471203e7
|
Added logic to skip device authorization for policy operations
|
2015-11-17 18:28:42 +05:30 |
|
Dileesha Rajapakse
|
6e95451f57
|
Refactored Operation DAO class
|
2015-11-17 17:26:55 +05:30 |
|
manoj
|
dbf8d13ced
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 16:15:24 +05:30 |
|
manoj
|
20db31c2a9
|
Add app manager features
|
2015-11-17 16:14:51 +05:30 |
|
Dileesha Rajapakse
|
825017a492
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 09:58:43 +05:30 |
|
Dileesha Rajapakse
|
4379232c25
|
Refactored Enrollment DAO class
|
2015-11-16 22:01:21 +05:30 |
|
harshanl
|
2fa99ac475
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 19:57:59 +05:30 |
|
harshanl
|
a3e20367f2
|
Fixed issue in Policy Task when DeviceAuthorization enabled.
|
2015-11-16 19:51:59 +05:30 |
|
geethkokila
|
271c4f76cb
|
Fixnig the null pointer isssue
|
2015-11-16 18:08:21 +05:30 |
|
geethkokila
|
700b308b45
|
Fixing the null pointer and removnig innactive devices being monitored
|
2015-11-16 17:44:30 +05:30 |
|
geethkokila
|
1989abf881
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:41:37 +05:30 |
|
geethkokila
|
fed4f72d4b
|
Fixing the null pointer
|
2015-11-16 17:41:07 +05:30 |
|
harshanl
|
1252d4c160
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:21:33 +05:30 |
|
geethkokila
|
0f146e83fa
|
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
|
2015-11-16 17:17:15 +05:30 |
|
geethkokila
|
813f9072d8
|
Fixing the database issue which causes the deviceids slelect did not work
|
2015-11-16 17:15:16 +05:30 |
|
Dileesha Rajapakse
|
f8a2117911
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 16:52:43 +05:30 |
|
Dileesha Rajapakse
|
6446be100d
|
Refactored Policy Management DAO classes
|
2015-11-16 16:49:35 +05:30 |
|
Dileesha Rajapakse
|
91d9db1ffa
|
Refactored ApplicationMapping and ProfileOperation DAO classes
|
2015-11-16 14:15:54 +05:30 |
|
Dilshan Edirisuriya
|
7023537fcd
|
Setting owner in authentication info
|
2015-11-16 13:49:02 +05:30 |
|
Dileesha Rajapakse
|
27254cc922
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 11:45:29 +05:30 |
|
harshanl
|
cb02c9da80
|
Fixed issues in DeviceAuthorization
|
2015-11-16 11:43:52 +05:30 |
|
Dileesha Rajapakse
|
6f0276ab2f
|
Modified Application Mapping DAO classes
|
2015-11-16 11:39:52 +05:30 |
|
Dileesha Rajapakse
|
7b2cfd69f5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 09:49:37 +05:30 |
|
harshanl
|
b9ca6705ae
|
Merged changes
|
2015-11-13 21:57:05 +05:30 |
|
harshanl
|
e14f09b8a8
|
Added requireDeviceAuthorization support
|
2015-11-13 21:33:33 +05:30 |
|
manoj
|
fdc4ad8e18
|
Set user level autherization is support by plugin or not
|
2015-11-13 21:29:47 +05:30 |
|
manoj
|
22c2da7fcb
|
Set user level autherization is support by plugin or not
|
2015-11-13 21:22:38 +05:30 |
|
manoj
|
dc2e41e083
|
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
|
2015-11-13 19:02:55 +05:30 |
|
manoj
|
adc3b652bf
|
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
|
2015-11-13 18:57:45 +05:30 |
|
Dileesha Rajapakse
|
786eb93bca
|
Refactored Operation DAO classes
|
2015-11-13 14:15:05 +05:30 |
|
Dileesha Rajapakse
|
123ea228ad
|
Refactored Enrolment DAO class
|
2015-11-12 10:30:45 +05:30 |
|
Dileesha Rajapakse
|
72ffe4e4a4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-12 09:04:56 +05:30 |
|
harshanl
|
5af6f314d0
|
Fixed EMM-939
|
2015-11-11 20:58:47 +05:30 |
|
Dileesha Rajapakse
|
1975821446
|
Refactored Device and Application DAO classes
|
2015-11-11 18:47:02 +05:30 |
|
Geeth
|
5fd9e87dc8
|
Merge pull request #44 from Kamidu/master
change the formatter
|
2015-11-10 20:35:58 +05:30 |
|
Kamidu Sachith
|
8953a61cc4
|
Enable Owneship type editing in policy
|
2015-11-10 20:17:59 +05:30 |
|
harshanl
|
5d107b0d56
|
Merged changes
|
2015-11-10 18:46:26 +05:30 |
|
harshanl
|
93e641893c
|
Merged changes
|
2015-11-10 18:31:02 +05:30 |
|
harshanl
|
026a7c187a
|
Fixed EMM-945, EMM-910, EMM-911, EMM-870
|
2015-11-10 18:17:34 +05:30 |
|
inosh-perera
|
4faa740c9d
|
Fixing JIRA EMM-947 - only the registered device types are returned to UI
|
2015-11-10 17:36:30 +05:30 |
|
Kamidu Sachith
|
d7c942f395
|
Enable ownership editing on the policy
|
2015-11-10 14:51:10 +05:30 |
|
Kamidu Sachith
|
4590de6a76
|
chenge the formatter
|
2015-11-04 15:12:23 +05:30 |
|
harshanl
|
c826be9b3e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-03 18:59:26 +05:30 |
|
harshanl
|
74a3b0e346
|
Fixed EMM-910
|
2015-11-03 18:58:52 +05:30 |
|
geethkokila
|
30c53b7d14
|
Fixing the EMM-900, Ading the LB host name and port to the email url
|
2015-11-03 16:24:49 +05:30 |
|
harshanl
|
2b9239d208
|
Optimized the authenticator framework
|
2015-11-03 14:29:38 +05:30 |
|
harshanl
|
fa92aecf58
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-03 11:34:32 +05:30 |
|
harshanl
|
520c07693d
|
Added support for non-secured endpoints within a security enabled webapp
|
2015-11-02 20:45:43 +05:30 |
|
geethkokila
|
feab85796f
|
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
|
2015-11-02 19:44:52 +05:30 |
|
geethkokila
|
2479be9f5a
|
Fixing the email client issue
|
2015-11-02 19:37:21 +05:30 |
|
harshanl
|
6ebfbc4136
|
Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master
|
2015-10-30 18:34:16 +05:30 |
|
harshanl
|
c9ffedbac5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-30 18:29:53 +05:30 |
|
harshanl
|
8f982722fb
|
Added oauth response messages
|
2015-10-30 18:29:32 +05:30 |
|
geethkokila
|
20122b3f1e
|
Fixing the roles and users adding issue
|
2015-10-30 17:48:30 +05:30 |
|
Kasun Delgolla
|
c00b1ee713
|
Committing fix for JIRA- EMM-860
|
2015-10-29 20:46:48 +05:30 |
|
Kasun Delgolla
|
6f2d1ad065
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 20:45:29 +05:30 |
|
harshanl
|
7cdd262b91
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-29 17:53:18 +05:30 |
|
harshanl
|
7c0996270f
|
Fixed EMM-887
|
2015-10-29 17:53:09 +05:30 |
|
Kasun Delgolla
|
f519b7c029
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 15:46:41 +05:30 |
|
prabathabey
|
90240e7d3f
|
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
|
2015-10-29 14:11:24 +05:30 |
|
Kasun Delgolla
|
9fa7c16e54
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 10:41:34 +05:30 |
|
hasuniea
|
3de4718ab5
|
refactored certificate generator
|
2015-10-29 10:04:13 +05:30 |
|
harshanl
|
8a1dba166a
|
Updated FeatureMgr spec
|
2015-10-28 22:09:01 +05:30 |
|
Dilshan Edirisuriya
|
5c2b7c9624
|
Removing commons codec version
|
2015-10-28 20:06:10 +05:30 |
|
Dilshan Edirisuriya
|
bbc1132100
|
Commenting previous lines
|
2015-10-28 19:24:05 +05:30 |
|
Kasun Delgolla
|
efa90b244f
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-28 19:05:31 +05:30 |
|
Dilshan Edirisuriya
|
0b800b8615
|
Bug fixes
|
2015-10-28 18:49:47 +05:30 |
|
Kasun Delgolla
|
acdfc475be
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-28 10:17:23 +05:30 |
|
hasuniea
|
8f595818dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-23 14:51:10 +05:30 |
|
hasuniea
|
e1a24abfa3
|
refactored certificate service
|
2015-10-23 14:46:56 +05:30 |
|
geethkokila
|
168a011376
|
Fixing the issue of identity snapshot change
|
2015-10-22 16:27:40 +05:30 |
|
Kasun Delgolla
|
f830a14a8b
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-22 11:09:44 +05:30 |
|
harshanl
|
b3e0f804b0
|
Added comments.
|
2015-10-21 17:19:49 +05:30 |
|
harshanl
|
52fab37c61
|
Fixed issue in permission validator
|
2015-10-21 15:43:26 +05:30 |
|
harshanl
|
e1c9f1c602
|
Added url param support to permission tree.
|
2015-10-21 12:55:44 +05:30 |
|
Kasun Delgolla
|
3385bfacd2
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-21 11:17:10 +05:30 |
|
hasuniea
|
efd029083b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-21 10:55:01 +05:30 |
|
hasuniea
|
2c2216e48d
|
implement certificateManagement service
|
2015-10-21 10:38:09 +05:30 |
|
harshanl
|
340a690995
|
Added sql script
|
2015-10-20 10:11:42 +05:30 |
|
Kasun Delgolla
|
8d52735e6a
|
Adding app list + info to monitoring operation
|
2015-10-20 09:51:43 +05:30 |
|
hasuniea
|
3a6e9f09fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-20 09:15:36 +05:30 |
|
harshanl
|
1d4bba9807
|
License issue fixed
|
2015-10-20 08:12:02 +05:30 |
|
harshanl
|
09fbf9e8a1
|
Fixed DAO issues
|
2015-10-19 22:45:39 +05:30 |
|
harshanl
|
04eba0f313
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-19 22:45:12 +05:30 |
|
hasuniea
|
53f4dc7ae5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-19 20:49:43 +05:30 |
|
hasuniea
|
7a110a8eb5
|
implemented certificateGenerater
|
2015-10-19 20:49:26 +05:30 |
|
geethkokila
|
c46c4f1be9
|
Fixing the policy update issues
|
2015-10-19 20:34:02 +05:30 |
|
harshanl
|
89e930d530
|
Fixed isssues in pagination
|
2015-10-18 21:56:13 +05:30 |
|
harshanl
|
25d7459974
|
Pagination changes
|
2015-10-18 20:50:39 +05:30 |
|
harshanl
|
ca3653737c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 20:22:47 +05:30 |
|
harshanl
|
155606a326
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:54:35 +05:30 |
|
geethkokila
|
703eebb715
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:39:55 +05:30 |
|
prabathabey
|
a0ebec9f3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:18:26 +05:30 |
|
prabathabey
|
c74e27102f
|
Fixing issues in adding license configs
|
2015-10-18 18:16:52 +05:30 |
|
inosh-perera
|
cab888d321
|
fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files
|
2015-10-18 17:26:32 +05:30 |
|
harshanl
|
81b6770c08
|
Fixed oauth issue with tenants
|
2015-10-18 01:44:28 +05:30 |
|
geethkokila
|
182e15d632
|
Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
|
2015-10-17 20:18:25 +05:30 |
|
Kamidu Sachith
|
ddbd2c5372
|
Java 8 support
|
2015-10-17 20:03:19 +05:30 |
|
harshanl
|
9b40f73597
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-17 17:11:32 +05:30 |
|
geethkokila
|
d15eb10636
|
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
|
2015-10-17 17:08:12 +05:30 |
|
geethkokila
|
f49345e722
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-16 23:47:19 +05:30 |
|
geethkokila
|
8a8a152d36
|
Adding the policy task config
|
2015-10-16 23:47:16 +05:30 |
|
harshanl
|
0646b424ed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-16 23:40:25 +05:30 |
|
harshanl
|
6c196d5317
|
Added pagination support
|
2015-10-16 23:40:13 +05:30 |
|
Dulitha Wijewantha
|
5962694ec2
|
Adding annotation for the description
|
2015-10-16 23:37:58 +05:30 |
|
Dulitha Wijewantha
|
002a1ec580
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-16 21:06:04 +05:30 |
|
Dulitha Wijewantha
|
1025e9a425
|
Fixes to user api
|
2015-10-16 21:05:51 +05:30 |
|
Kamidu Sachith
|
d5dcf44f27
|
Change the service registration
|
2015-10-16 18:39:34 +05:30 |
|
harshanl
|
2a6db0cdc4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-15 16:32:09 +05:30 |
|
geethkokila
|
d52df2474e
|
Fixing policy descriptions
|
2015-10-15 13:01:53 +05:30 |
|
harshanl
|
9a68aa92bc
|
Removed the use of web-app context in permission.xml of webapps
|
2015-10-14 22:33:36 +05:30 |
|
geethkokila
|
9fca18ae90
|
Fixing the monitoring issue
|
2015-10-14 18:54:39 +05:30 |
|
harshanl
|
b0d6038b69
|
Refactored dynamic client code & add tenancy handling to authenticators
|
2015-10-13 22:30:12 +05:30 |
|
Kamidu Sachith
|
5c215189d1
|
Enable java8 support
|
2015-10-13 11:45:00 +05:30 |
|
harshanl
|
d9bcb617eb
|
Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
|
2015-10-12 19:49:40 +05:30 |
|
harshanl
|
d4eab9f86e
|
Code refactored.
|
2015-10-12 19:48:35 +05:30 |
|
geethkokila
|
81034c84f5
|
Fixing the method name issue in policy manager service
|
2015-10-12 18:59:41 +05:30 |
|
Kamidu Sachith
|
a66949c7e0
|
Code Fixing
|
2015-10-12 18:45:32 +05:30 |
|
Kamidu Sachith
|
824f57b5d2
|
Change the code for better performance
|
2015-10-12 18:36:59 +05:30 |
|
Kamidu Sachith
|
fe355b3184
|
Romoving Temporary Solutions
|
2015-10-12 18:13:46 +05:30 |
|
Kamidu Sachith
|
743f394fb9
|
Requested Modifications
|
2015-10-12 18:11:44 +05:30 |
|
Kamidu Sachith
|
d932522d37
|
refactoring class
|
2015-10-12 18:03:13 +05:30 |
|
Kamidu Sachith
|
8cc38c87f5
|
requested modification
|
2015-10-12 17:57:43 +05:30 |
|
Kamidu Sachith
|
831fed6d38
|
Resolving imports
|
2015-10-12 17:42:10 +05:30 |
|
Dulitha Wijewantha
|
5e07e52be8
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-12 12:20:46 +05:30 |
|
Dulitha Wijewantha
|
45ce4dbe4e
|
Policy Updating
* Fixed issues regarding roles updating for policy
* Fixed the relevent test cases
JIRA:- https://wso2.org/jira/browse/EMM-812
|
2015-10-12 12:09:21 +05:30 |
|
harshanl
|
741777682a
|
Fixed dynamic client registration issues with server startup
|
2015-10-09 19:20:12 +05:30 |
|
Kamidu Sachith
|
786728b49b
|
Recomended Changes to Enabling OAuth Authentication for BackEnd Services
|
2015-10-08 17:54:49 +05:30 |
|
Kamidu Sachith
|
97df36842d
|
Enabling OAuth Authentication for BackEnd Services
|
2015-10-08 14:02:29 +05:30 |
|
harshanl
|
1c8bb7551d
|
Refactored Dynamic-client registration service to use AppMgt osgi service
|
2015-10-07 23:15:17 +05:30 |
|
prabathabey
|
69ba3e83ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-07 17:01:33 +05:30 |
|
prabathabey
|
774683a418
|
Adding proper dependency exclusions
|
2015-10-07 17:01:27 +05:30 |
|
harshanl
|
134a13727f
|
updated cxf version & fixed migration issues
|
2015-10-07 16:58:09 +05:30 |
|
harshanl
|
36ca79d31a
|
Fixed build issues
|
2015-10-07 00:17:17 +05:30 |
|
harshanl
|
302eb3a8a9
|
Merged changes
|
2015-10-07 00:00:28 +05:30 |
|
harshanl
|
429b738dba
|
Fixed issues in permission tree'
|
2015-10-06 22:41:59 +05:30 |
|
harshanl
|
f6c65dd481
|
Refactored dynamic-client registration code
|
2015-10-06 13:15:40 +05:30 |
|
harshanl
|
52e0a43b5e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-06 11:44:46 +05:30 |
|
harshanl
|
77f5f466d6
|
Added scope validator and refactored code
|
2015-10-06 11:44:40 +05:30 |
|
prabathabey
|
c74a979c8d
|
Bumping the versions of all dependent component versions to their respective latests
|
2015-10-05 20:34:43 +05:30 |
|
Dilshan Edirisuriya
|
0d259b2a6e
|
Enabling SAML
|
2015-10-05 11:34:14 +05:30 |
|
harshanl
|
648d8ec209
|
Added OAuth scope validator & fixed DataHolders
|
2015-10-05 11:28:47 +05:30 |
|
harshanl
|
234cd47931
|
Added identity-extensions
|
2015-10-02 18:00:05 +05:30 |
|
milanperera
|
17112c3616
|
Removed unused constants
|
2015-10-02 17:12:14 +05:30 |
|
milanperera
|
e408d50037
|
Refactored permission module
|
2015-10-02 17:07:57 +05:30 |
|
milanperera
|
a0187b905b
|
Removed unneccessary imports and code segments
|
2015-10-02 16:57:42 +05:30 |
|
milanperera
|
a84edd7a99
|
Added seperate permission tree class
|
2015-10-02 16:40:52 +05:30 |
|
milanperera
|
02ad7fb8e1
|
Refactored authorization module
|
2015-10-02 16:40:13 +05:30 |
|
prabathabey
|
d79de19176
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-01 19:24:54 +05:30 |
|
prabathabey
|
bce52e54a3
|
Upgrading dependency versions to their respective latests
|
2015-10-01 19:24:48 +05:30 |
|
milanperera
|
ed937467cd
|
Refactored permission authorizer module
|
2015-10-01 17:35:08 +05:30 |
|
milanperera
|
68befaae01
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-01 12:14:28 +05:30 |
|
harshanl
|
335f53f01c
|
refactored pom files
|
2015-09-29 17:33:35 +05:30 |
|
harshanl
|
cb9616b02b
|
Refactored dynamic-client registration
|
2015-09-29 16:34:28 +05:30 |
|
mharindu
|
9813816fab
|
Fixed bug of adding operations
|
2015-09-29 16:24:35 +05:30 |
|
milanperera
|
1034eb85c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-28 16:55:50 +05:30 |
|
mharindu
|
0a321e279a
|
Added null check to getLicense
|
2015-09-24 14:37:52 +05:30 |
|
Dilshan Edirisuriya
|
9ce1c2002a
|
Null check in DAO
|
2015-09-22 14:09:59 +05:30 |
|
milanperera
|
49016cbc56
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-17 11:09:39 +05:30 |
|
milanperera
|
126c2ec371
|
Implemented permission authorizing module
|
2015-09-17 11:09:31 +05:30 |
|
Dilshan Edirisuriya
|
c52dfb460a
|
Removing import
|
2015-09-16 18:58:57 +05:30 |
|
milanperera
|
47ac0b1146
|
Fixed conflicts and merged local changes
|
2015-09-15 10:22:53 +05:30 |
|
Dilshan Edirisuriya
|
ac5a7f4ab1
|
Null check in JWT authenticator and fixing tenant id issue in device DAO
|
2015-09-14 17:12:07 +05:30 |
|
milanperera
|
37854a2cef
|
Partial Commit
|
2015-09-14 15:51:23 +05:30 |
|
Dilshan Edirisuriya
|
5f2ec88300
|
Changes in certificate managment
|
2015-09-14 15:28:28 +05:30 |
|
Dilshan Edirisuriya
|
3907c0fba2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-14 15:23:18 +05:30 |
|
Dilshan Edirisuriya
|
4a03c7abf7
|
certificate authentication changes
|
2015-09-14 15:23:11 +05:30 |
|
harshanl
|
b8720917e1
|
Added Dynamic-client-registration module
|
2015-09-11 20:53:19 +05:30 |
|
milanperera
|
3de2591444
|
Partial commit
|
2015-09-10 11:36:18 +05:30 |
|
milanperera
|
517039cccb
|
Partial commit
|
2015-09-10 11:20:29 +05:30 |
|
mharindu
|
9920f2919a
|
Fixed spelling mistakes of policy component
|
2015-09-09 20:00:10 +05:30 |
|
mharindu
|
b33925c497
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-09 19:57:07 +05:30 |
|
Dilshan Edirisuriya
|
e1a74e049d
|
Bypassing URLS
|
2015-09-09 17:16:26 +05:30 |
|
Dilshan Edirisuriya
|
d17f1356e7
|
Certificate authenticator changes
|
2015-09-08 17:21:23 +05:30 |
|
milanperera
|
3cb68355b4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-08 11:29:05 +05:30 |
|
mharindu
|
fbd697edb0
|
Fixed issue in policy delegation executor
|
2015-09-08 11:27:29 +05:30 |
|
mharindu
|
2331b61bdc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-08 11:16:41 +05:30 |
|
harshanl
|
1193eff974
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-07 18:14:34 +05:30 |
|
harshanl
|
bf0e95fa6c
|
Fixed notification service issues
|
2015-09-07 18:14:20 +05:30 |
|
Dilshan Edirisuriya
|
ccffdb2252
|
Get attribute implementation
|
2015-09-07 15:15:59 +05:30 |
|
milanperera
|
3c89293220
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-07 12:43:54 +05:30 |
|
milanperera
|
8d38c37d53
|
Fixed conflicts and merged
|
2015-09-07 12:39:51 +05:30 |
|
harshanl
|
330f059a09
|
Added App-Mgt config testcases
|
2015-09-05 01:26:52 +05:30 |
|
mharindu
|
3421663724
|
Fixed conflics and merged
|
2015-09-04 11:15:59 +05:30 |
|
geethkokila
|
4500aacd38
|
Adding the scep support for getting the device tenant id
|
2015-09-03 23:38:27 +05:30 |
|
mharindu
|
2f5ef48fa8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 20:51:12 +05:30 |
|
geethkokila
|
d2fe9679e0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 20:49:39 +05:30 |
|
geethkokila
|
11ead87a5e
|
Fixing the policy listing issue
|
2015-09-03 20:49:26 +05:30 |
|