Ace
872bd88c6e
Merging with upstream
2016-12-06 13:34:48 +05:30
Ace
8cc0ba56c1
Adding changes to descriptor
2016-12-06 13:29:59 +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
Rasika Perera
2cfff85ee2
Merge pull request #458 from ruwany/release-2.0.x
...
Adding content-type to descriptor
2016-12-05 10:51:22 +05:30
Ace
7eaee141e0
Adding content-type to descriptor
2016-12-05 10:34:11 +05:30
GPrathap
7807ed77da
removed hardcoded validity period while creating application in APIM
2016-12-05 09:50:10 +05:30
GPrathap
6e69fc8e84
changed application creation endpoint
2016-12-05 09:48:26 +05:30
Madawa Soysa
5c356914e8
IOTS-296: Commenting and refactoring
2016-12-02 16:52:05 +05:30
WSO2 Builder
228b24ca79
[maven-release-plugin] prepare for next development iteration
2016-12-01 12:14:01 +00:00
WSO2 Builder
5dbb258f55
[maven-release-plugin] prepare release v2.0.2
2016-12-01 12:10:10 +00:00
charitha
a8fff3736a
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-01 17:12:24 +05:30
charitha
1c8e4b8de7
Merge branch 'portal' of https://github.com/Megala21/carbon-device-mgt into release-2.0.x
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
2016-12-01 17:12:10 +05:30
Charitha Goonetilleke
67a73189e1
Merge pull request #456 from rasika/IoTS-1.0.0
...
Fixing iOS UI issues
2016-12-01 17:03:21 +05:30
Rasika Perera
bec0f58e38
Adding semi-colon on context variable on service invoker Js
2016-12-01 16:50:06 +05:30
Rasika Perera
884bbe66b5
Adding iOS enrollment path into config.json
2016-12-01 16:50:06 +05:30
Rasika Perera
098ae372f7
Adding new css class for device type view image
2016-12-01 16:50:06 +05:30
charitha
3b97b3296e
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-01 16:47:05 +05:30
Megala
ed325ee576
Adding dashboard feature
2016-12-01 16:41:35 +05:30
Chatura Dilan
82d865b104
Merge pull request #453 from madhawap/release-2.0.x
...
Seperate out task operations
2016-12-01 16:39:29 +05:30
geethkokila
fbfbed7060
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-01 16:36:23 +05:30
geethkokila
20ca76640d
Adding changes for the grouping and ownership changes
2016-12-01 16:35:59 +05:30
madhawap
2b00645779
refactored code
2016-12-01 16:31:27 +05:30
charitha
e718ab5504
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-01 15:30:29 +05:30
charitha
cad686b43c
Bug fixes & UI/UX improvements
2016-12-01 15:28:39 +05:30
madhawap
bec4ae681d
Seperate out task operations
2016-12-01 15:28:22 +05:30
Madawa Soysa
b2650e439c
Fix issue with policy wrapper group select
2016-12-01 15:23:00 +05:30
Madawa Soysa
345fdc0ced
IOTS-296: Removing ownership selection when policy creation
...
Removes ownership selection when creating and editing policies. Ownership management is done by the groups.
2016-12-01 12:34:15 +05:30
Hasunie
1d6bf23d67
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-12-01 09:15:37 +05:30
Hasunie
529bde822c
fixing property string mapper issue
2016-12-01 09:12:33 +05:30
Hasunie
1b5bae3e46
adding required authorization property
2016-12-01 08:59:19 +05:30
charitha
efb2695286
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 18:15:48 +05:30
geethkokila
0879a75f7b
Fixing the serializing issue of device groups.
2016-11-30 17:46:01 +05:30
charitha
d9b670ef19
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 17:11:18 +05:30
charitha
564cece94b
Bug fixes
2016-11-30 17:11:01 +05:30
Charitha Goonetilleke
e1d2d8a73f
Merge pull request #447 from ruwany/release-2.0.x
...
Adding android operations bar related changes
2016-11-30 17:08:08 +05:30
Ace
6126776fcf
Adding android operations bar related changes
2016-11-30 16:51:30 +05:30
Madawa Soysa
8cdc8cfb24
IOTS-296: Refactoring Policy create/edit units
2016-11-30 14:18:57 +05:30
charitha
3cb13e18a5
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
2016-11-30 14:03:59 +05:30
Charitha Goonetilleke
d9763ff5b7
Merge pull request #445 from GPrathap/release-2.0.x
...
added creating an application for WebSocket
2016-11-30 13:05:36 +05:30
GPrathap
64ce41f571
added creating an application for WebSocket
2016-11-30 12:44:26 +05:30
