Commit Graph

454 Commits

Author SHA1 Message Date
charithag
4dcd064f8b Use custom carbon xml and Add DAS portal jaggery app 2015-12-11 11:06:37 +05:30
charithag
4b8662f58f Add required changes for android sense 2015-12-11 08:52:51 +05:30
Charitha Goonetilleke
f535b1d9cc Merge pull request #30 from charithag/master
Add carbonapps to deployment
2015-12-10 21:00:18 +05:30
charithag
f876abf3e4 Add carbonapps to deployment 2015-12-10 20:24:03 +05:30
Charitha Goonetilleke
0021029913 Merge pull request #1 from menaka121/master
Changes for the android sense: Spark scripts and p2 profile changes
2015-12-10 19:03:16 +05:30
Charitha Goonetilleke
a0cda93e13 Merge pull request #29 from charithag/master
Excluded jaggery.conf provided by uuf-base app and removed oltu patch
2015-12-10 18:58:15 +05:30
charithag
c08aa706e6 Removed oltu patch since it is included in identity 5.0.3 2015-12-10 18:56:20 +05:30
charithag
ccf1af3ea4 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-10 18:45:36 +05:30
Menaka Madushanka
0076709626 Android sense feature added. 2015-12-10 16:54:23 +05:30
menaka
594bd03b84 Merge remote-tracking branch 'origin/master' 2015-12-10 15:04:14 +05:30
Ace
8cc653a788 bumping identity to 5.0.3 and other fixes 2015-12-10 14:31:01 +05:30
charithag
5b7fee6043 Excluded jaggery.conf in uuf-base app 2015-12-10 13:43:47 +05:30
Charitha Goonetilleke
5ca11764b8 Merge pull request #28 from NuwanSameera/master
pom.xml modification for digital display
2015-12-10 12:39:09 +05:30
NuwanSameera
e13ce2dc8a pom.xml modification for digital display 2015-12-10 12:37:12 +05:30
menaka
a91f75a34d Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-09 15:50:25 +05:30
Charitha Goonetilleke
6632cfc272 Merge pull request #27 from charithag/master
Update console logo and removed asm-all_4.1.0.wso2v1.jar
2015-12-08 23:21:39 +05:30
charithag
4f6dfac0fa Removed asm-all_4.1.0.wso2v1.jar from distribution and include mdm based app mgt feature from plugins 2015-12-08 23:19:39 +05:30
Shabirmean
865372f9e8 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 23:02:16 +05:30
Shabirmean
910b52db75 adding social dbscripts to product 2015-12-08 23:02:02 +05:30
charithag
c494db99e7 Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 22:49:36 +05:30
Ace
1250743458 Adding changes to identity.xml to fix logging issue 2015-12-08 21:46:46 +05:30
Shabirmean
9ae9bcfb31 Removing duplicate analytics version, switched "data-bridge-config.xml' to be copied from feature 2015-12-08 15:02:43 +05:30
Shabirmean
63dcd1e04e Addidng SocialDB to distribution pom 2015-12-08 12:02:58 +05:30
Menaka Madushanka
309d38de72 Added the accelerometer script 2015-12-08 10:59:05 +05:30
menaka
1c0242fe7e Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server 2015-12-08 10:55:08 +05:30
Menaka Madushanka
efe53204c8 Added the accelerometer script 2015-12-08 10:54:05 +05:30
Shabirmean
85bc5bd201 Adding SocialDB creation execution to distribution pom 2015-12-07 23:46:44 +05:30
Shabirmean
d09128f482 excluding "appmoauth2.war" from the build 2015-12-07 18:53:32 +05:30
charithag
584ba63494 Update logo 2015-12-07 13:44:59 +05:30
Shabirmean
808771056c removing the common-api feature from the build 2015-12-07 13:41:45 +05:30
Charitha Goonetilleke
c8739494c8 Merge pull request #26 from charithag/IoTS-1.0.0-M1
Iots 1.0.0 m1 branch merge from product-mdm
2015-12-05 14:13:46 +05:30
charithag
2c1efd1af0 Migrated to EMM based product 2015-12-05 14:05:35 +05:30
ayyoob
098547efaa removing unnecessary es store files 2015-11-30 00:28:47 +05:30
ayyoob
320f754356 resolved few started errors 2015-11-28 01:27:40 +05:30
charithag
247dfa9820 Migrated to CDMF with Generic UI 2015-11-27 11:10:37 +05:30
Shabir Mohamed
66e4d99b57 Merge pull request #25 from Shabirmean/master
[MERGED from Shabir] Added SCEP Implementation for VirtualFireAlarm Sample with end to end encryption
2015-11-20 19:55:06 +05:30
Shabirmean
cbdb4eaece removed unnecessary logs from the VirtualFIreAlarmService 2015-11-20 19:48:27 +05:30
Shabirmean
ec98c99894 Added complete SCEP implementation plus end to end encryption for VirtualFireAlarm 2015-11-20 19:04:28 +05:30
Shabirmean
af3e30fbc3 synced firealarm web.xml with virtual_firealarm web.xml 2015-11-17 13:34:39 +05:30
Shabirmean
d28a2bf4b3 Changes for the FireAlarmService to work with real device and SCEP service inclusions 2015-11-14 18:23:48 +05:30
Ruwan
3c2a84a07d Merge pull request #23 from menaka121/master
resources.xml file
2015-11-11 10:49:48 +05:30
Menaka Madushanka
c8e85ce0db resources.xml file added 2015-11-11 10:08:03 +05:30
Ace
f5f5356e35 Restructirng samples 2015-11-10 12:35:45 +05:30
Rasika Perera
e8db03bf60 Merge pull request #22 from rasika90/master
carbon analytics version bump
2015-11-03 17:46:34 +05:30
Rasika Perera
166d9ab2cb Merge branch 'master' of https://github.com/rasika90/product-iot-server 2015-11-03 17:40:44 +05:30
Rasika Perera
6bd654f1f3 carbon analytics version bump 2015-11-03 17:34:26 +05:30
Rasika Perera
07d71b834d Merge pull request #21 from rasika90/master
fixing invalid relative paths in pom.xml
2015-11-03 11:38:58 +05:30
Rasika Perera
29a0bf2fe2 fixing invalid relative paths in pom.xml 2015-11-03 11:38:14 +05:30
Rasika Perera
f4ef6d23d5 Merge pull request #20 from rasika90/master
carbon-analytics version upgrading
2015-11-03 11:33:16 +05:30
Rasika Perera
44f380c8e0 changes to the resources.xml 2015-11-03 11:30:00 +05:30