Commit Graph

4270 Commits

Author SHA1 Message Date
Madawa Soysa
679caed5fe Merge branch 'master' into 'master'
Fix device type deploying issue

See merge request entgra/carbon-device-mgt-plugins!7
2018-10-18 00:29:17 +00:00
lasanthaDLPDS
4e30859563 Fix device type deploying issue 2018-10-17 18:27:00 +05:30
charitha
5b813b2487 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-10-10 21:32:14 +05:30
charitha
484420c9a6 Fix NPE issue in showing relatime analytics on Sample device types 2018-10-10 21:32:00 +05:30
WSO2 Builder
688b4fb6b1 [WSO2 Release] [Jenkins #3182] [Release 4.1.13] prepare for next development iteration 2018-10-10 13:04:53 +00:00
WSO2 Builder
e3b2261acf [WSO2 Release] [Jenkins #3182] [Release 4.1.13] prepare release v4.1.13 2018-10-10 13:04:41 +00:00
Charitha Goonetilleke
697c86d0ee
Merge pull request #916 from charithag/master
Fixed issue in device type config operation & Add HTTPS support for file transfer
2018-10-10 18:22:25 +05:30
Madawa Soysa
29a34b1cad Merge branch 'master' into 'master'
Update android screenshots

Closes product-iots#1

See merge request entgra/carbon-device-mgt-plugins!6
2018-10-10 11:18:16 +00:00
Madawa Soysa
e27feab177 Update android screenshots
Fixes entgra/product-iots#1
2018-10-10 22:16:44 +11:00
charitha
5bbb45ce84 Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
2018-10-08 23:19:52 +05:30
charitha
9f15dc9922 Add HTTPS support for file upload/download 2018-10-08 23:19:39 +05:30
Madawa Soysa
615810226b Merge branch 'master' into 'master'
Fix android device png

See merge request entgra/carbon-device-mgt-plugins!5
2018-10-08 10:56:40 +00:00
Madawa Soysa
f9bf052680 Fix android device png 2018-10-08 16:25:50 +05:30
Madawa Soysa
2d2536d3ec Merge branch 'master' into 'master'
Fix document links

See merge request entgra/carbon-device-mgt-plugins!4
2018-10-08 10:48:37 +00:00
Madawa Soysa
e7b9198997 Fix document links 2018-10-08 15:10:52 +05:30
charitha
03391ae6c2 Update tryit emulator ID 2018-10-08 13:54:33 +05:30
charitha
7b69e44695 Add latest android agent apk 2018-10-08 13:48:49 +05:30
charitha
2cacc3b322 Merge remote-tracking branch 'entgra/master' into entgra-master 2018-10-08 13:45:44 +05:30
charitha
211391fb02 Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
2018-10-08 13:31:25 +05:30
charitha
750dcc71c6 Add HTTPS support for file upload/download 2018-10-08 13:29:54 +05:30
Dharmakeerthi Lasantha
88d41bbebc Merge branch 'master' into 'master'
Update screen shots of android enrollment page

See merge request entgra/carbon-device-mgt-plugins!3
2018-10-08 07:59:53 +00:00
Madawa Soysa
d3d1415d03 Update screen shots of android enrollment page 2018-10-08 13:24:52 +05:30
charitha
b218591e19 Enable FCM by default 2018-10-08 11:31:53 +05:30
charitha
4e52117f21 Update license text of enrollment 2018-10-08 11:16:46 +05:30
WSO2 Builder
705e7d717b [WSO2 Release] [Jenkins #3180] [Release 4.1.12] prepare for next development iteration 2018-10-08 05:27:38 +00:00
WSO2 Builder
9fcd43f0bf [WSO2 Release] [Jenkins #3180] [Release 4.1.12] prepare release v4.1.12 2018-10-08 05:27:27 +00:00
charitha
ea5fd9d61a Update app manager version 2018-10-08 10:51:24 +05:30
charitha
b33e1c2d70 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master 2018-10-08 10:50:05 +05:30
Charitha Goonetilleke
556450c24f
Merge pull request #915 from charithag/master
Fix issue in remote connect token handling
2018-10-08 10:45:02 +05:30
charitha
8b8c2d674d Fixed build issue 2018-10-03 01:06:09 +05:30
charitha
41fc701009 Fix incorrect logic
(cherry picked from commit 2a1bcab)
2018-10-02 01:20:48 +05:30
charitha
2a1bcab648 Fix incorrect logic 2018-10-02 01:20:10 +05:30
charitha
08d18789a8 Fix issue in remote connect token handling
(cherry picked from commit 4f1b807)
2018-10-02 01:00:10 +05:30
charitha
4f1b807064 Fix issue in remote connect token handling 2018-10-01 23:44:58 +05:30
mharindu
54887f967f [maven-release-plugin] prepare for next development iteration 2018-09-28 17:52:22 +00:00
mharindu
a24b78a7a0 [maven-release-plugin] prepare release v4.2.0 2018-09-28 17:52:00 +00:00
mharindu
15b9f7dbf1 Update devicemgt.version 2018-09-28 17:35:05 +00:00
Charitha Goonetilleke
5996ddb5e1 Merge branch 'master' into 'master'
Whitelabel device types

See merge request entgra/carbon-device-mgt-plugins!2
2018-09-27 13:18:33 +00:00
charitha
a113b4bdba Updated device-mgt version 2018-09-27 12:12:32 +05:30
Milan Perera
3b57b9a9fb Whitelabel devic types 2018-09-27 11:25:37 +05:30
Dharmakeerthi Lasantha
9dc4c7f315 Merge branch 'master' into 'master'
fixing build brake

See merge request entgra/carbon-device-mgt-plugins!1
2018-09-22 12:14:28 +00:00
inoshperera
44228ba37c fixing build brake 2018-09-22 11:29:28 +05:30
charitha
f1607f868d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master
# Conflicts:
#	pom.xml
2018-09-19 13:46:05 +05:30
charitha
8865404702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master
# Conflicts:
#	pom.xml
2018-09-19 13:40:36 +05:30
WSO2 Builder
f9f3c85545 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
b8c503241d [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
Madhawa Perera
c0f55b3435
Merge pull request #913 from madhawap/master
version bump from 4.1.9 to 4.1.11
2018-09-18 14:39:53 +05:30
Madhawa Perera
5c3d062b9d version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Geeth
2e677b709b
Merge pull request #912 from madhawap/master
Make remote control feature mutual ssl compatible
2018-09-17 11:50:17 +05:30
Madhawa Perera
b1625f93dd reformat code 2018-09-15 14:48:50 +05:30