Nirothipan
|
ed7f15346a
|
updating connected cup order coffee cup url
|
2017-07-07 18:16:42 +05:30 |
|
Hasunie
|
06ba6e98fc
|
fixing issue wso2/product-iots#965
|
2017-07-06 15:02:13 +05:30 |
|
Nirothipan
|
c1a15e11eb
|
correcting typo error
|
2017-07-04 12:21:22 +05:30 |
|
geethkokila
|
0147fa4784
|
Fixing the osgi issue
|
2017-06-30 17:24:10 +05:30 |
|
Rasika Perera
|
4c613e5682
|
Fixing https://github.com/wso2/product-iots/issues/1066: moving scripts dir into wso2/analytics
|
2017-06-29 07:49:48 +05:30 |
|
Geeth
|
d6df453472
|
Merge pull request #1070 from milanperera/iot-master
Removed DCR feature
|
2017-06-28 18:06:30 +05:30 |
|
Madhawa Perera
|
c6086de22c
|
Merge pull request #1071 from thisaripatabendi/master
Adding coffee level graph to realtime-analytics view
|
2017-06-28 13:38:32 +05:30 |
|
thisaripatabendi
|
a5154cf269
|
Adding coffee level graph to realtime-analytics view
|
2017-06-28 12:39:52 +05:30 |
|
Milan Perera
|
82d1cf41e0
|
Removed DCR life cycle listener
|
2017-06-28 12:18:18 +05:30 |
|
thisaripatabendi
|
9b26660971
|
Adding coffee level graph to realtime-analytics view
|
2017-06-28 11:41:35 +05:30 |
|
sinthuja
|
77cd418e2f
|
Fixing the build failure in the connected cup.
|
2017-06-27 18:24:57 +05:30 |
|
sinthuja
|
c69f74ad2b
|
Updating the source/target JDK versions to 1.8.
|
2017-06-23 18:13:44 +05:30 |
|
sinthuja
|
ff6642b5ba
|
Adding the executable permission for the mobile qsg script.
|
2017-06-23 17:23:49 +05:30 |
|
sinthuja
|
2803ba29e7
|
Merge branch 'pr1049' into origin-master
# Conflicts:
# modules/distribution/src/core/samples/connectedcup/component/ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.connectedcup.device-view/device-view.hbs
|
2017-06-23 17:10:14 +05:30 |
|
thisaripatabendi
|
dd5f4861eb
|
Fixing connected-cup issues.
|
2017-06-23 16:49:20 +05:30 |
|
sinthuja
|
9bdd2d766f
|
Merge pull request #1048 from dunithd/master
Applying new UX for connected cup device details page
|
2017-06-23 16:48:35 +05:30 |
|
thisaripatabendi
|
67a6eb0db4
|
Fixing connected-cup issues.
|
2017-06-23 16:34:56 +05:30 |
|
sinthuja
|
0b85c80701
|
Updating the license headers.
|
2017-06-23 15:51:30 +05:30 |
|
sinthuja
|
cbd4507648
|
Adding missing connected cup version in the root pom.xml.
|
2017-06-23 15:30:53 +05:30 |
|
dunithd
|
ee680cfec8
|
Applying new UX for connected cup device details page
|
2017-06-23 15:27:23 +05:30 |
|
sinthuja
|
8afe1d5245
|
Cleaning up the files pom files.
|
2017-06-23 15:25:45 +05:30 |
|
sinthuja
|
cfe3e59ce3
|
Removing the unused file device-type, and removing datasource configs from UI feature.
|
2017-06-23 15:14:04 +05:30 |
|
sinthuja
|
2aad4c7bd4
|
Updating the coffeeking version as the bundle version.
|
2017-06-23 15:01:54 +05:30 |
|
sinthuja
|
1773b64d20
|
Reverting the change done for device type.
|
2017-06-23 14:08:19 +05:30 |
|
sinthuja
|
9d866509bd
|
Merge branch 'wso2-master' into test-merge
|
2017-06-23 13:19:32 +05:30 |
|
sinthuja
|
5aa641183b
|
Fixing some path issue in device type deployables.
|
2017-06-23 13:09:37 +05:30 |
|
sinthuja
|
c6876695fc
|
Seperating the connected cup feature into backend, api, ui features as recommended feature structure.
|
2017-06-23 12:54:23 +05:30 |
|
sinthuja
|
5483532882
|
Fixing some version problem in the connected cup sample.
|
2017-06-23 11:47:39 +05:30 |
|
ayyoob
|
8c4f13ee48
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-23 04:12:26 +05:30 |
|
ayyoob
|
32c54e0ab6
|
adding client truststore key store - temporariy fix until kernel 4.4.17 is released
|
2017-06-23 04:07:25 +05:30 |
|
sinthuja
|
c04b8e7872
|
Fixing the old references of the plugins-deployer, and owsap log in the integration tests.
|
2017-06-22 23:26:45 +05:30 |
|
sinthuja
|
b363714446
|
fixing the issue in creating the connected cup instance.
|
2017-06-22 20:45:52 +05:30 |
|
sinthuja
|
602e012e2e
|
committing the intermediate changes.
|
2017-06-22 18:11:52 +05:30 |
|
Geeth
|
911d001aa6
|
Merge pull request #1034 from sinthuja/test-merge
Fixing https://github.com/wso2/product-iots/issues/776.
|
2017-06-22 14:45:00 +05:30 |
|
sinthuja
|
56cbef3f35
|
Fixing https://github.com/wso2/product-iots/issues/776.
|
2017-06-22 14:23:05 +05:30 |
|
Harshan Liyanage
|
c240fb9a71
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-06-21 18:34:03 +05:30 |
|
Harshan Liyanage
|
0a7e33961a
|
Fixed sample-deployer issues which resolves wso2/product-iots#458
|
2017-06-21 18:33:39 +05:30 |
|
Rasika Perera
|
d48b7d4939
|
Fixing org_wso2_carbon_iot_geo_dashboard-1.0.0.car not copied
|
2017-06-21 14:52:25 +05:30 |
|
ayyoob
|
76ddf4fe57
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-17 19:33:14 +05:30 |
|
Rasika Perera
|
c2b573b32c
|
Adding geo fencing
|
2017-06-16 16:15:15 +05:30 |
|
sinthuja
|
b59aec2e48
|
Fixing the license year in script files.
|
2017-06-15 13:51:59 +05:30 |
|
sinthuja
|
38963cb807
|
Fixing #1003.
|
2017-06-15 13:42:18 +05:30 |
|
ayyoob
|
f167b20192
|
updated migration db queries
|
2017-06-15 09:47:46 +05:30 |
|
ayyoob
|
4e248659ed
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
|
2017-06-14 13:23:59 +05:30 |
|
ayyoob
|
72b66504f4
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
pom.xml
|
2017-06-14 13:23:48 +05:30 |
|
sinthuja
|
6ac04eba48
|
Fixing https://github.com/wso2/product-iots/issues/1000.
|
2017-06-13 12:56:24 +05:30 |
|
sinthuja
|
2fc5104043
|
Fixing https://github.com/wso2/product-iots/issues/522.
|
2017-06-13 12:19:13 +05:30 |
|
ayyoob
|
8ddac1d037
|
merged with origin
|
2017-06-12 11:50:45 +05:30 |
|
ayyoob
|
fcfd39f54d
|
Merge branch 'master' of https://github.com/wso2/product-iots into devicetype-3.1.0
Conflicts:
pom.xml
|
2017-06-08 14:45:36 +05:30 |
|
Janak Amarasena
|
c3ad20b18a
|
Add new supported grant type
|
2017-06-07 14:26:29 +05:30 |
|
ayyoob
|
d4ff9da16d
|
updated migration script
|
2017-06-06 11:01:16 +05:30 |
|
ayyoob
|
5785ee1072
|
intial commit for db migration from 3.0.0 - 3.1.0
|
2017-06-05 00:13:52 +05:30 |
|
ayyoob
|
12837efd6d
|
renamed content validator type name
|
2017-06-04 06:53:21 +05:30 |
|
ayyoob
|
80ecba8528
|
migrated new kernel and mb version
|
2017-06-01 10:47:59 +05:30 |
|
Ayyoob Hamza
|
5334745d0b
|
Merge pull request #448 from sinthuja/test-merge
Removing some unnecessary features from the profiles.
|
2017-05-16 16:21:02 +05:30 |
|
sinthuja
|
b2495ad414
|
Fixing the formatting issue.
|
2017-05-16 15:23:44 +05:30 |
|
sinthuja
|
52fb2f732f
|
Fixing the formatting issue.
|
2017-05-16 15:22:14 +05:30 |
|
sinthuja
|
df48dbd3c0
|
Fixing the formatting issue.
|
2017-05-16 15:18:42 +05:30 |
|
sinthuja
|
955294135a
|
Moving the config files to the key manager profile.
|
2017-05-16 15:08:14 +05:30 |
|
sinthuja
|
28cc40db78
|
Removing unwanted features from profiles.
|
2017-05-16 15:01:16 +05:30 |
|
megala21
|
79a4f58929
|
Fixing issue in tenant-conf.json copying location
|
2017-05-16 09:06:27 +05:30 |
|
ayyoob
|
1c2d1ef231
|
added filter properties to pick plugins version from parent pom
|
2017-05-09 16:30:54 +05:30 |
|
ayyoob
|
43552543d2
|
added android sense analytics feature to the analytics runtime
|
2017-05-09 16:30:09 +05:30 |
|
ayyoob
|
2c7a7cd9b9
|
merged with origin
|
2017-05-09 16:29:32 +05:30 |
|
ayyoob
|
cd79929f42
|
added default values for global properties
|
2017-05-09 01:07:24 +05:30 |
|
ayyoob
|
475bd3ac84
|
added filter properties to pick the parent plugins version
|
2017-05-05 01:55:19 +05:30 |
|
ayyoob
|
834ad4f772
|
added missing appm features and installed android sense feature to the default pack
|
2017-05-05 01:36:36 +05:30 |
|
Amal Gunatilake
|
7db4733b1d
|
Merge pull request #399 from sinthuja/test-merge
Merging profile related fixes.
|
2017-05-03 14:38:20 +05:30 |
|
Amal Gunatilake
|
af2d760e5b
|
Merge branch 'master' into master
|
2017-05-02 20:41:59 +05:30 |
|
Amal Gunatilake
|
448d2f9b69
|
Updating the latest carbon.device.mgt.plugin.version
|
2017-05-02 20:39:00 +05:30 |
|
sinthuja
|
d0e449ced0
|
Fixing the issues in the server ports mapping.
|
2017-05-02 19:18:58 +05:30 |
|
sinthuja
|
c3743ea163
|
Merge branch 'wso2-master' into test-merge
|
2017-05-02 18:54:05 +05:30 |
|
Chatura Dilan
|
f0ecea5359
|
Merge pull request #392 from janakamarasena/master
Change comment in bin.xml
|
2017-05-02 17:07:46 +05:30 |
|
inoshperera
|
c7bd347618
|
Merge pull request #391 from sinthuja/local-branch2
Adding the missing social.xml file.
|
2017-05-02 16:05:11 +05:30 |
|
megala21
|
ed7e574939
|
Adding policy mangement test cases
|
2017-05-02 13:16:55 +05:30 |
|
sinthuja
|
00947e30b2
|
Fixing an issue in the key manager URL.
|
2017-04-28 18:50:15 +05:30 |
|
sinthuja
|
0753585391
|
Adding the missing social.xml file.
|
2017-04-28 18:05:06 +05:30 |
|
sinthuja
|
30c4c40f08
|
Adding the profile related improvements.
|
2017-04-28 18:03:15 +05:30 |
|
Janak Amarasena
|
fd1cf890a2
|
Change comment
|
2017-04-28 16:53:39 +05:30 |
|
megala21
|
583b562d8e
|
Removing the un-wanted copying of files
|
2017-04-28 00:19:48 +05:30 |
|
megala21
|
fbab71b0f7
|
Improving multi-tenancy test cases and fixing certificate management public publish issue
|
2017-04-27 17:35:17 +05:30 |
|
sinthuja
|
badc75a222
|
Merge branch 'wso2-master' into test-merge
|
2017-04-27 12:58:44 +05:30 |
|
sinthuja
|
5ec80d4c0a
|
Moving the client-registration apps to device manager.
|
2017-04-27 12:58:13 +05:30 |
|
sinthuja
|
6ddc2da328
|
Adding fixes related to ease distributed setup.
|
2017-04-27 12:47:32 +05:30 |
|
Amal Gunatilake
|
faa5eb34d6
|
Merge pull request #384 from sinthuja/test-merge
Adding device manager profile node also in the indexing profiles
|
2017-04-26 15:40:57 +05:30 |
|
sinthuja
|
7a4171be63
|
Removing the device-manager profile from webapp-publisher-config.xml.
|
2017-04-26 15:23:51 +05:30 |
|
sinthuja
|
93cd14bc43
|
Adding the device-manager backend profile as well for webapp publishing.
|
2017-04-26 14:18:06 +05:30 |
|
sinthuja
|
3a5f77c287
|
Adding device manager profile node also in the indexing profiles for the store to work in the distributed mode.
|
2017-04-26 14:10:02 +05:30 |
|
Amal Gunatilake
|
a7c21fd22b
|
Updating the latest carbon.device.mgt.plugin.version
|
2017-04-25 14:16:11 +05:30 |
|
Ayyoob Hamza
|
66be42a9ba
|
Merge pull request #374 from Megala21/test_case_fixes
Adding initial test cases with j-meter scripts
|
2017-04-21 17:02:32 +05:30 |
|
megala21
|
e5df961298
|
Adding initial integration with device management api jmeter scripts
|
2017-04-21 15:50:53 +05:30 |
|
sinthuja
|
2ef609d09c
|
Bug files for the profile-creator.bat after testing in windows machine, and improvements for script file.
|
2017-04-19 19:07:35 +05:30 |
|
sinthuja
|
8d99eb3967
|
Adding first cut of profile-creator.bat file.
|
2017-04-19 10:06:15 +05:30 |
|
sinthuja
|
992a561c61
|
Removing some unnecessary line in the secription.
|
2017-04-18 13:36:13 +05:30 |
|
sinthuja
|
8fd14700c5
|
Fixing https://github.com/wso2/product-iots/issues/363.
|
2017-04-18 12:11:29 +05:30 |
|
sinthuja
|
7f1d42a09c
|
Merge branch 'wso2-master' into test-merge
# Conflicts:
# modules/distribution/src/core/plugins/plugins-deployer.xml
|
2017-04-17 21:17:30 +05:30 |
|
sinthuja
|
5ed7b60ae2
|
Fixing SSO issue with keymanager profile.
|
2017-04-17 16:23:36 +05:30 |
|
sinthuja
|
45d02838fe
|
Adding all profiles creation in profile-creator.sh.
|
2017-04-17 14:30:04 +05:30 |
|
sinthuja
|
12165fa996
|
Moving the profiles distributions into the temp directory.
|
2017-04-17 12:36:18 +05:30 |
|
sinthuja
|
69fff37565
|
Resolving the issue in resolving the porduct version for profile-creator.sh.
|
2017-04-17 11:19:13 +05:30 |
|