charitha
|
78d0172d5d
|
Merge remote-tracking branch 'upstream/release-2.0.x' into release-2.0.x
|
8 years ago |
charitha
|
ee5459dc79
|
Fix for https://wso2.org/jira/browse/IOTS-321
|
8 years ago |
Rasika Perera
|
2cfff85ee2
|
Merge pull request #458 from ruwany/release-2.0.x
Adding content-type to descriptor
|
8 years ago |
Ace
|
7eaee141e0
|
Adding content-type to descriptor
|
8 years ago |
Malintha
|
cba92545f3
|
Merge pull request #457 from madawas/IOTS-296
Refactoring policy create/edit js
|
8 years ago |
Madawa Soysa
|
5c356914e8
|
IOTS-296: Commenting and refactoring
|
8 years ago |
WSO2 Builder
|
228b24ca79
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5dbb258f55
|
[maven-release-plugin] prepare release v2.0.2
|
8 years ago |
charitha
|
a8fff3736a
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
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
|
8 years ago |
Charitha Goonetilleke
|
67a73189e1
|
Merge pull request #456 from rasika/IoTS-1.0.0
Fixing iOS UI issues
|
8 years ago |
Rasika Perera
|
d06faceb3f
|
Merge branch 'IoTS-1.0.0' of https://github.com/rasika/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
Rasika Perera
|
bec0f58e38
|
Adding semi-colon on context variable on service invoker Js
|
8 years ago |
Rasika Perera
|
884bbe66b5
|
Adding iOS enrollment path into config.json
|
8 years ago |
Rasika Perera
|
098ae372f7
|
Adding new css class for device type view image
|
8 years ago |
charitha
|
3b97b3296e
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Megala
|
ed325ee576
|
Adding dashboard feature
|
8 years ago |
Chatura Dilan
|
82d865b104
|
Merge pull request #453 from madhawap/release-2.0.x
Seperate out task operations
|
8 years ago |
geethkokila
|
fbfbed7060
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
geethkokila
|
20ca76640d
|
Adding changes for the grouping and ownership changes
|
8 years ago |
madhawap
|
2b00645779
|
refactored code
|
8 years ago |
Rasika Perera
|
98902c7978
|
Merge pull request #452 from charithag/release-2.0.x
Bug fixes & UI/UX improvements
|
8 years ago |
charitha
|
265b6248ef
|
Add email templates
|
8 years ago |
charitha
|
e718ab5504
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
charitha
|
cad686b43c
|
Bug fixes & UI/UX improvements
|
8 years ago |
madhawap
|
bec4ae681d
|
Seperate out task operations
|
8 years ago |
Madawa Soysa
|
1a1ca1587f
|
Merge pull request #451 from madawas/IOTS-296
Fix issue with policy wrapper group select
|
8 years ago |
Madawa Soysa
|
b2650e439c
|
Fix issue with policy wrapper group select
|
8 years ago |
Geeth
|
23ed0002d0
|
Merge pull request #449 from madawas/IOTS-296
IOTS-296: Removing ownership selection when policy creation
|
8 years ago |
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.
|
8 years ago |
Rasika Perera
|
06db0fa707
|
Adding semi-colon on context variable on service invoker Js
|
8 years ago |
Hasunie
|
1d6bf23d67
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Hasunie
|
529bde822c
|
fixing property string mapper issue
|
8 years ago |
Hasunie
|
1b5bae3e46
|
adding required authorization property
|
8 years ago |
Ruwan
|
3b3dd8bbd7
|
Merge pull request #448 from charithag/release-2.0.x
Bug fixes and improvements
|
8 years ago |
charitha
|
efb2695286
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
geethkokila
|
0879a75f7b
|
Fixing the serializing issue of device groups.
|
8 years ago |
charitha
|
d9b670ef19
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
charitha
|
564cece94b
|
Bug fixes
|
8 years ago |
Charitha Goonetilleke
|
e1d2d8a73f
|
Merge pull request #447 from ruwany/release-2.0.x
Adding android operations bar related changes
|
8 years ago |
Ace
|
6126776fcf
|
Adding android operations bar related changes
|
8 years ago |
Madawa Soysa
|
2d0b0ed94b
|
Merge pull request #446 from madawas/IOTS-296
IOTS-296: Refactoring Policy create/edit units
|
8 years ago |
Madawa Soysa
|
8cdc8cfb24
|
IOTS-296: Refactoring Policy create/edit units
|
8 years ago |
charitha
|
3cb13e18a5
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |
Charitha Goonetilleke
|
d9763ff5b7
|
Merge pull request #445 from GPrathap/release-2.0.x
added creating an application for WebSocket
|
8 years ago |
Rasika Perera
|
4283c3ed4d
|
Adding iOS enrollment path into config.json
|
8 years ago |
Rasika Perera
|
96e2f37ee4
|
Adding new css class for device type view image
|
8 years ago |
GPrathap
|
64ce41f571
|
added creating an application for WebSocket
|
8 years ago |
GPrathap
|
c969013ca2
|
added new property : validity Period
|
8 years ago |
charitha
|
a8e4a5f6fc
|
Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x
|
8 years ago |