Commit Graph

485 Commits (d08b13d514aeba6599b12f36a008b93287655e0d)
 

Author SHA1 Message Date
Shabir Mohamed d08b13d514 Merge pull request #38 from Shabirmean/master
9 years ago
Shabirmean 727e6358d1 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean 631d907613 Adding separate jaggery module "apimstore" to evade conflicts with the module used by APPM
9 years ago
sajithar a9bc546253 changed bin.xml to exclude 'app-conf.json' from UUF and CDMF apps.
9 years ago
Charitha Goonetilleke 802a70ec79 Merge pull request #37 from charithag/master
9 years ago
charithag 99b123bf74 Add jaggery conf from cdmf
9 years ago
Charitha Goonetilleke 8922e34694 Merge pull request #36 from charithag/master
9 years ago
charithag c32caa6067 Copy cdmf related uuf contents from devicemgt-cdmf
9 years ago
Ace 5e7bbd6cb6 Fixing api manager store/publisher login issue
9 years ago
Shabir Mohamed 1799bc65f4 Merge pull request #35 from Shabirmean/master
9 years ago
Shabirmean e7c7ab0e50 Adding execution to rename api store and publisher context in site.son
9 years ago
Ace 7e0d384dc9 Copying api publisher/store feature to pack
9 years ago
Charitha Goonetilleke 560ca59028 Merge pull request #34 from charithag/master
9 years ago
charithag a9dcd8cd21 Moved analytics toCDMF coomponents
9 years ago
Charitha Goonetilleke 318a7a066c Merge pull request #3 from menaka121/master
9 years ago
Menaka Madushanka 9857e2f2b4 spark script for pressure
9 years ago
Menaka Madushanka 454b24db1f spark scripts for the other sensors + build.xml edited
9 years ago
Menaka Madushanka 88a09c8cab spark scripts for the other sensors + build.xml edited
9 years ago
Menaka Madushanka 194843c91a spark scripts for the other sensors
9 years ago
menaka db4257ea2d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
menaka 43cdc86543 db script error resolved
9 years ago
Charitha Goonetilleke c8b9345640 Merge pull request #33 from charithag/master
9 years ago
charithag de857cfc6e Fix issue in script
9 years ago
menaka b1c9246ffa db script error resolved
9 years ago
Charitha Goonetilleke f25b56543a Merge pull request #2 from menaka121/master
9 years ago
menaka b7661d286b DB schema for android sense and script change
9 years ago
menaka 3b9fe436c3 Merge remote-tracking branch 'origin/master'
9 years ago
Charitha Goonetilleke 067def8ab7 Merge pull request #32 from charithag/master
9 years ago
charithag 4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app
9 years ago
menaka 75d4344f6c DB schema for android sense and script change
9 years ago
Charitha Goonetilleke c4f0702cec Merge pull request #31 from charithag/master
9 years ago
charithag 4b8662f58f Add required changes for android sense
9 years ago
menaka 47c4c17012 Android sense db added
9 years ago
Charitha Goonetilleke f535b1d9cc Merge pull request #30 from charithag/master
9 years ago
charithag f876abf3e4 Add carbonapps to deployment
9 years ago
Charitha Goonetilleke 0021029913 Merge pull request #1 from menaka121/master
9 years ago
Charitha Goonetilleke a0cda93e13 Merge pull request #29 from charithag/master
9 years ago
charithag c08aa706e6 Removed oltu patch since it is included in identity 5.0.3
9 years ago
charithag ccf1af3ea4 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Menaka Madushanka 0076709626 Android sense feature added.
9 years ago
menaka 594bd03b84 Merge remote-tracking branch 'origin/master'
9 years ago
Ace 8cc653a788 bumping identity to 5.0.3 and other fixes
9 years ago
charithag 5b7fee6043 Excluded jaggery.conf in uuf-base app
9 years ago
Charitha Goonetilleke 5ca11764b8 Merge pull request #28 from NuwanSameera/master
9 years ago
NuwanSameera e13ce2dc8a pom.xml modification for digital display
9 years ago
menaka a91f75a34d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Charitha Goonetilleke 6632cfc272 Merge pull request #27 from charithag/master
9 years ago
charithag 4f6dfac0fa Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins
9 years ago
Shabirmean 865372f9e8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
9 years ago
Shabirmean 910b52db75 adding social dbscripts to product
9 years ago