Commit Graph

3698 Commits

Author SHA1 Message Date
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
Rasika Perera
9fa4775ec6 Merge pull request #466 from ruwany/release-2.0.x
Changes to descriptor
2016-12-06 13:47:58 +05:30
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
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
cd191bcfaf Merge pull request #464 from rasika/release-2.0.x
Fixing sso infinite redirection
2016-12-06 12:05:58 +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
Ruwan
6a0246d493 Merge pull request #463 from harshanL/release-2.0.x
Updated carbon component versions to include security fixes
2016-12-06 10:38:29 +05:30
Harshan Liyanage
5b1f97fee3 Updated carbon component versions to include security fixes 2016-12-06 10:32:14 +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
Charitha Goonetilleke
ce144baec9 Merge pull request #461 from DimalChandrasiri/release-2.0.x
Release 2.0.x
2016-12-05 14:43:09 +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
GPrathap
5e6160383c Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2016-12-05 08:47:24 +05:30
WSO2 Builder
df4c13ec72 [maven-release-plugin] prepare for next development iteration 2016-12-05 08:35:51 +05:30
WSO2 Builder
1677beecac [maven-release-plugin] prepare release v2.0.2 2016-12-05 08:35:51 +05:30
Malintha
cba92545f3 Merge pull request #457 from madawas/IOTS-296
Refactoring policy create/edit js
2016-12-02 16:55:31 +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
d06faceb3f Merge branch 'IoTS-1.0.0' of https://github.com/rasika/carbon-device-mgt into IoTS-1.0.0 2016-12-01 16:57:20 +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
Rasika Perera
98902c7978 Merge pull request #452 from charithag/release-2.0.x
Bug fixes & UI/UX improvements
2016-12-01 15:50:51 +05:30
charitha
265b6248ef Add email templates 2016-12-01 15:41:21 +05:30