Commit Graph

1663 Commits

Author SHA1 Message Date
hasuniea
a196cb93bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-22 09:33:18 +05:30
Ruwan
c6fbc8f1fe Merge pull request #216 from GPrathap/master
fixed some bugs which caused while enabling SSO in IoT Server
2016-04-20 23:48:48 +05:30
Ruwan
82a1867168 Merge pull request #215 from rasika90/master
Adding support for Generic Feature Manager to generate operations
2016-04-20 22:26:54 +05:30
GPrathap
84492d70ac added constants for authentications types 2016-04-20 22:10:04 +05:30
GPrathap
55a95cca86 bug fixes 2016-04-20 22:08:30 +05:30
Rasika Perera
8e7052e012 adding JSON strigify on payload if contentType is json 2016-04-20 22:03:01 +05:30
Rasika Perera
69e38b3c98 adding JSON strigify on payload if contentType is json 2016-04-20 22:02:31 +05:30
Rasika Perera
6ec5b7a85a Reading Http Method from Features 2016-04-20 13:42:25 +05:30
Rasika Perera
2d44ec234b Now operations are auto generated and supports query params, path params and form params. 2016-04-20 13:38:36 +05:30
Rasika Perera
bb33b4ea12 Parameterizing Content-Type and Accept headers. 2016-04-20 13:37:42 +05:30
Milan Perera
37b6161bc6 Merge pull request #214 from charithag/master
Fix issues in device listing page and device details page
2016-04-19 15:01:51 +05:30
charithag
a5a1529853 Fix issues in device listing page and device details page 2016-04-19 14:54:37 +05:30
Prabath Abeysekara
8ced6cf38e Merge pull request #211 from charithag/master
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
2016-04-19 13:36:37 +05:30
charithag
c0e4c6b461 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-18 17:59:59 +05:30
hasuniea
92fec891cf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-18 17:48:14 +05:30
Prabath Abeysekara
d6a6a5e689 Merge pull request #212 from ayyoob/das-ext
few changes in web app publishing after enabling synapse gateway and added jwt and app registration code changes
2016-04-18 17:32:05 +05:30
ayyoob
64bd0fc061 removed fix for web app publishing start up issue when synapse gateway is used 2016-04-18 17:16:51 +05:30
charithag
6d8c3e5315 Fix default permission issues 2016-04-18 16:44:03 +05:30
charithag
516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins 2016-04-18 16:39:35 +05:30
ayyoob
12db341d33 few changes on web app publisher after testing 2016-04-18 03:00:06 +05:30
ayyoob
d3418462d9 few changes in api manager application registration 2016-04-17 12:18:49 +05:30
ayyoob
9d4defaa01 check whether the subscriber exist before creating 2016-04-15 23:10:11 +05:30
ayyoob
afe965e787 adding code review changes on JWT and API App registration 2016-04-14 19:55:55 +05:30
hasuniea
30fff8fd1c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-11 09:41:52 +05:30
Ruwan
ddcb252256 Merge pull request #210 from charithag/master
Fixing UI issues occurred after restructuring
2016-04-08 16:28:44 +05:30
charithag
ab4b61401c Fixing UI and implementation issues occurred after restructuring. 2016-04-08 16:19:15 +05:30
charithag
4a72c789f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-08 16:14:17 +05:30
charithag
0133cddc68 Fixing UI and implementation issues occurred after restructuring. 2016-04-08 16:12:37 +05:30
inoshperera
0f355fe1d8 Merge pull request #208 from laki88/master
override hash and equals function in Device to avoid duplicates in co…
2016-04-08 12:09:52 +05:30
Lakshman
993a387e7c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-08 11:26:58 +05:30
hasuniea
0bbb1eacd1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-08 11:02:21 +05:30
Ruwan
de8967c5a7 Merge pull request #209 from charithag/master
Fixing UI and implementation issues occurred after restructuring.
2016-04-08 09:30:09 +05:30
charithag
3dc23c5708 Fixing UI and implementation issues occurred after restructuring. 2016-04-07 20:41:10 +05:30
charithag
06a7fd2f1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-07 11:56:14 +05:30
charithag
905f9ae4c1 Fixing UI issues occured after restructuring. 2016-04-07 11:55:48 +05:30
Kasun Delgolla
4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes 2016-04-07 10:42:56 +05:30
Lakshman
551aaf172b formatting change 2016-04-06 19:32:41 +05:30
Lakshman
7174d000e0 override hash and equals function in Device to avoid duplicates in collections 2016-04-06 19:05:11 +05:30
hasuniea
abd018afd6 refactored imports in Certificate Generator 2016-04-04 14:24:40 +05:30
hasuniea
6ec710b250 merged code updates 2016-04-04 14:13:35 +05:30
charithag
d8d74ed595 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-04 09:08:47 +05:30
Ruwan
a192bfa85c Merge pull request #207 from rasika90/master
Adding uuf template app into cdmf-base-ui
2016-04-01 19:29:58 +05:30
Rasika Perera
3e34aeeff4 Fixing "Cannot write to cached file" issue 2016-04-01 18:00:22 +05:30
Rasika Perera
5911c873f3 Adding uuf template app 2016-04-01 15:06:32 +05:30
Kasun Delgolla
04de876265 Merge pull request #206 from charithag/master
Restructure group related UIs
2016-04-01 13:53:46 +05:30
charithag
7b8c22a2e7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-01 13:42:16 +05:30
charithag
99d004b6a6 Restructure group related UIs 2016-04-01 13:30:44 +05:30
Prabath Abeysekara
30e5666750 Merge pull request #205 from charithag/master
Refactor group management
2016-04-01 12:57:20 +05:30
geethkokila
d6923a1343 Fixing the issue in single condition 2016-04-01 00:25:09 +05:30
inosh-perera
9661502524 fixing issue with certificate delete 2016-03-31 20:08:20 +05:30