megala21
f41a692bf3
Reformatting code
2017-05-18 14:21:24 +05:30
megala21
25e0b989d2
Fixing issues in group sharing
2017-05-18 14:17:03 +05:30
Madawa Soysa
20999f4cd5
Fixing wso2/product-iots##467
2017-05-18 10:54:54 +05:30
WSO2 Builder
3092423d4d
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare for next development iteration
2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c
[WSO2 Release] [Jenkins #2305 ] [Release 2.0.66] prepare release v2.0.66
2017-05-17 19:11:36 +05:30
Megala Uthayakumar
39439c5c50
Merge pull request #748 from sinthuja/master
...
Fixing issues in editing policy
2017-05-17 18:38:31 +05:30
sinthuja
e7490dd278
Fixing https://github.com/wso2/product-iots/issues/443 .
2017-05-17 17:24:37 +05:30
Megala Uthayakumar
8830d627e9
Merge pull request #747 from sinthuja/master
...
Fixing some issues reported for product-iots.
2017-05-17 16:18:32 +05:30
sinthuja
9c110bb59c
Fixing https://github.com/wso2/product-iots/issues/444 .
2017-05-16 18:41:07 +05:30
WSO2 Builder
d4baa72328
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare for next development iteration
2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d
[WSO2 Release] [Jenkins #2300 ] [Release 2.0.65] prepare release v2.0.65
2017-05-16 18:34:13 +05:30
sinthuja
4df590caa1
Fixing https://github.com/wso2/product-iots/issues/447 .
2017-05-16 18:17:45 +05:30
Madawa Soysa
c7d002a6a9
Fix for https://github.com/wso2/product-iots/issues/449
2017-05-16 17:18:16 +05:30
ayyoob
1955b028d2
add tenancy to property table
2017-05-15 20:08:03 +05:30
ayyoob
fbb5f5ae88
merged with origin
2017-05-15 18:15:24 +05:30
ayyoob
42cb383804
auto healing in case of app deletion and added device scope to handle multiple session with same user
2017-05-11 21:21:53 +05:30
WSO2 Builder
84d305dcd4
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare for next development iteration
2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95
[WSO2 Release] [Jenkins #2293 ] [Release 2.0.64] prepare release v2.0.64
2017-05-11 09:15:33 +05:30
ayyoob
d2d7be6fd6
fixed tenant related issue for mqtt push notification and stream artifact publishing
2017-05-10 13:50:06 +05:30
ayyoob
1c3a89f57c
fixed issues raised through comments - commits
2017-05-10 13:49:20 +05:30
ayyoob
035403495c
made default stat permission as constant
2017-05-09 16:45:47 +05:30
ayyoob
cb9db4dd1d
fixed null pointer in the initial operations
2017-05-09 16:16:14 +05:30
ayyoob
483d09ebf1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into new-master
2017-05-09 16:13:35 +05:30
ayyoob
ea48ee425c
added default configuration for tenant specific push notification provider
2017-05-09 16:09:24 +05:30
Milan Perera
64d656b5e7
Removed unnecessary interace methods from Device Manager
2017-05-09 15:09:21 +05:30
WSO2 Builder
f7300645a5
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare for next development iteration
2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703
[WSO2 Release] [Jenkins #2289 ] [Release 2.0.63] prepare release v2.0.63
2017-05-09 15:05:11 +05:30
Milan Perera
53f2c555c4
Added method to test device manager
2017-05-09 14:44:01 +05:30
Milan Perera
17ecadb913
Added a feature to pick default platform configurations
2017-05-09 11:52:21 +05:30
ayyoob
b36ff4b874
added a authorisation resource for stat
2017-05-09 00:54:49 +05:30
ayyoob
3feb6c70dc
created per tenant push notification for each transport type
2017-05-09 00:54:34 +05:30
ayyoob
77ceed5368
renamed device type publisher service to DeviceAnalyticsArtifactUploaderAdminService
2017-05-09 00:54:01 +05:30
WSO2 Builder
964eae6f92
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare for next development iteration
2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9
[WSO2 Release] [Jenkins #2285 ] [Release 2.0.62] prepare release v2.0.62
2017-05-08 17:42:28 +05:30
Hasunie
9947085d08
Merge pull request #739 from harshanL/master
...
#738:Fixed issue 738.
2017-05-08 17:36:03 +05:30
Harshan Liyanage
447e0561b9
#738:Fixed issue 738.
2017-05-08 17:33:45 +05:30
megala21
f14e2c2d6a
Removing cloud_type from config.json
2017-05-08 15:19:51 +05:30
megala21
8d0efd3289
Adding request new device type button for cloud
2017-05-08 13:58:59 +05:30
WSO2 Builder
639eeb225a
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare for next development iteration
2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b
[WSO2 Release] [Jenkins #2280 ] [Release 2.0.61] prepare release v2.0.61
2017-05-05 11:41:03 +05:30
Amal Gunatilake
a4072615af
Merge pull request #733 from rasika/improvement_getuser
...
Fixing typo and getCarbonUser() replaced with context.user
2017-05-05 11:26:01 +05:30
Amal Gunatilake
d898a7dc8e
Merge pull request #732 from rasika/git_issue_731
...
Hide IoT Server version when isCloud is TRUE
2017-05-05 11:25:55 +05:30
ayyoob
cedb6cb798
fixed device stats loading page issue
2017-05-05 03:02:35 +05:30
WSO2 Builder
a546355cf3
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare for next development iteration
2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe
[WSO2 Release] [Jenkins #2277 ] [Release 2.0.60] prepare release v2.0.60
2017-05-04 15:42:14 +05:30
Madawa Soysa
c4d0ca7134
Merge pull request #734 from madhawap/master
...
Removed commented lines
2017-05-04 15:36:00 +05:30
madhawap
c4ba14376e
Removed commented lines
2017-05-04 15:32:25 +05:30
Rasika Perera
776bafcd73
Fixing typo and getCarbonUser() replaced with context.user
2017-05-03 23:22:25 +05:30
Rasika Perera
d247b07b4a
#731 : Hide IoT Server version when isCloud is TRUE
2017-05-03 23:04:55 +05:30
WSO2 Builder
4797fc9600
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare for next development iteration
2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21
[WSO2 Release] [Jenkins #2274 ] [Release 2.0.59] prepare release v2.0.59
2017-05-03 20:28:51 +05:30
Rasika Perera
5dc9259fc0
Merge pull request #728 from rasika/git_issue_726
...
Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 20:23:07 +05:30
Rasika Perera
2831bfaf2c
#726 : Resolving cannot log into devicemgt app when tenant is not loaded in API Manager
2017-05-03 19:59:17 +05:30
WSO2 Builder
98991fe89b
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare for next development iteration
2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181
[WSO2 Release] [Jenkins #2272 ] [Release 2.0.58] prepare release v2.0.58
2017-05-03 15:28:02 +05:30
Amal Gunatilake
e736659204
Merge pull request #730 from janakamarasena/cert-mgt
...
Store cert by cert serial
2017-05-03 14:09:23 +05:30
Janak Amarasena
44940f3136
Store cert by cert serial
2017-05-03 13:58:06 +05:30
WSO2 Builder
6fddf9c8d0
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare for next development iteration
2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c
[WSO2 Release] [Jenkins #2268 ] [Release 2.0.57] prepare release v2.0.57
2017-05-03 08:28:05 +05:30
Ace
b54bf3000f
Adding fix for status 500 in device listing page
2017-05-03 07:13:06 +05:30
WSO2 Builder
80bf3c8fbd
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare for next development iteration
2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d
[WSO2 Release] [Jenkins #2266 ] [Release 2.0.56] prepare release v2.0.56
2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare for next development iteration
2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700
[WSO2 Release] [Jenkins #2265 ] [Release 2.0.55] prepare release v2.0.55
2017-05-02 17:14:54 +05:30
Chatura Dilan
309352df1e
Merge pull request #722 from janakamarasena/mutual-ssl-handler
...
Added mutual SSL authentication handling for android
2017-05-02 17:04:38 +05:30
Geeth
6798dea68a
Merge pull request #725 from warunalakshitha/master
...
Add Scheduler Task for Sending Push Notification
2017-05-02 17:04:03 +05:30
WSO2 Builder
43e76e4678
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare for next development iteration
2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25
[WSO2 Release] [Jenkins #2263 ] [Release 2.0.54] prepare release v2.0.54
2017-05-02 09:37:16 +05:30
warunalakshitha
e1e2b14b5f
Rename push status to push notification status and add configurable initial delay for scheduler task
2017-05-01 20:44:30 +05:30
lasantha
43f2f15c5f
#395 : Resolved current device owner incorrectly selecting and processing issue when the same device is enrolled to multiple users
2017-05-01 15:48:25 +05:30
warunalakshitha
3938064210
Add opeerations mapping map for tenants and fixes for code review
2017-04-30 14:29:30 +05:30
warunalakshitha
8df87b23bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-30 13:56:12 +05:30
warunalakshitha
a5759f9818
Add tenant based operation mappings
2017-04-30 13:56:06 +05:30
Janak Amarasena
2b0800794d
Minor improvements to the code
2017-04-28 16:32:57 +05:30
Janak Amarasena
3ecb6da575
Remove unwanted code
2017-04-28 16:32:57 +05:30
Janak Amarasena
e5bd7566d3
Add Mutual SSL handling to AuthHandler
2017-04-28 16:32:57 +05:30
WSO2 Builder
3a9986d054
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare for next development iteration
2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b
[WSO2 Release] [Jenkins #2257 ] [Release 2.0.53] prepare release v2.0.53
2017-04-28 10:29:35 +05:30
megala21
47ce861b49
Fixing basic authenticator issue
2017-04-28 10:01:54 +05:30
megala21
4560348697
Fixing isses in authentication
2017-04-27 23:21:29 +05:30
megala21
b5e4c22c31
Merge remote-tracking branch 'upstream/master'
2017-04-27 21:55:32 +05:30
megala21
121c289b39
Adding security filters to web.xml
2017-04-27 17:36:10 +05:30
Harshan Liyanage
7744ee2aea
Merge pull request #716 from rasika/analytics-url
...
Enabling Statics URL
2017-04-27 12:44:55 +05:30
Harshan Liyanage
b9691988a9
Merge pull request #710 from rasika/master
...
Fixing Policy view and policy edit doesn't honor isCloud param
2017-04-27 12:44:16 +05:30
warunalakshitha
003c9c5907
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-27 12:23:17 +05:30
warunalakshitha
76f8d963f7
Improve push notifications for request with device list less than batch size
2017-04-27 12:23:01 +05:30
WSO2 Builder
726422dc81
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare for next development iteration
2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc
[WSO2 Release] [Jenkins #2250 ] [Release 2.0.52] prepare release v2.0.52
2017-04-26 21:31:08 +05:30
Ayyoob Hamza
3526e6425f
Merge pull request #709 from madawas/master
...
Fixing multitenant issue in certificate verification endpoint
2017-04-26 21:25:24 +05:30
Madawa Soysa
9ba509b512
Removing unnecessary variable.
...
These changes are suggested by a review.
2017-04-26 15:28:24 +05:30
WSO2 Builder
4429482a29
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare for next development iteration
2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f
[WSO2 Release] [Jenkins #2248 ] [Release 2.0.51] prepare release v2.0.51
2017-04-26 15:26:35 +05:30
Madawa Soysa
a7e61318b8
Fixing multitenant issue in certificate verification endpoint
2017-04-26 15:25:44 +05:30
ayyoob
a3910908f8
fixed an issue in the logging
2017-04-26 14:48:20 +05:30
ayyoob
018d875a84
removed temporary logs
...
(cherry picked from commit 615e44e)
2017-04-26 14:26:23 +05:30
kamidu
845a8cb8f7
enable statics url
2017-04-26 12:34:21 +05:30
WSO2 Builder
52b0165275
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare for next development iteration
2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf
[WSO2 Release] [Jenkins #2245 ] [Release 2.0.50] prepare release v2.0.50
2017-04-26 11:15:58 +05:30
ayyoob
9967d6e7da
few fixes after testing mqtt authorisation flow
...
(cherry picked from commit 4aba08b)
2017-04-26 10:20:03 +05:30
ayyoob
1e2ca17275
fixed few issues after testing
...
(cherry picked from commit 5b6d8d3)
2017-04-26 10:19:55 +05:30
warunalakshitha
97a53a7387
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-25 19:08:36 +05:30
warunalakshitha
9fa4eedca5
Add Scheduled for push notification sending
2017-04-25 19:07:37 +05:30
warunalakshitha
65667119f9
Add push notification configurations for push notification stratagies
2017-04-25 19:01:48 +05:30
warunalakshitha
3c1e4ba205
Add new classes for improve Performance of push notifications
2017-04-25 18:55:31 +05:30
Rasika Perera
636f0cbe98
#706 : Policy view and policy edit doesn't honor isCloud enabled parameter
2017-04-25 14:46:22 +05:30
WSO2 Builder
543e603298
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare for next development iteration
2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf
[WSO2 Release] [Jenkins #2242 ] [Release 2.0.49] prepare release v2.0.49
2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare for next development iteration
2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e
[WSO2 Release] [Jenkins #2240 ] [Release 2.0.48] prepare release v2.0.48
2017-04-25 08:58:32 +05:30
Rasika Perera
a107a0392e
Fixing #703 : missing ContentType header on datatable invoker api
2017-04-25 08:27:41 +05:30
Rasika Perera
7660bf8569
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-25 08:26:51 +05:30
ayyoob
3df2912a6a
added default UI for realtime,batch, device view and type view
2017-04-24 02:51:03 +05:30
ayyoob
2a89a2fb23
resolved issues in event management service
2017-04-22 18:31:13 +05:30
ayyoob
f834001d22
merged with origin
2017-04-22 01:24:24 +05:30
ayyoob
4ce8352690
added device event api
2017-04-22 00:15:58 +05:30
WSO2 Builder
c1b5a649f6
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare for next development iteration
2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4
[WSO2 Release] [Jenkins #2234 ] [Release 2.0.47] prepare release v2.0.47
2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad
Merge pull request #701 from amalhub/master
...
Merging Cloud updates to master
2017-04-21 15:59:00 +05:30
Jasintha
e6b38fbdb4
Implemeting dynamic recivers and streams deployment into DAS
2017-04-21 15:51:24 +05:30
Harshan Liyanage
273be79ca2
Resolving #695:Fix for Policy Delegation task is not starting for tenants in distributed setup
2017-04-21 15:49:40 +05:30
Madawa Soysa
0eeef0a568
Refactoring to use APIManager DCR
...
This commit is done to refactor the Auth application creation process to use the APIManager Key manager client registration endpoint instead of IOT DCR endpoint.
2017-04-21 15:46:18 +05:30
kamidu
a9888b5cf7
adding device cloud header
2017-04-21 15:43:39 +05:30
WSO2 Builder
1ecb4edbd7
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare for next development iteration
2017-04-21 15:31:09 +05:30
WSO2 Builder
48a8f43cb3
[WSO2 Release] [Jenkins #2232 ] [Release 2.0.46] prepare release v2.0.46
2017-04-21 15:30:57 +05:30
megala21
32ea2e52c4
Fixes https://github.com/wso2/product-iots/issues/373 and https://github.com/wso2/product-iots/issues/370
2017-04-21 15:18:20 +05:30
ayyoob
586bcae2b8
added default UI - initial commit
2017-04-20 17:55:23 +05:30
WSO2 Builder
16d97d62be
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare for next development iteration
2017-04-20 14:41:55 +05:30
WSO2 Builder
8891784b99
[WSO2 Release] [Jenkins #2229 ] [Release 2.0.45] prepare release v2.0.45
2017-04-20 14:41:41 +05:30
sinthuja
97ff0750ee
Merge pull request #694 from amalhub/master
...
Fixing security issue: Password Autocomplete in Firefox Browser
2017-04-20 14:35:48 +05:30
Amal Gunatilake
56cb6a3a1e
Fixing security issue: Password Autocomplete in Firefox Browser
...
https://github.com/wso2/product-iots/issues/372
2017-04-20 14:31:20 +05:30
ayyoob
ea6afee772
added device properties to a single table
2017-04-19 21:04:56 +05:30
ayyoob
0e9bb7caf6
corrected operation definition
2017-04-19 16:34:18 +05:30
ayyoob
c28f820455
added missing apis - operation and device management
2017-04-19 16:32:06 +05:30
WSO2 Builder
f7d1a7cf99
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare for next development iteration
2017-04-18 10:40:31 +05:30
WSO2 Builder
4b85af950c
[WSO2 Release] [Jenkins #2225 ] [Release 2.0.44] prepare release v2.0.44
2017-04-18 10:40:22 +05:30
ayyoob
0444f63a07
renamed method name
2017-04-18 10:13:58 +05:30
ayyoob
d121e557b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-17 17:44:48 +05:30
ayyoob
8a842e8f8e
restricted basic auth support
2017-04-17 17:37:46 +05:30
WSO2 Builder
b9e614e383
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare for next development iteration
2017-04-17 16:39:50 +05:30
WSO2 Builder
d37951ef3f
[WSO2 Release] [Jenkins #2222 ] [Release 2.0.43] prepare release v2.0.43
2017-04-17 16:39:37 +05:30
megala21
2360b338d8
Fixing the role creation problem
2017-04-17 13:14:14 +05:30
Rasika Perera
1a4f195a74
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-04-10 09:16:57 +05:30
WSO2 Builder
fc15f43b31
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare for next development iteration
2017-04-07 14:07:15 +05:30
WSO2 Builder
27b84bfc22
[WSO2 Release] [Jenkins #2210 ] [Release 2.0.42] prepare release v2.0.42
2017-04-07 14:07:01 +05:30
kamidu
8bc7362bc0
disableing advanced search
2017-04-07 13:47:22 +05:30
kamidu
a5a222ead6
fixing device status
2017-04-07 13:47:12 +05:30
Harshan Liyanage
46f418bafb
Api publishing timeout fixes for cloud.
2017-04-07 13:46:52 +05:30
kamidu
06366bff24
css changes for loading icon
2017-04-07 13:46:09 +05:30
kamidu
2c20070720
fixing icon issue in operation bar
2017-04-07 13:45:12 +05:30
kamidu
16b67bebda
hiding the advanced search
2017-04-07 13:44:57 +05:30
kamidu
9826a97d60
removing cope policies from cloud
2017-04-07 13:44:41 +05:30
Ace
903ab9abe3
Adding logic to acknowledge 404 response when tiers not available
2017-04-07 13:44:23 +05:30
kamidu
4cb816cb7f
policy filtering or cloud
2017-04-07 13:44:05 +05:30
Harshan Liyanage
6ad4a2634b
Fixed policy monitoring issue.
2017-04-07 13:43:49 +05:30
kamidu
57787a29c4
adding the new toplink json
2017-04-07 13:43:19 +05:30
WSO2 Builder
5496159f9d
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare for next development iteration
2017-04-05 11:58:36 +05:30
WSO2 Builder
ef94e90366
[WSO2 Release] [Jenkins #2206 ] [Release 2.0.41] prepare release v2.0.41
2017-04-05 11:58:23 +05:30
megala21
2b92676191
Fixes https://github.com/wso2/product-iots/issues/346
2017-04-05 11:02:58 +05:30
WSO2 Builder
a826370019
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare for next development iteration
2017-04-05 09:37:06 +05:30
WSO2 Builder
4654a4db45
[WSO2 Release] [Jenkins #2204 ] [Release 2.0.40] prepare release v2.0.40
2017-04-05 09:36:53 +05:30
Amal Gunatilake
980a90900d
Merge pull request #679 from Megala21/fix_group_share_ui
...
Fixes https://github.com/wso2/product-iots/issues/335
2017-04-05 09:21:45 +05:30
WSO2 Builder
8b7e458592
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare for next development iteration
2017-04-04 18:08:44 +05:30
WSO2 Builder
6297993560
[WSO2 Release] [Jenkins #2201 ] [Release 2.0.39] prepare release v2.0.39
2017-04-04 18:08:31 +05:30
lakshani
0f1b17a25e
Fixed the issue in application restriction for iOS
2017-04-04 18:00:24 +05:30
megala21
5cd58d7454
Fixes https://github.com/wso2/product-iots/issues/335
2017-04-04 14:18:24 +05:30
warunalakshitha
7517c58799
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-03-31 17:57:32 +05:30
WSO2 Builder
802c83de39
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare for next development iteration
2017-03-29 23:16:15 +05:30
WSO2 Builder
98dda03784
[WSO2 Release] [Jenkins #2193 ] [Release 2.0.38] prepare release v2.0.38
2017-03-29 23:16:04 +05:30
sinthuja
18583af6b4
Fixing the case where multiple tags were passed for searching the APIs.
2017-03-29 23:07:18 +05:30
WSO2 Builder
f3e119cd78
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare for next development iteration
2017-03-28 12:48:31 +05:30
WSO2 Builder
a8f8a49a80
[WSO2 Release] [Jenkins #2190 ] [Release 2.0.37] prepare release v2.0.37
2017-03-28 12:48:20 +05:30
Harshan Liyanage
9e4d84dfb2
Fix for Advanced Search Issue #670
2017-03-28 12:37:28 +05:30
warunalakshitha
5831d277da
Fixing https://github.com/wso2/carbon-device-mgt-plugins/issues/613
2017-03-27 11:48:30 +05:30
Rasika Perera
6a623f5657
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-03-27 10:03:15 +05:30
lakshani
5c7cfda487
Fixed jira IOTS-438
2017-03-24 15:42:54 +05:30
WSO2 Builder
0e5895ec78
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare for next development iteration
2017-03-24 12:06:23 +05:30
WSO2 Builder
d6080159cb
[WSO2 Release] [Jenkins #2183 ] [Release 2.0.36] prepare release v2.0.36
2017-03-24 12:06:12 +05:30
Amal Gunatilake
e9c2f3e72d
Merge branch 'master' into cloud-3.1.0
2017-03-24 11:55:35 +05:30
WSO2 Builder
3f8f8b3ab9
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare for next development iteration
2017-03-23 18:59:18 +05:30
WSO2 Builder
6a9a5ba9c8
[WSO2 Release] [Jenkins #2180 ] [Release 2.0.35] prepare release v2.0.35
2017-03-23 18:59:07 +05:30
amalhub
c65f9c6dcb
Fixing issue: https://github.com/wso2/product-iots/issues/314
2017-03-23 15:51:46 +05:30
kamidu
3b9ae200e7
fixing posible null pointer excep
2017-03-23 14:12:12 +05:30
kamidu
a85b5688a9
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-03-23 12:23:39 +05:30
kamidu
0b94a284ad
new role filtering related fixes
2017-03-23 12:23:21 +05:30
kamidu
8c17418198
fixing the null pointer exception
2017-03-23 12:23:02 +05:30
kamidu
530e603fb5
enable role filtering and role count in device cloud
2017-03-23 12:22:27 +05:30
kamidu
cda0dd417f
fixing the role filtering api issues
2017-03-23 12:21:41 +05:30
Harshan Liyanage
d468ac07d0
Revert "Allowing configuration management in cloud environment"
2017-03-23 11:12:15 +05:30
Madawa Soysa
da69bc9fe5
Allowing configuration management in cloud environment
2017-03-23 11:06:52 +05:30
charitha
6656f9e6f0
Add support for hybrid device types which has emulation/virtual capabilities
...
(cherry picked from commit 78b7037
2017-03-23 01:07:28 +05:30
kamidu
e205fd97cd
fix the user view related issues and device location out dated issue
2017-03-22 20:14:50 +05:30
kamidu
1f572998f8
enable role filtering in device cloud
2017-03-22 20:13:59 +05:30
kamidu
73ab0a38bf
adding get location api witch was missing from previous emm versions
2017-03-22 20:13:08 +05:30
kamidu
a6f5c002a9
adding get location api witch was missing from previous emm versions
2017-03-22 20:12:50 +05:30
kamidu
a77794f81a
adding role filtering for device cloud via api
2017-03-22 20:12:30 +05:30
kamidu
fc6c8e0290
adding get location api witch was missing from previous emm versions
2017-03-22 20:11:41 +05:30
Susinda Perera
643be65cf9
Merge pull request #662 from amalhub/master
...
Once the password is changed - Curent user should be immediately logout
2017-03-22 15:54:33 +05:30
amalhub
4c6781d6b6
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/645 , Once the password is changed - Curent user should be immediately logout
2017-03-22 15:37:16 +05:30
WSO2 Builder
e8ee33e7a4
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare for next development iteration
2017-03-22 15:24:27 +05:30
WSO2 Builder
6cc898d2ab
[WSO2 Release] [Jenkins #2177 ] [Release 2.0.34] prepare release v2.0.34
2017-03-22 15:24:16 +05:30
Geeth
c0a474f6fc
Merge pull request #661 from charithag/master
...
Fixes and improvments
2017-03-22 15:18:50 +05:30
charitha
78b7037aa9
Add support for hybrid device types which has emulation/virtual capabilities
2017-03-22 15:04:21 +05:30
WSO2 Builder
a26a4bb539
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare for next development iteration
2017-03-22 14:25:54 +05:30
WSO2 Builder
000601911f
[WSO2 Release] [Jenkins #2175 ] [Release 2.0.33] prepare release v2.0.33
2017-03-22 14:25:43 +05:30
amalhub
af4ab19132
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/647
2017-03-22 12:16:12 +05:30
WSO2 Builder
50c9eb9ba4
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare for next development iteration
2017-03-21 20:02:26 +05:30
WSO2 Builder
ca79804c5c
[WSO2 Release] [Jenkins #2172 ] [Release 2.0.32] prepare release v2.0.32
2017-03-21 20:02:14 +05:30
sinthuja
54888b6727
Adding back the webscoket credential method invocation, as it's needed by the pugins.
2017-03-21 19:44:02 +05:30
charitha
5ff3ba3fcc
Fix issue in showing dynamic icons
2017-03-21 11:14:27 +05:30
kamidu
bf1548c062
title app name changed
2017-03-21 10:52:12 +05:30
WSO2 Builder
a35205c480
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare for next development iteration
2017-03-20 16:49:31 +05:30
WSO2 Builder
ac379c9bf9
[WSO2 Release] [Jenkins #2169 ] [Release 2.0.31] prepare release v2.0.31
2017-03-20 16:49:20 +05:30
Harshan Liyanage
df6d8d4496
Merge pull request #656 from Kamidu/cloud-3.1.0
...
Fixing Git Issue : https://github.com/wso2/carbon-device-mgt/issues/643
2017-03-20 16:43:33 +05:30
kamidu
fef7a58ad4
title app name changed
2017-03-20 14:29:27 +05:30
Susinda
5d10575de8
Merge remote-tracking branch 'upstream/master'
2017-03-16 18:04:52 +05:30
Susinda
dc0606f207
Fixing typo in above commit
2017-03-16 17:24:19 +05:30
Susinda
96d45d006d
Fixing #645 , when password is changed redirect to logout
2017-03-16 17:21:48 +05:30
WSO2 Builder
de25f3afe3
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare for next development iteration
2017-03-16 16:59:42 +05:30
WSO2 Builder
55ecafe7f4
[WSO2 Release] [Jenkins #2163 ] [Release 2.0.30] prepare release v2.0.30
2017-03-16 16:59:28 +05:30
Amal Gunatilake
f93bac489f
Merge pull request #654 from susinda/master
...
Fixing #644
2017-03-16 15:37:56 +05:30
Susinda
226db9a230
Fixing #644
2017-03-16 15:28:45 +05:30
Amal Gunatilake
5ef2d9d121
Merge pull request #653 from susinda/master
...
Typo Fxed
2017-03-16 15:06:52 +05:30
Susinda
b3295ca2ef
Typo Fxed
2017-03-16 15:03:48 +05:30
WSO2 Builder
15d57f71ad
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare for next development iteration
2017-03-16 11:10:29 +05:30
WSO2 Builder
3af9e1729a
[WSO2 Release] [Jenkins #2161 ] [Release 2.0.29] prepare release v2.0.29
2017-03-16 11:10:11 +05:30
Amal Gunatilake
dbf657fae8
Merge pull request #640 from susinda/master
...
Fixing: https://github.com/wso2/carbon-device-mgt/issues/639
2017-03-16 10:48:26 +05:30
WSO2 Builder
322f39596e
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare for next development iteration
2017-03-15 18:46:16 +05:30
WSO2 Builder
18244d6c96
[WSO2 Release] [Jenkins #2158 ] [Release 2.0.28] prepare release v2.0.28
2017-03-15 18:46:03 +05:30
WSO2 Builder
12f21868dc
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare for next development iteration
2017-03-15 18:04:26 +05:30
WSO2 Builder
4328c3c39d
[WSO2 Release] [Jenkins #2157 ] [Release 2.0.27] prepare release v2.0.27
2017-03-15 18:04:12 +05:30
Kamidu Sachith Punchihewa
14d517e89d
Merge pull request #641 from wso2/cloud-3.1.0
...
Cloud related fixes
2017-03-15 17:47:26 +05:30
kamidu
42f2691962
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-03-15 17:46:08 +05:30
kamidu
e30a5910f1
change the device cloud documentation link
2017-03-15 17:45:09 +05:30
kamidu
f3a61cb8f3
enhasing toplink
2017-03-15 17:43:20 +05:30
Susinda
cd4902f8ab
phoneNumber -> PhoneNumber
2017-03-15 16:04:06 +05:30
WSO2 Builder
c6bb8e0128
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare for next development iteration
2017-03-14 17:47:54 +05:30
WSO2 Builder
da9002ba9f
[WSO2 Release] [Jenkins #2154 ] [Release 2.0.26] prepare release v2.0.26
2017-03-14 17:47:43 +05:30
Susinda
a539775583
Fixing carbon-device-mgt/issues/639
2017-03-14 17:41:35 +05:30
amalhub
541f5440ab
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-03-14 17:09:57 +05:30
amalhub
2c0ac79dce
Fixing issue: https://github.com/wso2/carbon-device-mgt/issues/637
2017-03-14 17:07:16 +05:30
Hasunie
1ee313ea77
Merge pull request #636 from harshanL/cloud-3.1.0
...
Fixed Device renaming issue.
2017-03-14 16:49:21 +05:30
WSO2 Builder
6114f4b2d5
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare for next development iteration
2017-03-14 15:27:06 +05:30
WSO2 Builder
ea8f19f26d
[WSO2 Release] [Jenkins #2152 ] [Release 2.0.25] prepare release v2.0.25
2017-03-14 15:26:55 +05:30
Harshan Liyanage
1cbdb84cf1
Fixed merge conflicts with PR-623
2017-03-14 14:59:03 +05:30
Harshan Liyanage
e686b2af0e
Resolved merge conflicts
2017-03-14 14:54:48 +05:30
kamidu
6fe7470af5
re enabling device renaming
2017-03-14 14:29:36 +05:30
Harshan Liyanage
755786db8b
Merge branch 'master' of https://github.com/sameeragunarathne/carbon-device-mgt into sameeragunarathne-master
2017-03-14 14:26:40 +05:30
Harshan Liyanage
06ccbe28cc
Fixed Device renaming issue.
2017-03-14 14:13:21 +05:30
WSO2 Builder
d433525145
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare for next development iteration
2017-03-14 14:09:19 +05:30
WSO2 Builder
35ee3eca3a
[WSO2 Release] [Jenkins #2150 ] [Release 2.0.24] prepare release v2.0.24
2017-03-14 14:09:08 +05:30
kamidu
3ff2c9894f
role filtering for device cloud is enabled
2017-03-14 14:06:22 +05:30
Harshan Liyanage
75486b3bb8
Fixed Device renaming issue.
2017-03-14 13:42:32 +05:30
sameera910409
33132b1f8e
refactor code for firebase cloud messaging
2017-03-14 10:26:23 +05:30
WSO2 Builder
4e0afb7d39
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare for next development iteration
2017-03-13 18:09:06 +05:30
WSO2 Builder
33f1448c82
[WSO2 Release] [Jenkins #2146 ] [Release 2.0.23] prepare release v2.0.23
2017-03-13 18:08:55 +05:30
Harshan Liyanage
3ab025a6d8
Merge pull request #631 from ayyoob/cloud-3.1.0
...
added claimable property and fixed unsecured endpoint bug
2017-03-13 18:03:18 +05:30
ayyoob
b1b0b03ce1
changed license year
2017-03-13 18:01:41 +05:30
Kamidu Punchihewa
e063fd0da9
code cleanup results
2017-03-13 17:11:07 +05:30
Kamidu Punchihewa
e6333438b9
ading role filtering and ui fixes
2017-03-13 17:01:54 +05:30
WSO2 Builder
e95e96f06c
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare for next development iteration
2017-03-10 13:09:08 +05:30
WSO2 Builder
5d55413e02
[WSO2 Release] [Jenkins #2141 ] [Release 2.0.22] prepare release v2.0.22
2017-03-10 13:08:55 +05:30
Susinda
40469d0e4d
Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project
2017-03-10 12:57:47 +05:30
Susinda
e23aaa6647
Adding Hasunie's fix on initialOperations implementation
2017-03-10 11:54:43 +05:30
Susinda
7083c4ec9b
version corrected to 2.0.22-SNAPSHOT
2017-03-09 14:49:49 +05:30
Susinda Perera
bd7d6939e5
Merge pull request #628 from susinda/master
...
Merging from cloud-3.1.0
2017-03-09 13:58:59 +05:30
Susinda
e83fa8cb02
org.wso2.carbon.apimgt.integration.generated.client version increment
2017-03-09 13:50:15 +05:30
WSO2 Builder
ae3300afde
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare for next development iteration
2017-03-09 13:14:50 +05:30
WSO2 Builder
6646c0c56f
[WSO2 Release] [Jenkins #2134 ] [Release 2.0.21] prepare release v2.0.21
2017-03-09 13:14:38 +05:30
Susinda Perera
7c9659ed29
Merge pull request #1 from susinda/cloud-3.1.0
...
Cloud 3.1.0
2017-03-09 12:44:36 +05:30
WSO2 Builder
21cdcdd21a
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare for next development iteration
2017-03-09 12:38:02 +05:30
WSO2 Builder
23be60ebd0
[WSO2 Release] [Jenkins #2133 ] [Release 2.0.20] prepare release v2.0.20
2017-03-09 12:37:49 +05:30
kamidu
0fade6aa9f
remove the cloud related config from config.jason
2017-03-08 15:54:08 +05:30
kamidu
dd26f366df
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-03-08 12:50:07 +05:30
kamidu
f9a03133fa
device cloude related ui improvements
2017-03-08 12:49:52 +05:30
ayyoob
2384755a97
added claimable property and fixed unsecured endpoint bug
2017-03-08 03:14:51 +05:30
ayyoob
964fb7ce72
regenerated swagger api based on apimgt 2.1.0 rest api
2017-03-07 01:56:51 +05:30
ayyoob
525b55d603
avoid race condition by loading tiers
2017-03-06 11:30:22 +05:30
ayyoob
5e4b0564b7
added permission fix for operation and synchronised application creation to avoid duplicate subscription
2017-03-03 17:02:36 +05:30
ayyoob
6a0c0cb299
added default permissions
2017-03-02 20:27:32 +05:30
Megala
a2d0c59e17
Revert 2988357eb9
2017-03-02 15:18:34 +05:30
Megala
4fdeec89cc
Revert f3f7635d3b
2017-03-02 15:11:59 +05:30
ayyoob
d66e439f49
added carbon local ip as config
2017-03-02 14:05:57 +05:30
Susinda
09b74211c4
increment carbon-devicemgt version to 2.0.20
2017-03-02 12:39:19 +05:30
ayyoob
5d3aa49e06
added logger trace support for apim integration service
2017-03-02 00:31:34 +05:30
ayyoob
c088a9bc93
fixed api subscribe issue for device specific app creation
2017-03-01 23:26:17 +05:30
WSO2 Builder
7f98d37835
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare for next development iteration
2017-02-28 21:22:53 +05:30
WSO2 Builder
b03936ca49
[WSO2 Release] [Jenkins #2122 ] [Release 2.0.19] prepare release v2.0.19
2017-02-28 21:19:50 +05:30
charitha
abdffdbf39
Add tenant id to Enrollment Certificate
2017-02-28 21:18:46 +05:30
charitha
14dfc1b538
Fix minor issues found with jmeter tests
2017-02-28 21:18:22 +05:30
madhawap
f1b761d987
Minor code formating
2017-02-28 21:16:56 +05:30
Kamidu Sachith Punchihewa
8e530b0523
adding the removed tenant based token handlers
2017-02-28 21:16:21 +05:30
WSO2 Builder
82888e1d20
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare for next development iteration
2017-02-28 21:15:10 +05:30
WSO2 Builder
b11c2e451b
[WSO2 Release] [Jenkins #2109 ] [Release 2.0.18] prepare release v2.0.18
2017-02-28 21:14:44 +05:30
WSO2 Builder
67a091ff5a
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
2017-02-28 21:12:47 +05:30
WSO2 Builder
dcc2088455
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
2017-02-28 21:12:14 +05:30
lakshani
eb12e5b9f1
Adding commit 'added java doc comments'
2017-02-28 21:11:15 +05:30
lakshani
9e5574dccc
Adding commit 'added change device status to device view page'
2017-02-28 21:09:05 +05:30
lakshani
3f90b403c0
Adding lakshani's commit 'updated device status button'
2017-02-28 21:03:53 +05:30
WSO2 Builder
927b2d451d
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
2017-02-28 21:00:32 +05:30
WSO2 Builder
dfe9b1ff9c
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
2017-02-28 21:00:08 +05:30
charitha
7374a0825d
Fix https://wso2.org/jira/browse/IOTS-436
2017-02-28 20:56:32 +05:30
charitha
d2991585aa
Applying charithas commit on IOTS-436
2017-02-28 20:56:25 +05:30
ayyoob
470500b80e
added ssl context
2017-02-27 16:44:21 +05:30
geethkokila
e90dc8b6c1
Fixing the compile error
2017-02-24 12:32:00 +05:30
geethkokila
d8303356cd
Fixing the conflicts
2017-02-24 12:16:14 +05:30
kamidu
b7e3b28722
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-20 18:20:14 +05:30
kamidu
4e16e29b1c
removing group sharing
2017-02-20 18:20:04 +05:30
Imesh Chandrasiri
3c90f8ad49
temporary removal of view analytics
2017-02-20 17:19:20 +05:30
Imesh Chandrasiri
8cf92e8a5b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-20 15:11:08 +05:30
Imesh Chandrasiri
a938d57a65
Removing analytics link from groups listing
2017-02-20 15:11:00 +05:30
Kamidu Sachith Punchihewa
587c798f09
Merge pull request #613 from Kamidu/cloud-3.1.0
...
remove tennent related token handlers
2017-02-19 21:49:58 +05:30
Kamidu Sachith Punchihewa
4a5c99af78
remove tennent related token handlers
2017-02-19 21:49:19 +05:30
Imesh Chandrasiri
5097416d69
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-19 19:34:35 +05:30
Imesh Chandrasiri
368647f176
Temporary advance search removal commit
2017-02-19 19:34:28 +05:30
Kamidu Sachith Punchihewa
112efda8d5
Merge pull request #611 from Kamidu/cloud-3.1.0
...
removing device edit option
2017-02-19 18:45:07 +05:30
Kamidu Sachith Punchihewa
0da8847787
removing device edit option
2017-02-19 18:44:39 +05:30
Imesh Chandrasiri
f5e5dce872
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-19 18:25:07 +05:30
Imesh Chandrasiri
ee209064e3
Tooltip css fix
2017-02-19 18:24:59 +05:30
Kamidu Sachith Punchihewa
367dc1a30b
resolving return type issue in group mgt
2017-02-19 17:48:11 +05:30
Kamidu Sachith Punchihewa
527b844ee3
Error handled on the user session invalidation
2017-02-19 16:03:49 +05:30
Kamidu Sachith Punchihewa
318fbf9215
role loading issues
2017-02-19 15:54:53 +05:30
Kamidu Sachith Punchihewa
282801c814
updating cloud dashboard
2017-02-19 15:32:28 +05:30
kamidu
7480ccaa15
fixing datatable issues
2017-02-17 17:56:29 +05:30
kamidu
3e061f6e8b
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-17 16:29:22 +05:30
kamidu
6a67f251ac
cloud related ui fixs
2017-02-17 16:29:11 +05:30
Hasunie
8bb75d291c
Avoiding package exporting org.wso2.carbon.device.mgt.core.internal
2017-02-16 18:30:40 +05:30
Hasunie
2a9027a15e
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-16 18:19:35 +05:30
Hasunie
6b1ab86276
fixing policyManagementDataHolder issue
2017-02-16 18:19:05 +05:30
Imesh Chandrasiri
3786ef2636
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-16 16:49:54 +05:30
Imesh Chandrasiri
0cddd896d4
Tooltip fix
2017-02-16 16:49:44 +05:30
kamidu
4725eb3c3b
chenge the group creating steps
2017-02-16 11:59:47 +05:30
kamidu
486e02fd71
adding ui changes to the cloud related uis
2017-02-16 06:11:42 +05:30
Hasunie
315be0a3c7
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-15 18:09:29 +05:30
Rasika Perera
9ca552584a
Merge pull request #602 from rasika/cloud-3.1.0
...
Adding tooltips
2017-02-15 13:49:28 +05:30
Rasika Perera
b8a1b945bb
Adding tooltips
2017-02-15 13:47:59 +05:30
Imesh Chandrasiri
9d80fcfd54
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-14 22:38:27 +05:30
Imesh Chandrasiri
7bc5d35746
data table padding fix
2017-02-14 22:38:09 +05:30
Kamidu Sachith Punchihewa
4d02f9971e
Merge pull request #591 from Kamidu/cloud-3.1.0
...
enable cloud related configurations to the devicemgt application
2017-02-14 22:29:25 +05:30
Hasunie
b584a39a41
removing comma seperation in import packages
2017-02-14 22:28:00 +05:30
Hasunie
476e439fe2
Fixing the task to get the only device registered tenants
2017-02-14 22:16:55 +05:30
Rasika Perera
d92c52b89b
Adding cloud error pages for jaggery.conf
2017-02-14 19:49:41 +05:30
Rasika Perera
8931478a55
Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json
2017-02-14 19:38:11 +05:30
kamidu
aba4ceaf76
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-14 19:28:22 +05:30
kamidu
587f847934
ui improvements to device cloud
2017-02-14 19:28:09 +05:30
Milan Perera
28606f1729
Merge pull request #598 from ayyoob/210releasepatch
...
210releasepatch
2017-02-14 15:52:05 +05:30
Imesh Chandrasiri
c26d7fd15d
Changed device loading icon for device loading page
2017-02-14 15:15:38 +05:30
Imesh Chandrasiri
dcb29b7792
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-14 14:48:48 +05:30
Imesh Chandrasiri
5a7fa99e0a
Fix data table icon padding issue
2017-02-14 14:48:38 +05:30
Rasika Perera
fbae181f07
Fixing footer getting cluttered on /devicemgt/devices/search page
2017-02-14 14:46:17 +05:30
Rasika Perera
dd645a9fda
Fixing footer getting cluttered on /devicemgt/devices/search page
2017-02-14 14:43:16 +05:30
Imesh Chandrasiri
b579870672
Data table icon cursor added
2017-02-14 13:21:59 +05:30
Imesh Chandrasiri
23edb1de7a
Model Popup title space issue fix
2017-02-14 10:23:58 +05:30
Imesh Chandrasiri
8bbb612de6
Fixing cloud header height issue and theme color
2017-02-13 16:06:28 +05:30
geethkokila
f3f7635d3b
Fixing the task to get the only the device enrolled tenants
2017-02-13 12:34:09 +05:30
kamidu
8a07639d6b
Fix responsive issue in clud header
2017-02-10 03:25:01 +05:30
kamidu
6e19ec31e3
fix url issues in the config.json
2017-02-10 02:47:25 +05:30
kamidu
b946eeae74
fix url issues in the config.json
2017-02-09 23:24:15 +05:30
kamidu
f772b35769
enable cloud related configurations to the devicemgt application
2017-02-09 20:15:49 +05:30
kamidu
4eaf2b41c8
enable cloud related configurations to the devicemgt application
2017-02-09 20:02:28 +05:30
ayyoob
dac7d3c1ee
made device management to be default tag
2017-02-09 09:59:06 +05:30
ayyoob
67ae4c7c68
fixed api subscription issue
2017-02-09 09:11:22 +05:30
ayyoob
6c96d228ae
added subscription fix
2017-02-09 03:02:56 +05:30
ayyoob
018b230b5a
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-02-08 13:12:30 +05:30
ayyoob
87910bc92b
transferred mutual authenticator to jwt authenticator
2017-02-08 13:10:36 +05:30
kamidu
ddef86e226
stylish issues
2017-02-07 20:38:10 +05:30
kamidu
9cba33a6dc
Modification to the header panel
2017-02-07 15:28:19 +05:30
WSO2 Builder
b051bd108b
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare for next development iteration
2017-02-06 22:57:33 +05:30
WSO2 Builder
ce78ac277e
[WSO2 Release] [Jenkins #2094 ] [Release 2.0.17] prepare release v2.0.17
2017-02-06 22:57:23 +05:30
lakshani
18cb2b3e1f
added java doc comments
2017-02-06 22:33:50 +05:30
lakshani
a2679fde4c
added change device status to device view page
2017-02-06 22:23:55 +05:30
kamidu
fd3ff5496c
cloud relatd ui fixes
2017-02-06 17:23:28 +05:30
lakshani
2d83033b26
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicestatus
2017-02-06 14:05:32 +05:30
lakshani
a9a6883adc
updated device status button
2017-02-06 14:05:11 +05:30
WSO2 Builder
c954731870
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare for next development iteration
2017-02-06 12:15:58 +05:30
WSO2 Builder
e68c3d170b
[WSO2 Release] [Jenkins #2092 ] [Release 2.0.16] prepare release v2.0.16
2017-02-06 12:15:44 +05:30
Kamidu Sachith Punchihewa
681c320542
Update user-menu.hbs
2017-02-06 12:02:13 +05:30
Kamidu Sachith Punchihewa
00b1f982c6
Update user-menu.hbs
2017-02-06 12:01:27 +05:30
ayyoob
ed7b67dd24
made it accept tenant domain as parameter
2017-02-06 03:47:27 +05:30
ayyoob
b7566f4e4a
added artifact deployment support through UI
2017-02-05 17:51:48 +05:30
ayyoob
0999bb70a0
exposed artefact deployment through api
...
Merged Jasintha’s code
2017-02-05 17:51:15 +05:30
ayyoob
274d3e9aeb
used jwt grant type instead of saml
2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa
559fe98cc9
Merge pull request #585 from wso2/master
...
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare for next development iteration
2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d
[WSO2 Release] [Jenkins #2086 ] [Release 2.0.15] prepare release v2.0.15
2017-02-03 16:08:12 +05:30
kamidu
befa75af9a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-02-03 12:44:09 +05:30
kamidu
6af09cdd31
Remove the defaut black color for icons
2017-02-03 12:44:01 +05:30
WSO2 Builder
1bc8f5c28d
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare for next development iteration
2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790
[WSO2 Release] [Jenkins #2083 ] [Release 2.0.14] prepare release v2.0.14
2017-02-02 15:56:36 +05:30
Hasunie
54d0d7a5ee
Merge pull request #582 from charithag/master-update-swagger-docs
...
Update swagger docs
2017-02-02 14:59:06 +05:30
kamidu
41fd402619
DIABLE CLOUD UI IN THE MASTER
2017-02-02 13:13:39 +05:30
kamidu
43b0d1f1ce
Enable appstore and app publisher
2017-02-02 13:07:41 +05:30
Milan Perera
701d6e4522
Updated the snapshot version of intergration client
2017-02-01 12:55:56 +05:30
Milan Perera
a5f41ef734
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
2017-02-01 12:14:59 +05:30
ayyoob
1387d326ca
merged with origin
2017-02-01 00:08:14 +05:30
ayyoob
4ec7762a5c
made it use the default saml grant type
2017-01-31 23:06:19 +05:30
Milan Perera
41353f8014
Fixed issues in scope validation feature
2017-01-31 16:37:33 +05:30
kamidu
4b396cf321
enable location without das
2017-01-31 13:41:49 +05:30
ayyoob
38f61adf94
few changes after testing multi tenancy
2017-01-30 22:14:26 +05:30
charitha
8e01a98ded
Removed unused Dashboard API
2017-01-30 20:41:31 +05:30
charitha
423879bee7
Updated swagger docs
2017-01-30 20:41:05 +05:30
charitha
3cf797fba6
Removed hardcoded device types in swagger docs
2017-01-30 17:25:27 +05:30
WSO2 Builder
5dc55bb5b5
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare for next development iteration
2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20
[WSO2 Release] [Jenkins #2076 ] [Release 2.0.13] prepare release v2.0.13
2017-01-30 16:05:29 +05:30
lakshani
3b32635cf9
removed unwanted new lines
2017-01-30 15:48:15 +05:30
lakshani
bbcdf7aeda
removed unwanted new line
2017-01-30 07:54:43 +05:30
lakshani
26f2e2d2ae
added role query param to getdevices restapis
2017-01-30 07:50:10 +05:30
WSO2 Builder
c17bead1fc
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare for next development iteration
2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8
[WSO2 Release] [Jenkins #2069 ] [Release 2.0.12] prepare release v2.0.12
2017-01-29 19:45:51 +05:30
GPrathap
9cdcb58103
uncommenting required fields
2017-01-29 17:02:38 +05:30
GPrathap
e7e8cb62b6
fixing permission issue when viewing device analytics dashboard
2017-01-29 16:51:59 +05:30
GPrathap
47e6f6d292
adding username as parameter
2017-01-29 16:51:37 +05:30
Milan Perera
2b4a3cde61
Fixed conflicts and merged
2017-01-26 14:59:05 +05:30
Milan Perera
7ba1dc989a
Implemented a scope delegation validator
2017-01-26 14:51:30 +05:30
Milan Perera
21d8d14b7e
Fixed multy tenancy issues related to android device type
2017-01-26 14:50:12 +05:30
ayyoob
30119ff263
fixed data holder issue
2017-01-26 12:38:26 +05:30
geethkokila
713ddbf416
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
2017-01-26 12:08:10 +05:30
geethkokila
2988357eb9
Changing the task to run for all the tenants
2017-01-26 12:07:29 +05:30
ayyoob
0c4a78f3e9
fixed api Id issue for subscription
2017-01-26 00:02:17 +05:30
ayyoob
3c45f9af11
fixed api Id issue for subscription
2017-01-25 22:15:03 +05:30
ayyoob
159e067fed
changed integration client version
2017-01-25 14:03:38 +05:30
ayyoob
b42505c1fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
2017-01-25 14:01:03 +05:30
ayyoob
1a7a215441
added missing license headers
2017-01-25 14:00:31 +05:30
ayyoob
1370b87618
fixed apim application issue
2017-01-25 09:24:23 +05:30
WSO2 Builder
cd7e0feaa6
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare for next development iteration
2017-01-24 23:22:44 +05:30
WSO2 Builder
abb150d9bd
[WSO2 Release] [Jenkins #2062 ] [Release 2.0.11] prepare release v2.0.11
2017-01-24 23:22:33 +05:30
ayyoob
7348ae2f2a
resolved merge issues
2017-01-24 19:49:40 +05:30
ayyoob
3423ef025d
merged with upstream
2017-01-24 19:39:49 +05:30
ayyoob
e74b4e23c4
removed apim dependency from cdmf
2017-01-24 19:32:59 +05:30
Milan Perera
e29aa58e19
Removed tenant domain from Basic Authenticator
2017-01-24 14:22:12 +05:30
WSO2 Builder
002fb8719b
[maven-release-plugin] prepare for next development iteration
2017-01-23 20:24:47 +00:00
WSO2 Builder
04f32902fd
[maven-release-plugin] prepare release v2.0.10
2017-01-23 20:21:44 +00:00
Rasika Perera
704680d68d
Fixing null pointer when roles are not specified on creating new user
2017-01-24 01:54:37 +05:30
Rasika Perera
9a0ba9137b
Fixed permissions issue on grouping
2017-01-23 16:24:20 +05:30
Rasika Perera
d723e22a8c
Fixed roleUpdate issue
2017-01-23 14:35:03 +05:30
WSO2 Builder
5c207897ad
[maven-release-plugin] prepare for next development iteration
2017-01-20 12:44:14 +00:00
WSO2 Builder
233d14edbd
[maven-release-plugin] prepare release v2.0.9
2017-01-20 12:41:33 +00:00
Rasika Perera
8e6855a203
Adding DEFAULT_DEVICE_USER on adding user
2017-01-20 18:01:56 +05:30
Rasika Perera
5ce413012e
Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN
2017-01-20 18:01:55 +05:30
Rasika Perera
5aa8776bfe
Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port
2017-01-20 15:50:35 +05:30
Rasika Perera
42816101bb
Merge pull request #566 from wso2/release-2.0.8
...
Release 2.0.8
2017-01-20 15:42:12 +05:30
Imesh Chandrasiri
3983780f7f
Fix for multiple advance search element
2017-01-20 15:09:00 +05:30
Imesh Chandrasiri
a5d1f70c93
git status
2017-01-20 15:08:27 +05:30
Imesh Chandrasiri
ef80d62307
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-20 11:50:46 +05:30
Imesh Chandrasiri
9f262c1afb
Message container markup fix for advance search
2017-01-20 11:50:39 +05:30
WSO2 Builder
eedecf00ed
[maven-release-plugin] prepare for next development iteration
2017-01-19 23:23:04 +00:00
WSO2 Builder
ef57fc463b
[maven-release-plugin] prepare release v2.0.8
2017-01-19 23:20:20 +00:00
Ayyoob Hamza
96f0c633d9
Merge pull request #563 from madhawap/release-2.0.x
...
parameterizing sso config
2017-01-20 01:05:19 +05:30
madhawap
348b349a37
parameterizing sso config
2017-01-20 00:27:36 +05:30
Rasika Perera
212cc52eb2
Merge pull request #562 from Kamidu/release-2.0.x
...
improvements for location view
2017-01-19 22:45:38 +05:30
kamidu
eb17093747
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-19 22:37:19 +05:30
kamidu
bf38ad5f70
adding location history to map view
2017-01-19 22:37:08 +05:30
Rasika Perera
fb1f7771c4
Fixing "process" not found on devicemgt
2017-01-19 22:36:21 +05:30
Rasika Perera
b39caade98
Adding system params picking up for app-conf.json
2017-01-19 19:42:41 +05:30
Rasika Perera
3a2b206fe6
Fixing certificate management api returns 403 forbidden
2017-01-19 19:41:21 +05:30
Rasika Perera
ff2cd32bce
Merge pull request #561 from geethkokila/release-2.0.x
...
Adding the fixes for device search
2017-01-19 19:32:39 +05:30
geethkokila
2743bf9458
Fixing the security issue due to not using prepared statement
2017-01-19 17:51:42 +05:30
geethkokila
7359b4c536
Fixing the security issue due to not using prepared statement
2017-01-19 17:51:32 +05:30
kamidu
bd75b789c2
Enable location histry for android sense
2017-01-19 17:43:33 +05:30
Imesh Chandrasiri
bc59ac6819
Adding action buttons to listing views
2017-01-19 14:08:59 +05:30
Imesh Chandrasiri
ba23e5cfd9
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-19 10:58:47 +05:30
Imesh Chandrasiri
9533bc9ac8
Adding advance search to devices page
2017-01-19 10:58:05 +05:30
Rasika Perera
e86776eb0b
Fixing "process" not found issues
2017-01-19 07:41:12 +05:30
Rasika Perera
3ff4e37937
Merge pull request #557 from DimalChandrasiri/release-2.0.x
...
Group detail view responsive issue fix
2017-01-19 01:25:19 +05:30
Rasika Perera
6733190760
Merge pull request #556 from Kamidu/release-2.0.x
...
Enable location history
2017-01-19 01:24:58 +05:30
Rasika Perera
15a919b8a7
Added parameters for configs
2017-01-19 00:55:30 +05:30
Rasika Perera
252eb78124
Now UI configs supports system parameters with eg. %iot.core.host%
2017-01-19 00:55:02 +05:30
Imesh Chandrasiri
75f2015f5a
Group detail view responsive issue fix
2017-01-18 23:27:16 +05:30
kamidu
fb89476e16
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-18 22:39:07 +05:30
kamidu
5f5d19fc1e
Enable location history
2017-01-18 22:38:37 +05:30
Rasika Perera
27e953cda3
API subscription permission added to [devicemgt-user] role
2017-01-18 21:29:54 +05:30
inoshperera
346fd28814
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-18 20:50:55 +05:30
inoshperera
0bb04789a6
adding permissions necessery for iOS to config.json
2017-01-18 20:48:39 +05:30
Milan Perera
f8de4869d9
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-18 18:15:09 +05:30
Milan Perera
e9c3a0c3e8
Fixed token expiration issue
2017-01-18 18:14:55 +05:30
Rasika Perera
152ff2965a
Merge pull request #552 from Jasintha/release-2.0.x
...
Fixing firearm policy push notification issue
2017-01-18 17:29:00 +05:30
sameera910409
1bec5e5186
fixed user password reset failure issue in iot console
2017-01-18 14:53:44 +05:30
Jasintha
e8ffe60e8c
Fixing firealam policy push notification issue
2017-01-18 14:27:05 +05:30
Maninda
1f5448c2a0
Corrected the caching filter pattern
2017-01-18 12:36:11 +05:30
Imesh Chandrasiri
bdfb816ffc
Fix for issue where list item operations getting fired even after cancelling list item selection
2017-01-18 11:43:49 +05:30
kamidu
bb8985781e
removing duplicate methoads
2017-01-18 10:22:11 +05:30
kamidu
7698c12d80
removing duplicate methoads
2017-01-18 10:07:59 +05:30
kamidu
7b3db2bdd6
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-18 09:59:53 +05:30
Rasika Perera
51bd2b5bb6
UI improvement: Fixing buttons styles
2017-01-18 08:29:21 +05:30
Rasika Perera
60ac0522d8
Fixes for XSS attacks
2017-01-18 08:14:17 +05:30
ayyoob
5927064435
apim seperation
2017-01-18 01:48:07 +05:30
kamidu
5de2a233d7
Recomended security fixes for data tables
2017-01-18 00:16:18 +05:30
Rasika Perera
2b46691405
Fixing user menu not showing issue
2017-01-17 20:17:40 +05:30
ayyoob
4128e2d355
pointed to gateway node
2017-01-17 15:51:30 +05:30
Imesh Chandrasiri
ba506183b1
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-17 15:09:52 +05:30
Imesh Chandrasiri
34aac48071
Notification bar scroll and trigger issue fix
2017-01-17 15:09:40 +05:30
Rasika Perera
68ad05fde2
Merge pull request #546 from DimalChandrasiri/release-2.0.x
...
Fix for multiple popup issue and modal js improvement
2017-01-17 11:49:05 +05:30
ayyoob
8a883ccd41
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-16 18:29:40 +05:30
ayyoob
2a538ff959
fixed multi tenant login issue
2017-01-16 16:07:36 +05:30
Maninda
8aed7c67a9
Added devicemgt web app configs to secure web app
2017-01-16 15:00:03 +05:30
Maninda
4fbab80782
Added security filters to jaggery.conf
2017-01-16 14:40:33 +05:30
Rasika Perera
2206e258d1
Fixing permissions for [devicemgt-user] and [devicemgt-admin] roles
2017-01-16 09:37:52 +05:30
Imesh Chandrasiri
153e3bb719
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-14 23:53:04 +05:30
Imesh Chandrasiri
6e1e801ea0
Fix for multiple popup issue
2017-01-14 23:50:34 +05:30
WSO2 Builder
585b9bde4d
[maven-release-plugin] prepare for next development iteration
2017-01-14 01:50:45 +00:00
WSO2 Builder
d206148841
[maven-release-plugin] prepare release v2.0.7
2017-01-14 01:46:41 +00:00
Rasika Perera
b9c1141f79
Added missing utility module import
2017-01-14 07:11:26 +05:30
Rasika Perera
24a7179c4b
Merge pull request #544 from geethkokila/release-2.0.x
...
Adding support for identifying the device type from the url
2017-01-13 22:41:07 +05:30
Rasika Perera
0227d5ccbb
Fixing https://wso2.org/jira/browse/IOTS-381
2017-01-13 18:00:36 +05:30
Rasika Perera
4549a34083
changed [fw-ok] with [fw-success]
2017-01-13 17:50:18 +05:30
geethkokila
bf8ab0da11
Adding support for identifying the device type from the url
2017-01-13 16:23:47 +05:30
ayyoob
44d09e09ea
few changes after testing the gateway
2017-01-13 04:49:17 +05:30
ayyoob
671d931d3e
merged with origin after resolving conflicts
2017-01-12 23:24:35 +05:30
ayyoob
5b3a8091ec
fixed Null pointer exception
2017-01-12 23:18:54 +05:30
Rasika Perera
864020f20e
Adding ability to add deviceType level scopes
2017-01-12 22:42:44 +05:30
Rasika Perera
f57de670ea
Adding devices:update into /devices scopes list
2017-01-12 22:42:44 +05:30
Rasika Perera
e11d2244f5
Fixing scope annotation /enrollment-invite
2017-01-12 22:42:44 +05:30
Rasika Perera
63cb0e1fde
Adding swagger annotations and scope for /effective-policy
2017-01-12 22:42:44 +05:30
Rasika Perera
3cc176c121
Fixing permission for certificates:verify
2017-01-12 22:42:43 +05:30
Rasika Perera
09aae93fc1
Adding perm:admin:certificates:verify scope
2017-01-12 22:42:43 +05:30
Milan Perera
d9ea6af775
Changed logs to warn
2017-01-12 20:26:46 +05:30
ayyoob
d4ec0705e7
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-12 19:09:12 +05:30
ayyoob
cdd144237f
removed unused parameter
2017-01-12 19:09:01 +05:30
Milan Perera
311fe7810f
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-12 19:02:30 +05:30
Milan Perera
21c50c9a55
Fixed NPE occurred due to scope mapping
2017-01-12 19:01:57 +05:30
ayyoob
2fbaf31b93
fixed permission and assigned environment variables for url context
2017-01-12 18:13:43 +05:30
ayyoob
93ae646c50
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-12 11:13:49 +05:30
ayyoob
de957bec29
few changes after testing the cluster
2017-01-12 11:12:28 +05:30
Rasika Perera
e05600607a
Merge pull request #540 from madawas/release-2.0.x
...
Refactoring policy view and edit units
2017-01-11 22:39:53 +05:30
Rasika Perera
c7d489cf2c
Merge pull request #538 from madawas/IOTS-377
...
IOTS-377 : Fixing VFA icon not visible issue
2017-01-11 22:33:45 +05:30
Rasika Perera
9bd409e502
Merge pull request #536 from DimalChandrasiri/release-2.0.x
...
Updating font wso2 to version 1.2.1
2017-01-11 21:26:03 +05:30
Madawa Soysa
a28458cf13
Refactoring policy view and edit units
...
Refactored the units policy.view and policy.edit to be consistant with policy.create unit. Related to IOTS-296
2017-01-11 18:34:03 +05:30
Milan Perera
f25e82f4ec
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-11 14:42:08 +05:30
Milan Perera
98ea97d890
Fixed permissions adding issue
2017-01-11 14:41:54 +05:30
Imesh Chandrasiri
957224b905
Merge branch 'release-2.0.x' of https://github.com/DimalChandrasiri/carbon-device-mgt into release-2.0.x
2017-01-11 14:40:48 +05:30
Imesh Chandrasiri
d686a9ea57
Updating font wso2 to version 1.2.1 - Commit 2
2017-01-11 14:39:59 +05:30
Madawa Soysa
8a7d0bb3aa
IOTS-377 : Fixing VFA icon not visible issue
...
Fixes IOTS-377
2017-01-11 14:03:12 +05:30
Rasika Perera
83868303dd
Merge branch 'release-2.0.x' into release-2.0.x
2017-01-11 13:26:53 +05:30
Rasika Perera
8311828c5d
Merge pull request #537 from ayyoob/release-2.0.x
...
updated ui config
2017-01-11 13:18:04 +05:30
Imesh Chandrasiri
f1954c4f10
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-11 13:06:14 +05:30
ayyoob
0d721a226b
updated ui config
2017-01-11 12:41:34 +05:30
Imesh Chandrasiri
3230a4e269
Updating font wso2 to version 1.2.1
2017-01-11 11:11:33 +05:30
Rasika Perera
ef2a1b84a2
IOTS-376 : Fixing cannot delete a device
2017-01-11 09:12:46 +05:30
kamidu
4588cfbed4
Fixing the permission management issue in EMM console
2017-01-10 17:22:42 +05:30
Ace
c6d186aa1a
Adding missing fix
2017-01-10 16:19:57 +05:30
Ace
bd45b27cc9
Merging with upstream
2017-01-10 16:17:58 +05:30
Ace
643acd7827
Adding api for renaming devices
2017-01-10 16:16:31 +05:30
ayyoob
471e634790
merged with upstream
2017-01-10 12:11:03 +05:30
ayyoob
06977295ea
merged with upstream
2017-01-10 12:00:13 +05:30
Milan Perera
562631cc1d
Fixed scopes related issue in SAML Granttype
2017-01-10 11:36:45 +05:30
charitha
cb7ff7f66a
Change package name to lower case
2017-01-10 10:18:28 +05:30
ayyoob
9d5061230c
fixing test failures
...
(cherry picked from commit ac8dae7
2017-01-10 10:15:14 +05:30
charitha
c909144589
Add select2 controller to select roles to share a group
2017-01-10 10:00:48 +05:30
ayyoob
ac8dae7ed0
fixing test failures
2017-01-10 09:27:10 +05:30
Rasika Perera
e1228b408a
Removed [httpsWebURL] from config.json
2017-01-09 16:36:11 +05:30
Rasika Perera
9afffc6571
Merge pull request #530 from charithag/release-2.0.x
...
Add select2 controller to select roles to share a group
2017-01-09 15:04:28 +05:30
charitha
1ad9439162
Add select2 controller to select roles to share a group
2017-01-09 15:02:10 +05:30
Rasika Perera
250984f438
Merge pull request #529 from rasika/merge-master
...
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2017-01-09 14:47:07 +05:30
charitha
5caa688014
Fixed issue in populating server.ip property.
2017-01-09 12:35:04 +05:30
Rasika Perera
0acd273ae1
Fixing merge conflicts
2017-01-08 12:41:09 +05:30
Rasika Perera
83aea1fd01
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-master
...
# Conflicts:
# components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java
# components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/ExtendedFileProtocolIteratorFactory.java
# components/apimgt-extensions/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
# components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java
# components/certificate-mgt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
# components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
# components/device-mgt-extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PasswordResetWrapper.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/PolicyList.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ProfileFeature.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/Dashboard.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Policy.java
# components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/policy/mgt/Profile.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/DeviceDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/SearchDAO.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/dao/impl/SearchDAOImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/ProcessorImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/search/mgt/impl/QueryBuilderImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/AnnotationProcessor.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedFileProtocolIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.extensions/src/main/java/org/wso2/carbon/device/mgt/extensions/feature/mgt/util/ExtendedIteratorFactory.java
# components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/user.js
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error400.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error401.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error403.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error404.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error405.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/error-pages/error500.html
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/pages/uuf.page.sign-in/sign-in.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/lib/modules/auth/auth.js
# components/device-mgt/pom.xml
# components/email-sender/org.wso2.carbon.email.sender.core/pom.xml
# components/email-sender/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml
# components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml
# components/identity-extensions/dynamic-client-registration/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/OAuthExtUtils.java
# components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/validators/PermissionBasedScopeValidator.java
# components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml
# components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
# components/identity-extensions/pom.xml
# components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
# components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
# components/policy-mgt/pom.xml
# components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
# components/webapp-authenticator-framework/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
# features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
# features/apimgt-extensions/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
# features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
# features/certificate-mgt/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
# features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
# features/device-mgt-extensions/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml
# features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml
# features/device-mgt/pom.xml
# features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml
# features/dynamic-client-registration/pom.xml
# features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml
# features/email-sender/pom.xml
# features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
# features/jwt-client/pom.xml
# features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml
# features/oauth-extensions/pom.xml
# features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml
# features/policy-mgt/pom.xml
# features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
# features/webapp-authenticator-framework/pom.xml
# pom.xml
2017-01-08 11:45:46 +05:30
ayyoob
c718d723c0
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-08 01:20:28 +05:30
ayyoob
ea31637223
added scr reference to datasource for deployer and few fixes after the changes in the plugin
2017-01-08 01:19:03 +05:30
WSO2 Builder
5411d93103
[maven-release-plugin] prepare for next development iteration
2017-01-07 07:48:36 +00:00
WSO2 Builder
3ea83b925a
[maven-release-plugin] prepare release v2.0.6
2017-01-07 07:33:45 +00:00
geethkokila
7059ad1243
Changing the package name
2017-01-07 11:21:50 +05:30
geethkokila
2881079b27
Removing two unnecessary classes from the project and adding java documentation to class
2017-01-07 11:06:48 +05:30
Rasika Perera
08ab946e88
Added doc comments
2017-01-07 10:28:25 +05:30
Rasika Perera
a16052431c
Corrected a typo on [APIMCertificateMGTException]
2017-01-07 10:26:35 +05:30
Rasika Perera
c2490347b6
Corrected a typo
2017-01-07 10:25:32 +05:30
Rasika Perera
ebdba19041
IOTS-120 : Fixing firstName and lastName cannot contain whitespaces
2017-01-07 08:04:48 +05:30
Rasika Perera
b4ed33bcd0
IOTS-171 : Register form validation message corrected
2017-01-06 21:44:02 +05:30
Rasika Perera
4de481e501
Merge pull request #521 from rasika/release-2.0.x
...
UI improvement for Datatables
2017-01-06 20:29:47 +05:30
Rasika Perera
d826ba81d0
UI improvement for Datatables
2017-01-06 20:27:24 +05:30
Joseph Fonseka
a5640f48b5
Changed auth type on API resources as configured in web.xml
2017-01-06 19:41:16 +05:30
Rasika Perera
78c413c1ba
Merge pull request #519 from hasuniea/release-2.0.x
...
getting SkippedEndpoint path from URL
2017-01-06 19:37:50 +05:30
Rasika Perera
dfcf72cae0
Merge pull request #518 from geethkokila/mutual_ssl_feature
...
Adding gateway support for IOS device type
2017-01-06 19:34:36 +05:30
Rasika Perera
8397b688e9
Merge branch 'release-2.0.x' into mutual_ssl_feature
2017-01-06 19:34:25 +05:30
Rasika Perera
bc93d48927
Merge pull request #520 from madhawap/release-2.0.x
...
fix to WebappPublisherConfig
2017-01-06 19:23:29 +05:30
madhawap
d22de197a1
fix to WebappPublisherConfig
2017-01-06 19:07:49 +05:30
Rasika Perera
b4a649bdfa
Merge pull request #516 from milanperera/release-2.0.x
...
Improved permission-scope mapping capabilities
2017-01-06 19:02:12 +05:30
Hasunie
45a543d3ed
getting SkippedEndpoint path from URL
2017-01-06 18:42:24 +05:30
geethkokila
3795a7e30f
Removing the hardcoded apis
2017-01-06 17:09:46 +05:30
geethkokila
739a8bdb69
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2017-01-06 17:04:18 +05:30
geethkokila
44c7383b15
Adding support to send ios request the synapse gateway
2017-01-06 17:04:00 +05:30
Rasika Perera
1c1da1f5cd
Merge pull request #517 from rasika/release-2.0.x
...
Fixing CDMF version in footer
2017-01-06 16:57:16 +05:30
Rasika Perera
ab28d596e7
Fixing CDMF version in footer
2017-01-06 16:56:20 +05:30
Milan Perera
d51ee711fc
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 16:46:56 +05:30
Rasika Perera
79e98a592b
Merge pull request #515 from rasika/release-2.0.x
...
Replaced [EMM] with [IoT Server]
2017-01-06 16:46:44 +05:30
Milan Perera
228848075c
Fixed conflicts and merged
2017-01-06 16:46:42 +05:30
Rasika Perera
e501724c3c
Replaced [EMM] with [IoT Server]
2017-01-06 16:26:59 +05:30
Rasika Perera
7af63522f2
Fixed quick startup guide doc url
2017-01-06 16:14:24 +05:30
Milan Perera
42a587904f
Fixed issues in permission-scope mapping
2017-01-06 16:10:52 +05:30
geethkokila
9200adebed
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
2017-01-06 15:17:44 +05:30
charitha
d65557e03e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 14:55:41 +05:30
charitha
e6e39532b7
Fixed https://wso2.org/jira/browse/IOTS-103 and UI improvements
2017-01-06 14:55:26 +05:30
Rasika Perera
3472090d1b
Merge pull request #513 from ruwany/wip
...
Fixing device listing issue
2017-01-06 14:16:47 +05:30
Rasika Perera
8706636b51
Merge pull request #511 from ayyoob/release-2.0.x
...
Made Policy Monitoring for device type to be multitenance & Added default values for push notification dynamic configuration
2017-01-06 14:15:21 +05:30
Ace
6a69d8cf4b
merging with upstream
2017-01-06 13:27:33 +05:30
Ace
b83479b214
Fixing device listing issue
2017-01-06 13:20:56 +05:30
inoshperera
e6a70b2394
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 11:35:34 +05:30
inoshperera
11d2ecac10
removing basic auth headers from API definitions.
2017-01-06 11:34:48 +05:30
Milan Perera
637c014866
Refactored scope strings
2017-01-06 10:15:21 +05:30
Milan Perera
157ef998a6
Resolved conflicts and merged
2017-01-06 09:22:49 +05:30
Milan Perera
e0ee2fc1e5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2017-01-06 09:19:12 +05:30
ayyoob
20c3940ca4
made MonitoringTask to get config from device management service
2017-01-05 22:06:11 +05:30
