Commit Graph

5010 Commits

Author SHA1 Message Date
Rasika Perera
d0a1132060 Improving geo fence ui 2017-06-16 10:10:57 +05:30
Ayyoob Hamza
0551598988 Merge pull request #779 from janakamarasena/oauth-token-grant-refractor
Access token grant handler
2017-06-16 06:52:36 +05:30
ayyoob
f47d0deb1a few changes after testing. 2017-06-16 03:48:08 +05:30
WSO2 Builder
1e58f762da [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration 2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5 [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1 2017-06-15 16:22:51 +05:30
Ruwan
5d4c85b61e Merge pull request #778 from harshanL/master
Code refactored.
2017-06-15 15:20:37 +05:30
Janak Amarasena
b2bdc0b6c8 Add token validation classes to the same bundle 2017-06-15 15:04:59 +05:30
Harshan Liyanage
de9beb1f5b Code refatcored. 2017-06-15 14:49:40 +05:30
inoshperera
d63ef44e7b Merge pull request #777 from harshanL/master
Fixed wso2/product-iots#473
2017-06-15 12:03:01 +05:30
Harshan Liyanage
3857be50b9 Fixed wso2/product-iots#473 2017-06-15 11:58:22 +05:30
Ruwan
477608613e Merge pull request #776 from rasika/master
Fixing https://github.com/wso2/product-iots/issues/431
2017-06-15 11:31:19 +05:30
Rasika Perera
61c4db07a3 Fixing https://github.com/wso2/product-iots/issues/431 2017-06-15 11:27:37 +05:30
ayyoob
0d08c42f5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-15 09:48:00 +05:30
ayyoob
1600426951 updated tenant id 2017-06-15 09:47:24 +05:30
WSO2 Builder
69d2cff7bd [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration 2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895 [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0 2017-06-14 18:08:31 +05:30
Chatura Dilan
58eab35123 Merge branch 'application-mgt' of github.com:wso2/carbon-device-mgt into application-mgt 2017-06-14 17:27:14 +05:30
Chatura Dilan
6d6aa50b2a Added functionailty to update app 2017-06-14 17:27:01 +05:30
sinthuja
fe3325ebf2 Merge remote-tracking branch 'wso2/application-mgt' into wso2-application-mgt
# Conflicts:
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/PlatformDAO.java
#	components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/dao/impl/platform/GenericPlatformDAOImpl.java
2017-06-14 16:13:38 +05:30
sinthuja
e5704ac05d Using the platformManger service instead of using the DAO. 2017-06-14 16:10:54 +05:30
sinthuja
a7569456ce fixing the build issue due to removing the method in platform manager. 2017-06-14 16:09:08 +05:30
sinthuja
59f43886cf Adding the update platform API. 2017-06-14 16:07:16 +05:30
Ruwan
9be74f6d29 Merge pull request #775 from harshanL/master
Disabled java doc generation in build.
2017-06-14 15:28:38 +05:30
Harshan Liyanage
ba8965af7c Disabled java doc generation in build. 2017-06-14 15:27:03 +05:30
Ayyoob Hamza
a2ac6fe4a5 Merge pull request #774 from harshanL/master
Added javadoc comments.
2017-06-14 15:10:00 +05:30
Harshan Liyanage
9e24338660 Added javadoc comments. 2017-06-14 14:55:25 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
Chatura Dilan
9bc23a927d Fixed the mysql script for app management 2017-06-14 12:47:52 +05:30
Chatura Dilan
d7b784b073 Removed published from platforms 2017-06-14 12:45:15 +05:30
Chatura Dilan
ac871fdbce Fixed exception class to PlatformDAOException 2017-06-14 12:40:11 +05:30
ayyoob
da68f8fac1 fixed on config operation flow 2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28 Merge pull request #773 from harshanL/master
Fixed java-doc comments issues and added comments to the configs.
2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4 Fixed java-doc comments issues and added comments to the configs. 2017-06-14 12:28:16 +05:30
Chatura Dilan
52b2739bee Refactoring DAOs 2017-06-14 12:28:13 +05:30
Chatura Dilan
6a18d7ab4c Fixed conflicts 2017-06-14 12:15:49 +05:30
Chatura Dilan
2b0ae8c5a4 Added creating app functionality 2017-06-14 11:59:06 +05:30
Geeth
115ccb739a Merge pull request #765 from harshanL/master
Added comments to the device status configs.
2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-14 10:43:19 +05:30
Rasika Perera
68d9b2d310 Adding focus on geo map 2017-06-14 07:48:57 +05:30
Rasika Perera
10c8bf7f42 Capilizing notification title 2017-06-14 07:47:01 +05:30
sinthuja
6020b3fb65 Adding platform manager first API. 2017-06-13 18:15:58 +05:30
WSO2 Builder
16420433b5 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration 2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75 2017-06-13 17:26:42 +05:30
Harshan Liyanage
23334f75c7 Merge pull request #772 from Vishanth/master
fixing sql queries to compare owner in lowercase
2017-06-13 17:20:36 +05:30
Harshan Liyanage
43ba1e1b43 Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005 2017-06-13 17:08:26 +05:30
Vishanth
7da1067d68 fixing sql queries to compare owner in lowercase 2017-06-13 17:08:01 +05:30
sinthuja
fe26352ec9 Adding platform manager first API. 2017-06-13 13:55:04 +05:30
Rasika Perera
4796f5934f Fixed geo alerts notifications 2017-06-13 00:44:20 +05:30
Rasika Perera
73ab6f28c1 Fixed sidebar notifications 2017-06-13 00:40:10 +05:30
Rasika Perera
6470e8e3d2 Fixed sidebar notifications 2017-06-13 00:39:58 +05:30