Ruwan
|
f80523f409
|
Merge pull request #114 from charithag/master
Fix build status link and icon with content update
|
2016-04-04 19:05:46 +05:30 |
|
charithag
|
7ba03e6cc6
|
Fix build status link and icon with content update
|
2016-04-04 09:35:04 +05:30 |
|
Ruwan
|
783465d459
|
Merge pull request #113 from ayyoob/master
removed snapshot version from dependencies
|
2016-04-01 21:34:39 +05:30 |
|
ayyoob
|
4d2c63eff7
|
disabled jwt grant type
|
2016-04-01 21:13:56 +05:30 |
|
ayyoob
|
7e51653b36
|
removed snapshot version from dependencies
|
2016-04-01 21:03:48 +05:30 |
|
Ruwan
|
94ba3ff6c2
|
Merge pull request #112 from rasika90/master
Removing uuf template app feature from iots
|
2016-04-01 19:29:31 +05:30 |
|
Rasika Perera
|
0fc75151f6
|
Removing uuf template app feature
|
2016-04-01 15:08:34 +05:30 |
|
Prabath Abeysekara
|
bdb3bb3023
|
Merge pull request #110 from charithag/master
Disabled IoT device types based features temporally.
|
2016-04-01 12:57:50 +05:30 |
|
charithag
|
85a00afe85
|
Merge branch 'master' of https://github.com/wso2/product-iot-server
# Conflicts:
# modules/distribution/src/assembly/bin.xml
# modules/features/org.wso2.iot.styles.feature/pom.xml
# modules/features/pom.xml
# modules/p2-profile-gen/pom.xml
|
2016-03-31 23:41:07 +05:30 |
|
Prabath Abeysekara
|
e679648ffb
|
Merge pull request #111 from ayyoob/merge-latest
Changed analytics to released version and temporally disabled mobile …
|
2016-03-31 16:40:01 +05:30 |
|
ayyoob
|
5b81f8a6a3
|
upgraded analytics version to snapshot to resolve spark errors
|
2016-03-31 15:13:47 +05:30 |
|
ayyoob
|
0b6cd88b78
|
Changed analytics to released version and temporally disabled mobile features until impl is released from base feature.
|
2016-03-31 05:58:09 +05:30 |
|
charithag
|
4cfa5f60ea
|
Disabled IoT device types based features temporally.
|
2016-03-30 02:07:35 +05:30 |
|
Charitha Goonetilleke
|
8f60317a4f
|
Add build status
|
2016-03-29 12:20:38 +05:30 |
|
charithag
|
17e9dd9127
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
2016-03-25 15:29:40 +05:30 |
|
Ruwan
|
155867b334
|
Merge pull request #109 from ayyoob/master
Added JWT grant type and upgraded the APIM version
|
2016-03-24 08:45:03 +05:30 |
|
Ruwan
|
ed1c9c7ae3
|
Merge pull request #108 from GPrathap/master
upgrade and add new theme to dashboard portal application
|
2016-03-23 08:33:25 +05:30 |
|
ayyoob
|
69740cc2f2
|
updated APIM version
|
2016-03-23 03:23:13 +05:30 |
|
GPrathap
|
65b4dec1d7
|
adding a new gadget: Data Range Picker
|
2016-03-21 05:55:00 +05:30 |
|
GPrathap
|
824503c0d7
|
adding new theme to dashboard portal application
|
2016-03-20 23:58:47 +05:30 |
|
GPrathap
|
948c059c4e
|
upgrading the dashboard portal application from 1.0.9 to 1.0.14-SNAPSHOT
|
2016-03-20 23:48:17 +05:30 |
|
Charitha Goonetilleke
|
9afcfc6ee6
|
Merge pull request #107 from charithag/master
Refactoring
|
2016-03-18 12:49:52 +05:30 |
|
charithag
|
e5c11b9fa5
|
Refactoring
|
2016-03-18 12:47:14 +05:30 |
|
Ruwan
|
98cbc423b9
|
Merge pull request #106 from NuwanSameera/master-nuwan
Remove policy based jaggery apps from samples.
|
2016-03-17 15:03:20 +05:30 |
|
NuwanSameera
|
e0b9524168
|
Remove policy based jaggery apps from samples.
|
2016-03-17 15:00:43 +05:30 |
|
NuwanSameera
|
77b4a51add
|
Resolve conflicts.
|
2016-03-17 14:57:25 +05:30 |
|
NuwanSameera
|
0ab149d392
|
Remove policy based jagerry apps from samples.
|
2016-03-17 14:44:20 +05:30 |
|
Charitha Goonetilleke
|
f630876d7a
|
Merge pull request #105 from charithag/master
Fix json library version
|
2016-03-15 14:08:40 +05:30 |
|
charithag
|
16a8e63497
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
2016-03-15 13:58:16 +05:30 |
|
charithag
|
a2c016efcc
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-15 11:53:14 +05:30 |
|
charithag
|
dc3540f2ef
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
2016-03-15 11:52:59 +05:30 |
|
Charitha Goonetilleke
|
3246c14935
|
Merge pull request #104 from GPrathap/master
removed file separator when creating mqtt subscriber topic
|
2016-03-15 11:51:07 +05:30 |
|
GPrathap
|
d9fd45e5ab
|
removed file separator when creating mqtt subscriber topic
|
2016-03-15 11:49:28 +05:30 |
|
NuwanSameera
|
1ac7f55435
|
Add permissions.xml to current sensor device type.
|
2016-03-15 10:50:03 +05:30 |
|
Ruwan
|
07ebc9f783
|
Merge pull request #102 from menaka121/master
UI test cases for IOT server
|
2016-03-15 09:57:07 +05:30 |
|
Charitha Goonetilleke
|
6029428336
|
Bump json version
|
2016-03-14 23:58:07 +05:30 |
|
Charitha Goonetilleke
|
f48b35b494
|
Bump json version
|
2016-03-14 23:38:14 +05:30 |
|
Charitha Goonetilleke
|
a7221a04b6
|
Bump json version
|
2016-03-14 23:37:30 +05:30 |
|
Charitha Goonetilleke
|
fbe6ebe9df
|
Fix json library version
|
2016-03-14 23:36:14 +05:30 |
|
Menaka Madushanka
|
130cad34ee
|
Changes suggested in the Code review.
|
2016-03-14 19:50:50 +05:30 |
|
Menaka Madushanka
|
f7cf6fe56e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 17:59:10 +05:30 |
|
Menaka Madushanka
|
0333007b1f
|
Changes suggested in the Code review.
|
2016-03-14 17:41:23 +05:30 |
|
NuwanSameera
|
0e01164874
|
Merge branch 'master' of https://github.com/ayyoob/product-iot-server
|
2016-03-14 12:44:57 +05:30 |
|
Menaka Madushanka
|
eb77b572e7
|
Fixes
|
2016-03-14 12:28:03 +05:30 |
|
Menaka Madushanka
|
d7565e7fe7
|
Minor fixes
|
2016-03-14 11:18:47 +05:30 |
|
NuwanSameera
|
aeb3ef20ac
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 10:14:02 +05:30 |
|
Menaka Madushanka
|
d71b00d925
|
Added constants.
|
2016-03-14 10:04:42 +05:30 |
|
Ruwan
|
9a89065429
|
Merge pull request #103 from GPrathap/master
Some changes were done in cdmf device type plugin and doormanager example
|
2016-03-14 09:00:11 +05:30 |
|
GPrathap
|
24fe930727
|
refactoring code
|
2016-03-13 22:02:09 +05:30 |
|
GPrathap
|
9b38eddd09
|
relocated ui component
|
2016-03-13 22:01:28 +05:30 |
|