Supun94
5a1c73b119
Adding cdmf effective policy unit
2016-12-19 16:19:36 +05:30
Supun94
2847ff2095
Adding cdmf effective policy page
2016-12-19 16:19:36 +05:30
charitha
7acbc5cd0b
Moved qr modal to device mgt core
2016-12-19 15:25:06 +05:30
Charitha Goonetilleke
f4b3313ad7
Merge pull request #491 from DimalChandrasiri/release-2.0.x
...
UI update on email invites
2016-12-19 13:42:43 +05:30
Imesh Chandrasiri
765f97f5a0
email invite sender changes
2016-12-19 11:27:01 +05:30
Imesh Chandrasiri
e696b5bd0c
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-19 11:02:57 +05:30
WSO2 Builder
f9b6939cb7
[WSO2 Release] [Jenkins #61 ] [Release 2.0.4] prepare release v2.0.4
2016-12-19 09:06:04 +05:30
Rasika Perera
42930fe8c4
Revert "[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4"
...
This reverts commit 78b9052c37
2016-12-19 08:45:19 +05:30
WSO2 Builder
78b9052c37
[WSO2 Release] [Jenkins #55 ] [Release 2.0.4] prepare release v2.0.4
2016-12-16 17:03:06 +05:30
Imesh Chandrasiri
f70be13bf2
Common unit for email invite modal for devices screens
2016-12-16 14:53:51 +05:30
Madawa Soysa
5b1a68280c
Moving codemirror to a lib unit
...
This commit moves the codemirror library and modes to a lib unit and reuse the unit when necessary.
2016-12-16 10:17:59 +05:30
Madawa Soysa
0f291d5d04
Fixing generic policy saving issues
...
This commit changes the generic policy mode to application/json and add generic policy add/edit/view units.
2016-12-15 11:29:14 +05:30
Rasika Perera
9f615916d0
Fixing analyticsEnabled and groupingEnabled not working
2016-12-11 14:56:31 +05:30
Rasika Perera
1bee155d9a
Fixing formatting issue
2016-12-09 19:06:00 +05:30
Rasika Perera
91437ff81c
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-09 18:39:39 +05:30
Rasika Perera
c284732192
Displaying SSO auth failure messages
2016-12-09 18:22:09 +05:30
Rasika Perera
9fd6145605
Fixing SSO issue
2016-12-09 17:34:56 +05:30
WSO2 Builder
a59edee410
[maven-release-plugin] prepare for next development iteration
2016-12-08 14:39:00 +00:00
WSO2 Builder
8f9b21b41b
[maven-release-plugin] prepare release v2.0.3
2016-12-08 14:37:11 +00:00
charitha
0a7f8ac22c
Update error pages and CsrfGuard property file.
2016-12-08 19:41:43 +05:30
charitha
78dfddbbed
Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
2016-12-08 18:58:47 +05:30
Madawa Soysa
ea1371a008
Fixing generic policy payload
2016-12-08 17:31:50 +05:30
charitha
312098b1de
Fix issues in generic policy editor
2016-12-08 17:19:12 +05:30
geethkokila
87b2fb3603
Fixing the login issue
2016-12-08 14:28:33 +05:30
geethkokila
9def8aa609
Fixing the login issue
2016-12-08 14:08:46 +05:30
geethkokila
a0615d3d63
Merge branch 'release-2.0.x' into merge-master
2016-12-08 12:36:53 +05:30
geethkokila
d911281ad1
Merging master branch with release-2.0.x
2016-12-08 12:34:50 +05:30
Madawa Soysa
630a1105a9
IOTS-296: Refactoring generic policy unit code
...
This code is refactored to use the device type specific operation mod functions (payload generation etc.) in the device type plugins.
2016-12-08 10:29:12 +05:30
charitha
4b5c69d2d7
Update the way we are checking existence of policy operations.
2016-12-07 14:40:56 +05:30
Imesh Chandrasiri
da2fd787c4
Fix for datatable icon not showing issue
2016-12-07 12:50:23 +05:30
Ruwan
4bda6d89cb
Merge pull request #469 from menakaj/release-2.0.x
...
Android sense stabilization
2016-12-07 08:55:22 +05:30
charitha
7368b2cf64
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-06 19:09:24 +05:30
charitha
8348002f66
Merge branch 'release-2.0.x' of https://github.com/ruwany/carbon-device-mgt into release-2.0.x
2016-12-06 19:07:21 +05:30
Charitha Goonetilleke
e137644677
Merge pull request #467 from madawas/IOTS-296
...
IOTS-296: Genaralizing policy view UI
2016-12-06 19:06:19 +05:30
charitha
161fe62a08
Fix for https://wso2.org/jira/browse/IOTS-323
2016-12-06 18:59:43 +05:30
Ace
34225bd9da
fixing operations loading spinner and other ui issues
2016-12-06 17:13:56 +05:30
Menaka Jayawardena
84a0b398fe
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-06 14:44:05 +05:30
Menaka Jayawardena
ca2a79a001
Added entries for portal app in config files.
2016-12-06 14:43:05 +05:30
Madawa Soysa
de95c99ea7
IOTS-296: Genaralizing policy view UI
...
This commit inclued the generic policy view UI unit
2016-12-06 12:17:46 +05:30
Hasunie
631ea6e80f
Merge pull request #465 from harshanL/release-2.0.x
...
Added security filters to devicemgt jaggery app
2016-12-06 12:12:14 +05:30
Harshan Liyanage
24c0966dce
Merge pull request #462 from madawas/IOTS-322
...
IOTS-322: Infroming users when device types are not installed
2016-12-06 12:06:21 +05:30
Harshan Liyanage
b4eb86e985
Added security filters to devicemgt jaggery app
2016-12-06 11:54:31 +05:30
Rasika Perera
e8d8373d46
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-06 11:36:18 +05:30
Rasika Perera
4c1fb558d3
Fixing sso infinite redirection
2016-12-06 10:50:46 +05:30
Madawa Soysa
1d1f399477
IOTS-322: Infroming users when device types are not installed
...
Currently policy platfom selection page is empty if no device types are installed. This will add an meaningful message to user if no device types are added.
This commit resolves IOTS-322
2016-12-05 16:59:25 +05:30
Imesh Chandrasiri
f8d03e992e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-05 14:35:59 +05:30
Imesh Chandrasiri
09fa48c4c2
Removed fade-edge class from template markups for better listing readability
2016-12-05 14:35:36 +05:30
Charitha Goonetilleke
22990087a0
Merge pull request #459 from GPrathap/release-2.0.x
...
removed hardcoded validity period while creating application in APIM
2016-12-05 12:50:33 +05:30
charitha
78d0172d5d
Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
2016-12-05 12:35:58 +05:30
charitha
ee5459dc79
Fix for https://wso2.org/jira/browse/IOTS-321
2016-12-05 12:35:33 +05:30
