Commit Graph

3860 Commits

Author SHA1 Message Date
Milan Perera
873505dc17 Modified policy edit page 2017-12-13 08:54:06 +05:30
Milan Perera
e09a524c30 Fixed wso2/product-iots#1427 2017-12-13 08:21:03 +05:30
lasantha
4a62a05cb9 Adding new API version for backward compatibility 2017-12-12 18:20:36 +05:30
lasantha
dd03c6b6e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-12-08 00:04:31 +05:30
WSO2 Builder
ae827b5fef [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare for next development iteration 2017-11-30 06:01:33 +00:00
WSO2 Builder
05fba1d664 [WSO2 Release] [Jenkins #3070] [Release 4.0.101] prepare release v4.0.101 2017-11-30 06:01:18 +00:00
Madhawa Perera
acc768822a
Merge pull request #853 from ruwany/master
Bumping cdmf version and updating unit tests
2017-11-30 11:04:20 +05:30
Ace
d57cb4a3a1 Bumping cdmf version and updating unit tests 2017-11-30 10:52:30 +05:30
WSO2 Builder
a40e9585ea [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare for next development iteration 2017-11-29 16:30:44 +00:00
WSO2 Builder
1fb05f65f1 [WSO2 Release] [Jenkins #3068] [Release 4.0.100] prepare release v4.0.100 2017-11-29 16:30:29 +00:00
Kamidu Sachith Punchihewa
97966336eb
Merge pull request #852 from charithag/master
Add siddhi extension to Get json array form given list of arguments
2017-11-29 21:35:55 +05:30
charitha
ae7d693e5c Improve testing 2017-11-29 21:30:04 +05:30
charitha
0c89600af7 Add siddhi extension to Get json array form given list of arguments 2017-11-29 15:48:13 +05:30
lasantha
37dd3f5d88 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-25 20:46:25 +05:30
WSO2 Builder
09ad904d9f [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare for next development iteration 2017-11-23 14:37:47 +00:00
WSO2 Builder
8251e37ea9 [WSO2 Release] [Jenkins #3066] [Release 4.0.99] prepare release v4.0.99 2017-11-23 14:37:32 +00:00
sumedharubasinghe
3d057273fb
Merge pull request #851 from charithag/master
Add latest android agent (3.1.22)
2017-11-23 19:44:28 +05:30
charitha
097d4cee95 Add latest android agent (3.1.22)
https://github.com/wso2/product-iots/issues/1497
2017-11-23 19:24:38 +05:30
WSO2 Builder
1d8e5f7c91 [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare for next development iteration 2017-11-23 12:30:19 +00:00
WSO2 Builder
f74146378a [WSO2 Release] [Jenkins #3064] [Release 4.0.98] prepare release v4.0.98 2017-11-23 12:30:02 +00:00
Charitha Goonetilleke
b7c1cf0e84
Merge pull request #848 from Gathika94/master
clustering of devices based on geo location
2017-11-23 17:35:13 +05:30
Gathika94
8e96ea3b61 minor changes 2017-11-23 16:19:05 +05:30
Gathika94
6b6b82e639 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-23 14:43:13 +05:30
Ruwan
bb0097986a
Merge pull request #850 from charithag/master
Fix for https://github.com/wso2/product-iots/issues/1496
2017-11-23 14:41:26 +05:30
charitha
82c7eefd2e Fix for https://github.com/wso2/product-iots/issues/1496 2017-11-23 14:39:08 +05:30
Charitha Goonetilleke
55ae9081fd
Merge pull request #849 from warunalakshitha/remote-control
Fix osgi issuees and remove unwanted dependencies
2017-11-23 11:55:55 +05:30
Gathika94
f834bdefaf update devicemgt version in pom 2017-11-23 11:08:14 +05:30
warunalakshitha
3e543d8f64 Fix osgi issuees and remove unwanted dependencies 2017-11-22 22:56:23 +05:30
Gathika94
6bcbf4e5dd minor changes 2017-11-22 21:44:51 +05:30
WSO2 Builder
b964faf3e1 [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare for next development iteration 2017-11-17 13:02:58 +00:00
WSO2 Builder
cf182427fb [WSO2 Release] [Jenkins #3060] [Release 4.0.97] prepare release v4.0.97 2017-11-17 13:02:44 +00:00
Kamidu Sachith Punchihewa
06b5f52a35
Merge pull request #847 from charithag/master
Merging PR #835 offline
2017-11-17 18:10:51 +05:30
charitha
831445d4a4 Update pom versions in order to prent possible build breaks after merging PR https://github.com/wso2/carbon-device-mgt-plugins/pull/835 2017-11-17 18:05:55 +05:30
charitha
49758fe5fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-17 17:22:42 +05:30
charitha
671a36e849 Merge branch 'remote-control' of https://github.com/warunalakshitha/carbon-device-mgt-plugins 2017-11-17 17:21:31 +05:30
WSO2 Builder
54ba529410 [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare for next development iteration 2017-11-17 10:55:56 +00:00
WSO2 Builder
8775bb8ef0 [WSO2 Release] [Jenkins #3058] [Release 4.0.96] prepare release v4.0.96 2017-11-17 10:55:43 +00:00
Rasika Perera
ef79e7fcc3
Merge pull request #846 from charithag/master
Fixed issue in HTTPEventAdapter with inner json objects
2017-11-17 15:55:55 +05:30
charitha
67da8465e8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-11-17 15:48:52 +05:30
charitha
b15aaa9a3c Fix issue in event payload building 2017-11-17 15:47:07 +05:30
WSO2 Builder
a78086f002 [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare for next development iteration 2017-11-17 09:44:11 +00:00
WSO2 Builder
02aa1191ee [WSO2 Release] [Jenkins #3056] [Release 4.0.95] prepare release v4.0.95 2017-11-17 09:43:56 +00:00
WSO2 Builder
9525104ac2 Merge commit '73737377305a5e2638a5ea9e12061c980c387bd2' into b9b84dc3-0b3c-4158-94b7-1cdb578dd6ad 2017-11-17 09:16:05 +00:00
WSO2 Builder
7373737730 [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare for next development iteration 2017-11-17 09:07:21 +00:00
WSO2 Builder
8acea1f50e [WSO2 Release] [Jenkins #3055] [Release 4.0.94] prepare release v4.0.94 2017-11-17 09:07:04 +00:00
Charitha Goonetilleke
c79836fc11
Merge pull request #838 from menakaj/master
Fixing code formatting issues.
2017-11-17 14:30:00 +05:30
Ruwan
0b7f2364ed
Merge pull request #845 from charithag/master
Expose device management core APIs as siddhi extensions
2017-11-17 14:12:16 +05:30
charitha
f790b13baa Bump device mgt version latest 2017-11-17 13:39:33 +05:30
charitha
3d71b3fd15 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
# Conflicts:
#	components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
2017-11-17 12:58:35 +05:30
charitha
5f4bada92a Add improvments to oauth-http publisher to work with url templates 2017-11-17 12:56:27 +05:30