Ace
|
2fd99fa85d
|
Adding fix for API Store/Publisher login
|
9 years ago |
Shabir Mohamed
|
594b3381e7
|
Merge pull request #41 from Shabirmean/master
removing virtual_firealarm datasource info from master-datasources xml
|
9 years ago |
|
Shabirmean
|
86675ecf92
|
removing virtual_firealarm datasource info from master-datasources xml
|
9 years ago |
NuwanSameera
|
d9fc247bf4
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
modules/distribution/pom.xml
|
9 years ago |
|
NuwanSameera
|
72fef2a2cc
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
modules/distribution/pom.xml
|
9 years ago |
Charitha Goonetilleke
|
f8622c2bea
|
Merge pull request #40 from charithag/master
Fix api-store loggin issue
|
9 years ago |
charithag
|
71a19d05c4
|
Fix api-store loggin issue
|
9 years ago |
|
Charitha Goonetilleke
|
1b003a65c1
|
Merge pull request #39 from charithag/master
Add db create script
|
9 years ago |
|
charithag
|
3a16839855
|
Add db create script
|
9 years ago |
|
Shabir Mohamed
|
d08b13d514
|
Merge pull request #38 from Shabirmean/master
Adding separate jaggery module "apimstore"
|
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
Add jaggery conf from cdmf
|
9 years ago |
|
charithag
|
99b123bf74
|
Add jaggery conf from cdmf
|
9 years ago |
|
NuwanSameera
|
8b0d0ad8b5
|
digital display database configurations
|
9 years ago |
|
NuwanSameera
|
7416404307
|
pom file changes
|
9 years ago |
|
Charitha Goonetilleke
|
8922e34694
|
Merge pull request #36 from charithag/master
Copy cdmf related uuf contents from devicemgt-cdmf
|
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
Adding execution to rename api store and publisher context in site.son
|
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
Moved analytics to CDMF Plugins
|
9 years ago |
|
charithag
|
a9dcd8cd21
|
Moved analytics toCDMF coomponents
|
9 years ago |
|
Charitha Goonetilleke
|
318a7a066c
|
Merge pull request #3 from menaka121/master
db script error resolved
|
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
Menaka's fixes
|
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
DB schema and script change
|
9 years ago |
|
menaka
|
b7661d286b
|
DB schema for android sense and script change
|
9 years ago |
|
menaka
|
3b9fe436c3
|
Merge remote-tracking branch 'origin/master'
Conflicts:
modules/distribution/pom.xml
|
9 years ago |
|
Charitha Goonetilleke
|
067def8ab7
|
Merge pull request #32 from charithag/master
Use custom carbon xml and Add DAS portal jaggery app
|
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
Add required changes for android sense
|
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
Add carbonapps to deployment
|
9 years ago |
|
charithag
|
f876abf3e4
|
Add carbonapps to deployment
|
9 years ago |
|
Charitha Goonetilleke
|
0021029913
|
Merge pull request #1 from menaka121/master
Changes for the android sense: Spark scripts and p2 profile changes
|
9 years ago |
|
Charitha Goonetilleke
|
a0cda93e13
|
Merge pull request #29 from charithag/master
Excluded jaggery.conf provided by uuf-base app and removed oltu patch
|
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 |
