geethkokila
54fc0be69f
Fix the device information delete issue
2018-03-16 17:23:45 +05:30
WSO2 Builder
7dd3f29ff7
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare for next development iteration
2018-03-16 11:15:13 +00:00
WSO2 Builder
03dd153f6f
[WSO2 Release] [Jenkins #2992 ] [Release 3.1.22] prepare release v3.1.22
2018-03-16 11:14:57 +00:00
Rasika Perera
4be47123b3
Merge pull request #1235 from rasika/master
...
Update carbon-device-mgt dependencies
2018-03-16 16:21:58 +05:30
WSO2 Builder
db8a5afdf8
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare for next development iteration
2018-03-16 10:36:01 +00:00
WSO2 Builder
bb0c498b3a
[WSO2 Release] [Jenkins #2990 ] [Release 3.1.21] prepare release v3.1.21
2018-03-16 10:35:50 +00:00
Rasika Perera
cf12c296ac
Merge pull request #1236 from Arcane94/geoFencing
...
minor change in a function
2018-03-16 15:53:21 +05:30
Rasika Perera
b639845ab2
Fix formatting issue
2018-03-16 15:41:22 +05:30
Rasika Perera
f14564339a
Fix formatting issues
2018-03-16 15:39:57 +05:30
Rasika Perera
703a4cbb12
Add further fixes for the jwt-grant dependency issue
2018-03-16 15:37:04 +05:30
Arcane94
f6de4bb424
minor change in a function
2018-03-16 15:17:58 +05:30
Rasika Perera
48a06c048b
Fix jwt dependency issue
2018-03-16 15:13:47 +05:30
Rasika Perera
ec7a0c07cb
Update carbon-device-mgt dependencies
2018-03-16 14:47:45 +05:30
WSO2 Builder
10cf201da7
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare for next development iteration
2018-03-16 08:50:22 +00:00
WSO2 Builder
2c73d73860
[WSO2 Release] [Jenkins #2988 ] [Release 3.1.20] prepare release v3.1.20
2018-03-16 08:50:11 +00:00
WSO2 Builder
7a6e33ca49
Merge commit '790641a2aa9bba74f3dedb0f9a3c3fb9491cfd80' into 6975a622-1dc6-4b54-86ab-b5021d7e0e74
2018-03-16 08:38:14 +00:00
Geeth
3ebf9c7d02
Merge pull request #1234 from rasika/master
...
Adding cookie policy and privacy policy
2018-03-16 13:55:18 +05:30
WSO2 Builder
790641a2aa
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare for next development iteration
2018-03-16 08:23:46 +00:00
WSO2 Builder
efb54864c6
[WSO2 Release] [Jenkins #2987 ] [Release 3.1.19] prepare release v3.1.19
2018-03-16 08:23:35 +00:00
Rasika Perera
4c8fb7b5c2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-16 13:50:12 +05:30
Rasika Perera
df6e43eac5
Adding privacy policy and cookie policy
2018-03-16 13:49:53 +05:30
Geeth
23a6dbe524
Merge pull request #1233 from madawas/master
...
Generate nav menu icons based on correct permissions
2018-03-16 13:39:09 +05:30
Madawa Soysa
e5eeb78d09
Generate nav menu icons based on correct permissions
...
This commit fixes the mismatching permissions which are checked while generating navigation menu icons.
- Correct the wrong permission string used for configuration management.
- Introduce a new UI permission for certificate management.
- Move device type link under "owning device permission" which is the permission declared in the JAX-RS implementation.
Resolves wso2/product-iots#1782
2018-03-16 13:36:38 +05:30
WSO2 Builder
7fe945f1bf
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare for next development iteration
2018-03-15 22:28:55 +00:00
WSO2 Builder
555a349fd6
[WSO2 Release] [Jenkins #2985 ] [Release 3.1.18] prepare release v3.1.18
2018-03-15 22:28:45 +00:00
Charitha Goonetilleke
caa5d3999a
Merge pull request #1232 from charithag/master
...
Add missing media type
2018-03-15 21:05:13 +00:00
charitha
f62cb4febd
Add missing media type
2018-03-16 01:46:41 +05:30
WSO2 Builder
f7f13f2052
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare for next development iteration
2018-03-15 17:52:55 +00:00
WSO2 Builder
d44ac973cb
[WSO2 Release] [Jenkins #2983 ] [Release 3.1.17] prepare release v3.1.17
2018-03-15 17:52:45 +00:00
Charitha Goonetilleke
68f7296edd
Merge pull request #1231 from rasika/master
...
Add login.do, retry.do and consent.do
2018-03-15 17:43:16 +00:00
Rasika Perera
6316daa13a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-15 23:07:06 +05:30
Rasika Perera
b865dc7823
Update license header
2018-03-15 23:04:38 +05:30
Rasika Perera
583b17d405
Add login.do, retry.do and consent.do
...
This implements following fixes/improvements;
* Adding an intermediate for user to accept consents.
* Fixing issue of not redirected to the consent.do
* Authentication failure page
2018-03-15 23:02:16 +05:30
WSO2 Builder
a51a3cd6a4
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare for next development iteration
2018-03-15 16:58:58 +00:00
WSO2 Builder
f416cecb9e
[WSO2 Release] [Jenkins #2981 ] [Release 3.1.16] prepare release v3.1.16
2018-03-15 16:58:48 +00:00
Dharmakeerhi Lasantha
33bcbb6b9b
Merge pull request #1230 from charithag/master
...
Fixed exception in subscribing APIs
2018-03-15 22:02:36 +05:30
charitha
481d381ca7
Fixed exception in subscribing APIs
2018-03-15 20:21:18 +05:30
WSO2 Builder
41358a41a5
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare for next development iteration
2018-03-15 11:37:04 +00:00
WSO2 Builder
d679faecca
[WSO2 Release] [Jenkins #2979 ] [Release 3.1.15] prepare release v3.1.15
2018-03-15 11:36:53 +00:00
Kamidu Sachith Punchihewa
aa79bb9a73
Merge pull request #1229 from geethkokila/master
...
Fix the path parameter
2018-03-15 16:52:59 +05:30
geethkokila
7aab14c07d
Fix the path parameter
2018-03-15 16:50:04 +05:30
WSO2 Builder
5a1b4b154e
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare for next development iteration
2018-03-15 09:37:25 +00:00
WSO2 Builder
50232e10a5
[WSO2 Release] [Jenkins #2977 ] [Release 3.1.14] prepare release v3.1.14
2018-03-15 09:37:14 +00:00
Charitha Goonetilleke
aa4341c044
Merge pull request #1228 from ruwany/master
...
Correcting issue with events resource path
2018-03-15 09:24:57 +00:00
Ruwan Yatawara
88924ac8d6
Correcting issue with events resource path
2018-03-15 14:31:44 +05:30
Ruwan Yatawara
1ac28a40fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2018-03-15 06:09:06 +05:30
WSO2 Builder
f265ddc736
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare for next development iteration
2018-03-14 20:15:12 +00:00
WSO2 Builder
221fb27c6c
[WSO2 Release] [Jenkins #2975 ] [Release 3.1.13] prepare release v3.1.13
2018-03-14 20:14:58 +00:00
Geeth
3d4a3ed105
Merge pull request #1227 from geethkokila/master
...
Add a temporary fix for api subscription issue
2018-03-15 01:30:09 +05:30
geethkokila
dbf4ff0132
Add a temporary fix for api subscription issue
2018-03-15 01:28:05 +05:30
