Commit Graph

4270 Commits

Author SHA1 Message Date
WSO2 Builder
0883f46bfb Merge commit '64ad9937aae1ffb303add10e722f402afda1150c' into bf8f0ad8-5def-4e1e-8580-acf33f8fb32a 2017-08-31 09:32:04 +00:00
Menaka Jayawardena
4023afe656 Added tooltips for Android Policy restrictions. 2017-08-31 14:56:58 +05:30
Charitha Goonetilleke
05f30e1103 Merge pull request #808 from amalhub/master
Resolves: https://github.com/wso2/product-iots/issues/1202
2017-08-31 14:52:45 +05:30
amalhub
198175b965 Resolves: https://github.com/wso2/product-iots/issues/1202 2017-08-31 14:48:56 +05:30
WSO2 Builder
64ad9937aa [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare for next development iteration 2017-08-31 08:49:50 +00:00
WSO2 Builder
4e55bde904 [WSO2 Release] [Jenkins #2985] [Release 4.0.66] prepare release v4.0.66 2017-08-31 08:49:32 +00:00
Kamidu Sachith Punchihewa
1a161bce37 Merge pull request #807 from madawas/1311
Truncating longer versions in Application Listing view
2017-08-31 12:14:08 +05:30
Madawa Soysa
15616dc77c Truncating longer versions in Application Listing view
This commit truncates the version attribute of the application if the version is longer to fit the application view container.

fixes /wso2/product-iots#1311
2017-08-31 12:07:12 +05:30
warunalakshitha
808b0d2e5d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into remote-control 2017-08-31 11:57:43 +05:30
warunalakshitha
17cdb1652b add message count limitation to device session 2017-08-31 11:57:30 +05:30
WSO2 Builder
49567426fa [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare for next development iteration 2017-08-30 06:07:16 +00:00
WSO2 Builder
6e26519c24 [WSO2 Release] [Jenkins #2982] [Release 4.0.65] prepare release v4.0.65 2017-08-30 06:07:01 +00:00
Kamidu Sachith Punchihewa
c6cd6a2056 Merge pull request #806 from sameeragunarathne/master
fixes https://github.com/wso2/product-iots/issues/364
2017-08-30 10:25:03 +05:30
sinthuja
1ba326f3b8 Merge pull request #805 from sinthuja/master
Fixing the https://github.com/wso2/product-iots/issues/488
2017-08-30 10:22:20 +05:30
sameera910409
b275f5aead fixes https://github.com/wso2/product-iots/issues/364 2017-08-30 09:35:46 +05:30
WSO2 Builder
6492a9418c [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare for next development iteration 2017-08-29 10:42:45 +00:00
WSO2 Builder
9d22721ef4 [WSO2 Release] [Jenkins #2979] [Release 4.0.64] prepare release v4.0.64 2017-08-29 10:42:31 +00:00
sinthuja
6ddf3de49c Removing the geo dashboard datasource file as it's no longer used. 2017-08-29 15:38:58 +05:30
Milan Perera
624bf86a98 Merge pull request #804 from ruwany/master
fixing https://github.com/wso2/product-iots/issues/1326
2017-08-29 15:33:53 +05:30
Ace
9fc1894631 fixing https://github.com/wso2/product-iots/issues/1326 2017-08-29 15:33:54 +05:30
Charitha Goonetilleke
c42de9e296 Merge pull request #803 from harshanL/master
Resolved wso2/product-iots#1221
2017-08-29 15:31:10 +05:30
Harshan Liyanage
77daecefa3 Resolved wso2/product-iots#1221 2017-08-29 15:28:15 +05:30
sinthuja
344e853918 Merge branch 'wso2-master' 2017-08-29 15:27:49 +05:30
sinthuja
72a60ba7c7 Merge branch 'origin-wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
#	pom.xml
2017-08-29 15:20:29 +05:30
WSO2 Builder
62451cab93 [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare for next development iteration 2017-08-29 09:22:33 +00:00
WSO2 Builder
72b8da1795 [WSO2 Release] [Jenkins #2977] [Release 4.0.63] prepare release v4.0.63 2017-08-29 09:22:17 +00:00
Charitha Goonetilleke
5a6a736c22 Merge pull request #802 from harshanL/master
Changed device enrolment message resolves wso2/product-iots#989
2017-08-29 14:22:38 +05:30
Harshan Liyanage
d19349db49 Changed device enrolment message resolves wso2/product-iots#989 2017-08-29 14:19:31 +05:30
WSO2 Builder
b9d2e522c7 [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare for next development iteration 2017-08-29 07:17:18 +00:00
WSO2 Builder
4df2c34b77 [WSO2 Release] [Jenkins #2975] [Release 4.0.62] prepare release v4.0.62 2017-08-29 07:17:03 +00:00
Charitha Goonetilleke
ced68573d7 Merge pull request #801 from harshanL/master
This includes fixes for wso2/product-iots#1293
2017-08-29 12:16:31 +05:30
Harshan Liyanage
61362c16e6 This includes fixes for wso2/product-iots#1293 2017-08-29 12:03:05 +05:30
WSO2 Builder
a9992c6f69 [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare for next development iteration 2017-08-28 08:56:56 +00:00
WSO2 Builder
47480f7afb [WSO2 Release] [Jenkins #2972] [Release 4.0.61] prepare release v4.0.61 2017-08-28 08:56:42 +00:00
Harshan Liyanage
7d34191250 Merge pull request #798 from charithag/master
Fixed https://github.com/wso2/product-iots/issues/1329
2017-08-28 13:58:42 +05:30
Nirothipan
5049f17b6d androif file transfer feature 2017-08-28 13:33:10 +05:30
Nirothipan
95f25ad9cb changinh variable name more meaningful 2017-08-24 15:57:58 +05:30
Nirothipan
939a770c29 replacing with single imports 2017-08-24 15:57:32 +05:30
Nirothipan
a90658b5e7 code formatting 2017-08-24 15:47:54 +05:30
Nirothipan
8ce3b6a8c3 code formatting 2017-08-24 15:47:46 +05:30
Nirothipan
4234bcf482 addinf file transfer operation UI 2017-08-24 15:47:38 +05:30
Nirothipan
e15df60d52 addinf file transfer operation UI 2017-08-24 15:47:31 +05:30
Nirothipan
d1c4a1be12 addinf file transfer operation UI 2017-08-24 15:47:24 +05:30
Nirothipan
989248e711 adding file Name parameter 2017-08-24 15:47:14 +05:30
Nirothipan
9432e498e9 adding file Name parameter 2017-08-24 15:46:58 +05:30
Nirothipan
ac834fbe59 adding file Name parameter 2017-08-24 15:46:49 +05:30
Nirothipan
56384bcc53 modifying form parameters 2017-08-24 15:46:37 +05:30
Nirothipan
7ed6552a57 adding form parameters 2017-08-24 15:46:18 +05:30
Nirothipan
704f511964 Adding initial file transfer feature 2017-08-24 15:44:19 +05:30
Nirothipan
12a99dc5b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-08-24 15:41:29 +05:30