Commit Graph

1409 Commits

Author SHA1 Message Date
GPrathap
b3a7ed91c0 oauth token retrieval mechanism changed
Now oauth token is taken from http cookie
2016-11-30 12:50:50 +05:30
Madawa Soysa
215fd51ffb Merge pull request #426 from madawas/IOTS-296
IOTS-296: Generalizing policy UI for Android device type
2016-11-29 18:37:32 +05:30
Hasunie
1038c23c98 adding windows qr-code scanner 2016-11-29 11:24:22 +05:30
Madawa Soysa
ea7da0724f IOTS-296: Generalizing policy UI for Android device type
This commit includes moving policy flow device type specific client side logic and UI components to the android plugin.
2016-11-28 16:45:10 +05:30
WSO2 Builder
bfa2c5fa61 [maven-release-plugin] prepare for next development iteration 2016-11-25 09:14:26 +00:00
WSO2 Builder
09d434bda9 [maven-release-plugin] prepare release v3.0.1 2016-11-25 09:11:13 +00:00
Charitha Goonetilleke
cd30635715 Merge pull request #422 from DimalChandrasiri/IoTS-1.0.0
Changes for IoT build
2016-11-25 11:00:44 +05:30
sinthuja
4da1d5ec3a Adding JSON message format support for secure-websocket. 2016-11-25 00:08:09 +05:30
GPrathap
dca34e7fb3 added cron expression 2016-11-24 18:46:16 +05:30
Imesh Chandrasiri
bc075dedf0 Changes for IoT build 2016-11-24 18:29:35 +05:30
GPrathap
dd86f91de6 moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2 2016-11-23 23:49:51 +05:30
ayyoob
cf5525dc3f removed device type and feature annotation 2016-11-21 20:55:12 +05:30
ayyoob
d6bfce396d Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-21 19:18:32 +05:30
ayyoob
c7a29f0637 few changes in coding issues 2016-11-21 19:14:21 +05:30
sinthuja
cf1782391f Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-21 17:10:28 +05:30
sinthuja
d3d176ebdc fixing some issues in the andriod analytics carbon apps. 2016-11-21 17:10:10 +05:30
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0
changes in operation bar and deployer files
2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30
charitha
1170263139 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:45 +05:30
Ace
ea14e32337 Adding android-web-agent 2016-11-11 10:05:12 +05:30
sinthuja
0ef0d871fb fixing the issues when reading the mqtt receiver configurations. 2016-11-10 21:23:14 +05:30
Ace
3d32ad984c Adding fixes to android qr-gen code 2016-11-10 12:08:05 +05:30
sinthuja
6bb0387dac Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-09 16:07:42 +05:30
sinthuja
3001a31a33 updating the secure-ui publisher name. 2016-11-09 16:07:29 +05:30
Ace
cea96cc841 Merging with master 2016-11-09 12:54:33 +05:30
Chatura Dilan
47ba440fbb fixed extends 2016-11-09 12:36:37 +05:30
Chatura Dilan
ca2d837ecc Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-08 18:05:02 +05:30
Chatura Dilan
9e78b87365 Fixed issue in device operation bar 2016-11-08 18:04:42 +05:30
Chatura Dilan
d6701ee04c Fixed issue in device view UI 2016-11-08 18:02:47 +05:30
Chatura Dilan
1f4cda26e9 Merge pull request #403 from GPrathap/IoTS-1.0.0
adding mb mqtt authorization extension
2016-11-08 16:05:30 +05:30
GPrathap
136f2f34b1 changing MQTT message broker port to 1886 2016-11-08 15:59:04 +05:30
GPrathap
c96f2a8162 adding mb mqtt authorization extension 2016-11-08 15:53:09 +05:30
Chatura Dilan
49dd83ed33 Adding CDMF operation bar to Android 2016-11-08 15:16:10 +05:30
Chatura Dilan
b207e5d624 Added missing units 2016-11-08 15:08:57 +05:30
ayyoob
ecdbf6d272 few changes in sample device types to load cdmc specific units 2016-11-07 00:51:47 +05:30
Ace
7d14e23d00 merging with upstream 2016-11-04 20:09:13 +05:30
Ace
daf37338c6 merging changes with upstream
partial
2016-11-04 19:41:33 +05:30
Ace
46ad530735 adding missing files
continuation from restructuring effort.
2016-11-04 19:17:21 +05:30
Ace
e38941e81e restructuring iot-plugins
removing mobile/iot base plugins and other restructuring
2016-11-04 19:16:44 +05:30
Chatura Dilan
3227f3f650 Chages to device view for Android 2016-11-04 11:17:41 +05:30
Chatura Dilan
269376a135 Changes to Android operation bar 2016-11-03 15:22:17 +05:30
Chatura Dilan
76887c4277 Merge branch 'IoTS-1.0.0' of github.com:wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-03 14:50:55 +05:30
Chatura Dilan
1e3d8021e9 Adding Android and Windows operation bars 2016-11-03 14:48:14 +05:30
ayyoob
685d57b452 merged with origin 2016-11-02 09:44:42 +05:30
ayyoob
bd05fb721a merged with origin IoTS-1.0.0 2016-11-02 07:47:48 +05:30
sinthuja
d5a68fb5a9 Removing the mistakenly added getAllDevices permission from the andriod sense API 2016-11-01 18:38:34 +05:30
sinthuja
aa423787e8 Removing the mistakenly added getAllDevices from the andriod sense API 2016-11-01 18:37:09 +05:30
sinthuja
96e0ef92d7 Adding changes related to removing DAS components. 2016-11-01 18:35:09 +05:30
charitha
b5e8df5ddb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:05:26 +05:30
charitha
6d10f5c9fb Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 2016-11-01 15:02:41 +05:30
WSO2 Builder
c9861e9636 [maven-release-plugin] prepare for next development iteration 2016-10-31 11:57:15 +00:00
WSO2 Builder
3e664dc304 [maven-release-plugin] prepare release v2.2.5 2016-10-31 11:55:04 +00:00
kamidu
4acc2b6925 Fix for ios device details view 2016-10-31 16:30:06 +05:30
kamidu
cab7a8c2d6 Fiz ios related numeric view 2016-10-31 14:40:15 +05:30
kamidu
af9c525594 Fixing styling issues and adding new apk 2016-10-31 14:33:36 +05:30
kamidu
a9308c3f22 removing the unnessary ' ' from hbs files 2016-10-31 11:59:29 +05:30
Rasika Perera
a40ce98698 Make analytics and groups view disable for mobile plugins 2016-10-29 23:47:36 +05:30
Kamidu Sachith Punchihewa
4cd74f0a5c Merge pull request #393 from Megala21/master
Fixing EMM-1792
2016-10-28 08:39:42 +05:30
Harshan Liyanage
e7d79044d6 Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-10-28 01:59:54 +05:30
Harshan Liyanage
d92c89048a EMM-1783:Fix for enterprise and public ios app installation & uninstallation 2016-10-28 01:59:34 +05:30
Megala
53efe7d0d6 changing the android-agent according to new change 2016-10-27 23:51:59 +05:30
Megala
55efa84834 Fixing EMM-1792 2016-10-27 23:21:20 +05:30
Harshan Liyanage
494b545c4b Merge pull request #392 from Megala21/master
Fixing EMM-1787
2016-10-27 17:18:16 +05:30
Megala
287d27a332 Fixing EMM-1787 2016-10-27 16:35:45 +05:30
hasuniea
78e9d74031 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-27 13:33:26 +05:30
hasuniea
afd8e16c4c fixing ios LDAP issue 2016-10-27 13:32:50 +05:30
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
kamidu
3f39ebf757 Fix for EMM-1766 2016-10-27 09:23:40 +05:30
kamidu
5b6289326b Fixing ui issues in policy management 2016-10-26 18:37:54 +05:30
kamidu
de60fa325e Fix the ios- manage domain policy issue 2016-10-26 17:41:35 +05:30
Kamidu Sachith Punchihewa
5396a4ca9e Merge pull request #380 from madawas/modal-refactor
Refactoring pages to use new modal unit
2016-10-26 17:26:14 +05:30
inoshperera
b0ccf2d27d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-26 15:18:02 +05:30
inoshperera
87fc819364 fixing EMM-1788 calDAV policy validation issue 2016-10-26 15:17:52 +05:30
Harshan Liyanage
4fdc358786 Merge pull request #387 from Megala21/master
Fixing EMM-1779
2016-10-26 12:26:40 +05:30
Megala
fcdce211b7 Changing the required fields use css to add astriek 2016-10-26 11:57:56 +05:30
Saad Sahibjan
91f0722b1d Fix for variable declaration with single var 2016-10-26 10:24:55 +05:30
Megala
b752dc4d90 Merge remote-tracking branch 'upstream/master' 2016-10-26 09:16:45 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
ayyoob
391cdbb435 avoided lazy initialization 2016-10-25 14:01:51 +05:30
ayyoob
ed708852dc fixed formatting issues 2016-10-25 13:58:01 +05:30
ayyoob
968fa4f837 added message directly to log 2016-10-25 13:57:36 +05:30
kamidu
51dac16206 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-25 12:06:17 +05:30
kamidu
8af596702b Fix payload issues in manage payload policy 2016-10-25 12:05:08 +05:30
Saad Sahibjan
eff6c9d367 Fix spacing issue 2016-10-25 12:00:54 +05:30
Saad Sahibjan
2d020f611e Merge conflicts 2016-10-25 11:32:21 +05:30
Geeth
00be80eb2a Merge pull request #382 from inoshperera/master
fixing EMM-1714 by removing the supervised mode only operations from …
2016-10-25 09:53:04 +05:30
inoshperera
b554ff76e8 fixing EMM-1714 by removing the supervised mode only operations from the UI 2016-10-25 09:44:17 +05:30
kamidu
0251ba2a4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-10-24 16:49:26 +05:30
kamidu
7f4e1e3da0 Fix the ui issues in policy view,edit and create and device view sections 2016-10-24 16:48:49 +05:30
Megala
465ea0154d Fixing EMM-1778 2016-10-24 14:51:12 +05:30
ayyoob
8cbd68bcc6 few changes after testing the configs 2016-10-24 11:41:15 +05:30