Commit Graph

6784 Commits

Author SHA1 Message Date
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
bd2fa86371 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
011dc162f5 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
98f211137b [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
3e29bc7ba1 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
3f87c682fe [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
WSO2 Builder
d8d3f19b37 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare for next development iteration 2018-09-18 09:24:16 +00:00
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
4ed3cd865a [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
WSO2 Builder
0814d7468a [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
WSO2 Builder
f6e8be4030 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
WSO2 Builder
d0fc3093ea [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
WSO2 Builder
44a8a46c62 [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +00:00
WSO2 Builder
e8f8cb003f [WSO2 Release] [Jenkins #3178] [Release 4.1.11] prepare release v4.1.11 2018-09-18 09:24:03 +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
c6aa8ac143 version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Madhawa Perera
81cd27eebb version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Madhawa Perera
582c8df9cc version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Madhawa Perera
b2764717d5 version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Madhawa Perera
c54da827d8 version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +05:30
Madhawa Perera
f306c8d573 version bump from 4.1.9 to 4.1.11 2018-09-18 14:23:04 +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
Madhawa Perera
374c54fa70 make remote control feature mutual ssl compatible
Introduced a new UUID to recognized the authenticated device's call back to establish the websocket connetion. When the UI requested to establish a screen sharing session with the device, a new UUID and will be created and stored in the database with the operation REMOTE_CONNECT's payload. Once the device polls the operation, it receives the UUID. Then device will call back the server with that same UUID to establish the websocket connection.
2018-09-13 14:37:05 +05:30
Charitha Goonetilleke
d205885a28
Merge pull request #910 from shagihan/master
Updates polling period of android devices by an API call.
2018-08-31 12:19:25 +05:30
shagihan
e49fc3573f remove unnecessary exceptions. 2018-08-31 11:42:39 +05:30
shagihan
1aeede731f Fixing code formatting. 2018-08-31 11:30:48 +05:30
shagihan
058cb22358 Formating fixes 2018-08-30 16:28:05 +05:30
shagihan
c3a92664fc Updates polling period of android devices by an API call. 2018-08-30 16:25:11 +05:30
WSO2 Builder
7b9a264265 [maven-release-plugin] prepare for next development iteration 2018-08-22 15:07:02 +00:00
WSO2 Builder
6c6cd16cc4 [maven-release-plugin] prepare for next development iteration 2018-08-22 15:07:02 +00:00
WSO2 Builder
a02c226427 [maven-release-plugin] prepare for next development iteration 2018-08-22 15:07:02 +00:00
WSO2 Builder
49f37b472b [maven-release-plugin] prepare for next development iteration 2018-08-22 15:07:02 +00:00