Commit Graph

390 Commits

Author SHA1 Message Date
WSO2 Builder
a398686ec7 [maven-release-plugin] prepare for next development iteration 2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303 [maven-release-plugin] prepare release v3.0.3 2016-12-09 05:43:17 +00:00
Hasunie
359bd948d2 Fixing bst issue 2016-12-09 10:53:07 +05:30
Hasunie
222ef41a3f Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 10:43:50 +05:30
Hasunie
0e680ab26b fixing json provider issue in windows cxf 2016-12-09 09:36:27 +05:30
Milan Perera
6ad6bbbdc0 Commiting permission-scope mapping improvements 2016-12-08 20:41:44 +05:30
Charitha Goonetilleke
6cea2f19fc Merge pull request #470 from hasuniea/release-3.0.x
fixing message issue in configurationmgtservice
2016-12-08 20:08:24 +05:30
charitha
a49a5650c6 Fix issues 2016-12-08 20:07:16 +05:30
Hasunie
34153371d3 fixing message issue in configurationmgtservice 2016-12-08 19:15:34 +05:30
charitha
5d7fd0d66d Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:00:22 +05:30
Ruwan
82c0af1053 Merge pull request #467 from madhawap/release-3.0.x
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:12:59 +05:30
madhawap
6618b919d1 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:40:43 +05:30
Hasunie
68cabad5b8 deleting unused components 2016-12-08 16:43:05 +05:30
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
Hasunie
d2d39a241e adding error handler 2016-12-08 16:18:01 +05:30
Hasunie
b3eacb99cd Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 16:06:17 +05:30
Hasunie
36cbc96713 adding swagger annotations 2016-12-08 16:04:46 +05:30
Madawa Soysa
22dccce027 IOTS-296: Moving windows operation-mod to android plugin
This commit moves the operation-mod functions to windows plugin and refactor policy CRUD code to use plugin specific operation mod functions.
2016-12-08 12:26:36 +05:30
Hasunie
0456502bbe implementing windows 10 enrollment 2016-12-07 09:18:43 +05:30
Madawa Soysa
cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android
Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.
2016-12-06 12:22:25 +05:30
Madawa Soysa
3ed9b530f5 IOTS-296: Generalizing policy UI for windows device type
This commit includes moving policy flow device type specific client side logic and UI components to the windows plugin.
2016-12-02 17:06:02 +05:30
WSO2 Builder
619dab548e [maven-release-plugin] prepare for next development iteration 2016-12-01 13:52:49 +00:00
WSO2 Builder
4a0aa3be8e [maven-release-plugin] prepare release v3.0.2 2016-12-01 13:50:48 +00:00
charitha
e6eb6bb2d2 Merge branch 'release-3.0.x' of https://github.com/hasuniea/carbon-device-mgt-plugins into release-3.0.x 2016-12-01 17:08:57 +05:30
Hasunie
8ff55aada8 changing add enromment 2016-12-01 16:21:57 +05:30
Hasunie
b19629ab23 adding windows enrollment image 2016-12-01 16:20:05 +05:30
madhawap
429b52f037 resolve conflicts 2016-12-01 16:04:43 +05:30
madhawap
3249079965 Seperate out task operations 2016-12-01 15:41:07 +05:30
Hasunie
35ba0b2a9b fixing windows enrollment flow 2016-12-01 09:40:29 +05:30
Hasunie
0fd317d027 adding windows operation bar 2016-12-01 09:35:01 +05:30
Hasunie
fa6ef30d17 fixing windows device view issues 2016-12-01 09:26:14 +05:30
WSO2 Builder
4ae70fe1f1 [maven-release-plugin] prepare for next development iteration 2016-11-29 10:24:35 +00:00
WSO2 Builder
42c2b04c62 [maven-release-plugin] prepare release v2.2.7 2016-11-29 10:12:05 +00:00
WSO2 Builder
ab087bf934 [maven-release-plugin] prepare for next development iteration 2016-11-29 07:23:41 +00:00
WSO2 Builder
072dd089ef [maven-release-plugin] prepare release v2.2.6 2016-11-29 07:21:29 +00:00
Hasunie
1038c23c98 adding windows qr-code scanner 2016-11-29 11:24:22 +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
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
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
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
Kamidu Sachith Punchihewa
218e7aa58f Merge pull request #406 from Malintha/master
Adding secured documentBuilder factory
2016-11-10 15:08:25 +05:30
Malintha Fernando
13cb358153 Adding secured documentBuilder factory 2016-11-10 15:04:03 +05:30
Chatura Dilan
47ba440fbb fixed extends 2016-11-09 12:36:37 +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
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
bd05fb721a merged with origin IoTS-1.0.0 2016-11-02 07:47:48 +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
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
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
WSO2 Builder
19e0d65db0 [maven-release-plugin] prepare for next development iteration 2016-10-21 11:27:51 +00:00
WSO2 Builder
537a99d05d [maven-release-plugin] prepare release v2.2.4 2016-10-21 11:25:53 +00:00
WSO2 Builder
b095196e65 [maven-release-plugin] prepare for next development iteration 2016-10-18 15:36:09 +00:00
WSO2 Builder
d455b13e62 [maven-release-plugin] prepare release v2.2.3 2016-10-18 15:33:59 +00:00
Chatura Dilan Perera
0b66649841 [maven-release-plugin] prepare for next development iteration 2016-09-29 21:47:43 +05:30
Chatura Dilan Perera
362003c9ab [maven-release-plugin] prepare release v2.2.2 2016-09-29 21:47:34 +05:30
harshanl
821142b78d windows ui fix 2016-09-29 21:29:51 +05:30
harshanl
5062a8dfae Windows issue 2016-09-29 20:08:25 +05:30
Rasika Perera
9d92b71bab Merge pull request #1 from warunalakshitha/master
Upgrade iot product to latest carbon versions
2016-09-29 11:24:25 +05:30
hasuniea
2cc9a50b92 adding permission for windows enrollment 2016-09-28 14:27:16 +05:30
Rasika Perera
52dfcecb62 Updating devicemgt_admin into /api/device-mgt/v1.0. 2016-09-26 15:58:00 +05:30
hasuniea
fb6eded30c fixed device lock issue 2016-09-23 22:27:34 +05:30
hasuniea
ece43f53bd fixing windows issues 2016-09-23 22:06:14 +05:30
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
Ace
282fe25b47 Fixing dependency related issues 2016-09-21 12:57:03 +05:30
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +05:30
Ace
03c0108db5 Removing unwanted dependencies from windows api 2016-09-20 10:39:34 +05:30
Chatura Dilan Perera
bf72d212f7 [maven-release-plugin] prepare for next development iteration 2016-09-19 19:53:27 +05:30
Chatura Dilan Perera
18780e5274 [maven-release-plugin] prepare release v2.2.1 2016-09-19 19:52:58 +05:30
hasuniea
29c1b055d9 fixing code conflicts 2016-09-19 16:29:04 +05:30
hasuniea
18e577a84a adding windowsplugin changes 2016-09-19 15:49:16 +05:30
Ace
a05dad6f4d Merging with master 2016-09-19 12:22:11 +05:30
dilanua
d8ce43fe04 Updating windows api path lockreset-devices to lock-reset-devices 2016-09-18 15:57:07 +05:30
dilanua
19b6a334ad Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:44 +05:30
dilanua
8d338a584b Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:23:21 +05:30
Rasika Perera
5438a421de Fixing Permissions are not published for Windows through WebApp Lifecycle Listener 2016-09-15 07:33:00 +05:30
Ace
2a0b500935 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:33 +05:30
Chatura Dilan Perera
89621ddfcb [maven-release-plugin] prepare for next development iteration 2016-09-09 21:48:18 +05:30
Chatura Dilan Perera
28898a85e9 [maven-release-plugin] prepare release v2.2.0 2016-09-09 21:48:05 +05:30
Rasika Perera
751deed3e2 Adding permission annotations for windows operations 2016-09-09 17:01:23 +05:30
mharindu
cbae4e207d Implemented permission based authorization 2016-09-09 03:00:11 +05:30
hasuniea
0235e4a0da fixing ClassNotFoundException 2016-08-26 13:23:48 +05:30
harshanl
e42bf394d9 Changed windows API package name 2016-08-25 17:11:36 +05:30
harshanl
16d9338dce Refactored windows APIs 2016-08-25 16:28:03 +05:30
Chatura Dilan Perera
ca2e631076 Fix conflicts 2016-08-19 15:25:51 +05:30
Chatura Dilan Perera
7ff9204646 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:52:56 +05:30
Chatura Dilan Perera
5e43c5bef9 [maven-release-plugin] prepare release v2.1.2 2016-08-18 22:52:47 +05:30
hasuniea
5e2a42d798 fixing app-install issue 2016-08-17 15:31:18 +05:30
ayyoob
9978452cca Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into com 2016-08-13 10:50:06 +05:30
ayyoob
255e6b5566 few changes to resolve after scope validation issue 2016-08-13 10:38:30 +05:30
hasuniea
68f64c3ae1 adding windows devicemgt interface and impl 2016-08-12 16:31:47 +05:30
ayyoob
65ca57c6d5 added scope annotation 2016-08-12 12:27:03 +05:30
ayyoob
38b9f017c3 merged with origin 2016-08-12 10:55:25 +05:30
ayyoob
d72297f214 resolved UI issues 2016-08-11 23:41:19 +05:30
hasuniea
9cde2d815a refactoring windowsapi 2016-08-10 10:51:42 +05:30
hasuniea
a62544c68b refactoring windowsapi 2016-08-09 18:00:49 +05:30
hasuniea
4562b4d318 adding security fixes 2016-08-08 18:06:14 +05:30
hasuniea
16e306268f fixing javax cache issue 2016-08-04 16:35:31 +05:30
hasuniea
86056df434 fixing windows plugin relalted slf4j issue 2016-08-04 15:29:25 +05:30
ayyoob
d70c576ff0 refactored android configuration 2016-08-03 17:23:09 +05:30
kamidu
bbbaac4d28 Fix for the 'Requested resource /app/conf/reader/main.js cannot be found' exception on startup 2016-08-02 15:43:44 +05:30
dilanua
01e32c86c8 Updating base ui app config reader 2016-07-25 05:54:32 +05:30
Chatura Dilan
0818ae6860 [maven-release-plugin] prepare for next development iteration 2016-07-08 20:18:00 +05:30
Chatura Dilan
62c16e07ce [maven-release-plugin] prepare release v2.1.1 2016-07-08 20:17:52 +05:30
prabathabey
1205d26463 Merging rest-api-improvements branch with master 2016-06-21 16:05:27 +05:30
ayyoob
61d88f77b6 removed device Id from notification bean 2016-05-31 14:48:23 +05:30
prabathabey
eb025c42f7 Fixing issues encountered while deploying the agent webapp of windows 2016-05-30 12:30:12 +05:30
hasuniea
cc8190b541 add windows feature 2016-05-27 20:03:25 +05:30
hasuniea
d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 18:45:49 +05:30
hasuniea
d4bce21f75 windows plugin 2016-05-27 18:45:20 +05:30
prabathabey
98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 11:23:34 +05:30
prabathabey
6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration 2016-05-27 11:23:19 +05:30
Rasika Perera
0862e95f4c Moved CSS into separate file 2016-05-26 18:22:32 +05:30
Rasika Perera
f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 11:35:27 +05:30
Rasika Perera
c49e19a3c6 Adding licence headers for handlebar templates 2016-05-25 11:34:22 +05:30
mharindu
f3730c64ae [maven-release-plugin] prepare for next development iteration 2016-05-20 17:49:18 +05:30
mharindu
7a982093a1 [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:49:08 +05:30
mharindu
be4078cf38 [maven-release-plugin] rollback the release of v2.1.0 2016-05-20 17:35:17 +05:30
mharindu
a2d2f26123 [maven-release-plugin] prepare for next development iteration 2016-05-20 17:26:28 +05:30
mharindu
3af112898d [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:26:19 +05:30
prabathabey
5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework 2016-05-19 00:22:01 +05:30
hasuniea
8eb53927a6 add swagger annotations to windows plugin 2016-05-17 10:20:31 +05:30
charitha
ffcbea8421 Fixed https://wso2.org/jira/browse/IOTS-104 2016-05-11 16:00:05 +05:30
ayyoob
6f000cbc64 refactoring version tags 2016-05-05 14:34:49 +05:30
prabathabey
cfbc36ff2d Making the plug-in implementations compatible with the changes introduced to DeviceManagementService SPI 2016-04-26 17:17:37 +05:30
prabathabey
ac407a6a1a Removing obsolete dependencies to ApplicationManagert interface from plug-in specific device management service implementations 2016-04-25 20:30:10 +05:30
ayyoob
c05191dac5 Added IoT plugins feature and refactored IoT base. 2016-03-30 22:49:20 +05:30
charithag
f74a8ddf0d Add device type plugins and features related to emm with IoTS base feature. 2016-03-30 01:57:32 +05:30
prabathabey
39d2ce12dc merging resturctured iot and mobile plugins 2016-03-27 03:02:20 +05:30