Commit Graph

4966 Commits

Author SHA1 Message Date
Geeth
239a27f5b0 Merge pull request #830 from DimalChandrasiri/master
Fixes Both #1113 and #1083 issues
2017-07-06 14:22:32 +05:30
Imesh Chandrasiri
1893d035a3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 14:17:27 +05:30
Imesh Chandrasiri
e1857099a7 Fixes wso2/product-iots#1083 2017-07-06 14:17:16 +05:30
Madhawa Perera
597b450cfb Merge pull request #829 from lasanthaDLPDS/master
Adding checkbox and radio options to device.operation-bar
2017-07-06 13:57:13 +05:30
lasantha
cb8208b8b7 Adding UI validation to check whether radio or checkbox options are selected or not. 2017-07-06 13:15:52 +05:30
Madhawa Perera
262f761965 Merge pull request #828 from geethkokila/master
Fixing the #460 issue
2017-07-06 12:00:16 +05:30
geethkokila
fe67d251d5 Fixing the #460 issue 2017-07-06 11:57:04 +05:30
lasantha
e05eda5e18 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-06 09:42:22 +05:30
lasantha
c9e533dd2a adding ui params option to operations 2017-07-06 09:36:40 +05:30
WSO2 Builder
1950126459 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration 2017-07-05 23:45:39 +05:30
WSO2 Builder
2388bd5f05 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21 2017-07-05 23:45:24 +05:30
Kamidu Sachith Punchihewa
c3d3975a8c Merge pull request #827 from rasika/filter-features
Adding filter out features
2017-07-05 23:25:44 +05:30
Rasika Perera
3e118d8800 Fixing https://github.com/wso2/product-iots/issues/1063: Adding filter out features 2017-07-05 23:20:41 +05:30
WSO2 Builder
f106a914bb [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration 2017-07-05 14:59:52 +05:30
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
Imesh Chandrasiri
c17b2fbd98 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-05 12:10:26 +05:30
Imesh Chandrasiri
d38714b7e6 fixes wso2/product-iots#1113 2017-07-05 12:08:45 +05:30
Rasika Perera
5e87ce2d66 Merge pull request #824 from rasika/monetize-cloud
Fixing https://github.com/wso2/product-iots/issues/1119: monetization
2017-07-05 11:10:11 +05:30
Rasika Perera
2c502386b8 Merge pull request #825 from rasika/geo-fence-issues
Fixing Geo fencing UI issues
2017-07-05 11:08:46 +05:30
Rasika Perera
7079fea83b Merge pull request #826 from dunithd/master
Making geo location data publishing disabled on the default pack.
2017-07-05 11:04:33 +05:30
dunithd
47766a5c6a Making geo location data publishing disabled on the default pack. 2017-07-05 10:55:35 +05:30
Rasika Perera
f8fa314359 Fixing https://github.com/wso2/product-iots/issues/1096: Hiding table when no alerts avaialble 2017-07-05 10:49:55 +05:30
Rasika Perera
7bc3ab7bec Fixing https://github.com/wso2/product-iots/issues/1096: Stationery -> Stationary 2017-07-05 07:17:52 +05:30
Rasika Perera
fb12c3cb04 Fixing https://github.com/wso2/product-iots/issues/1096: i.e. colombo -> e.g. colombo 2017-07-05 07:17:26 +05:30
Rasika Perera
8223588e82 Fixing https://github.com/wso2/product-iots/issues/1119: monetization 2017-07-05 06:27:42 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
Kamidu Sachith Punchihewa
07f8ce9441 Merge pull request #823 from DimalChandrasiri/master
fix for issue [#1112]
2017-07-04 17:22:15 +05:30
Imesh Chandrasiri
73d4a213c6 fix for issue [#1112] 2017-07-04 17:13:52 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
Madhawa Perera
0c83a28a0f Merge pull request #822 from Nirothipan/master
Fixes [Password Field seems to be incorrect] #404
2017-07-03 17:47:14 +05:30
Nirothipan
ce741c3993 Security policy updated, allowing to autofill password if users have saved it 2017-07-03 14:15:07 +05:30
WSO2 Builder
7a02ecbe68 [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration 2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17 2017-07-01 12:46:54 +05:30
Madhawa Perera
96c650f699 Merge pull request #820 from janakamarasena/bug-fixes-2
Added tenant domain to username in AccessToken grant
2017-07-01 08:04:58 +05:30
Madhawa Perera
031c648a2e Merge pull request #816 from dunithd/master
Checking whether the geo location service has been enabled before reading stats from analytics server
2017-07-01 08:04:39 +05:30
WSO2 Builder
c376208943 [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration 2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16 2017-06-30 17:44:14 +05:30
Janak Amarasena
7218174d46 Add tenant domain to username 2017-06-30 16:13:41 +05:30
WSO2 Builder
4396704616 Merge commit 'cc13b1446e3465b67a1bf7aea681102cabb96412' into 5c4b0f95-b6c1-4250-9ab6-e420a526a091 2017-06-30 15:54:00 +05:30
Ayyoob Hamza
83fc26b722 Merge pull request #819 from lasanthaDLPDS/master
Fixing UI issues in device type API
2017-06-30 15:47:35 +05:30
WSO2 Builder
cc13b1446e [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration 2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4 [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15 2017-06-30 15:45:56 +05:30
lasantha
8f225bc623 Fixing minor UI issues 2017-06-30 15:38:06 +05:30
Madhawa Perera
b503b531bd Merge pull request #818 from rasika/master
When user removed, all associated devices are removed now
2017-06-30 15:15:10 +05:30
Rasika Perera
186b49395e Fixing https://github.com/wso2/product-iots/issues/685: When user removed, all associated devices removed 2017-06-30 14:59:24 +05:30
lasantha
d5fac0c569 Removing device type clicking option 2017-06-30 14:36:08 +05:30
Geeth
e6edaad949 Merge pull request #817 from DimalChandrasiri/master
Adding Chevron support for op.log list
2017-06-30 14:28:35 +05:30
Imesh Chandrasiri
9876fa8e9b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-30 14:24:39 +05:30