community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,257 Commits 31 Branches 461 Tags 183 MiB
aa0f9e0510
Commit Graph

665 Commits

Author SHA1 Message Date
charitha
1bcea7cc1b Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group 2016-11-25 14:22:00 +05:30
WSO2 Builder
8431b30ddc [maven-release-plugin] prepare for next development iteration 2016-11-25 08:06:30 +00:00
WSO2 Builder
ae2e283f14 [maven-release-plugin] prepare release v2.0.1 2016-11-25 07:43:34 +00:00
charitha
726bbcd35d Merged with upstream 2016-11-23 13:51:50 +05:30
charitha
c07d77b85d Updated group sharing model 2016-11-22 21:13:18 +05:30
ayyoob
fede8ec409 few changes after testing with authoriser 2016-11-21 19:13:59 +05:30
ayyoob
fe263efe60 changed device access verification approach 2016-11-20 02:37:37 +05:30
WSO2 Builder
19c1b3566d [maven-release-plugin] prepare for next development iteration 2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8 [maven-release-plugin] prepare release v2.0.0 2016-11-16 12:16:25 +00:00
sinthuja
a8b5c92698 Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0 2016-11-16 14:50:39 +05:30
sinthuja
bb5ebd7b4d changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS. 2016-11-16 14:48:00 +05:30
charitha
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +05:30
Ace
5eaca0b1b1 merging with upstream 2016-11-04 20:09:01 +05:30
Ace
2aa1c98d0b bringing common features to cdmf 2016-11-04 19:12:06 +05:30
ayyoob
202e0d5619 merged with origin 2016-11-02 09:44:49 +05:30
ayyoob
33bb9b5a14 merged with IoTS-1.0.0 branch 2016-11-02 06:51:28 +05:30
sinthuja
bc84ff85ea Changing the default port of publishing to 7612. 2016-11-01 19:46:57 +05:30
sinthuja
8767dd9b44 Adding missing dependency jersey core with device mgt. 2016-11-01 18:32:27 +05:30
charitha
ac30e7eb3e Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
#	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
 2016-11-01 14:47:21 +05:30
WSO2 Builder
9517a3d30f [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9 [maven-release-plugin] prepare release v1.2.6 2016-10-31 10:32:11 +00:00
charitha
5f68953b11 Merge branch 'master' into IoTS-1.0.0 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
 2016-10-25 14:22:44 +05:30
ayyoob
e3ef66aa1a added deployer feature 2016-10-22 22:36:38 +05:30
WSO2 Builder
27a2c9b979 [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c [maven-release-plugin] prepare release v1.2.5 2016-10-18 12:09:16 +00:00
WSO2 Builder
6a55e1be83 [maven-release-plugin] prepare for next development iteration 2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61 [maven-release-plugin] prepare release v1.2.4 2016-10-17 14:13:25 +00:00
hasuniea
2128f08658 fixing EMM-1750 2016-10-13 10:00:08 +05:30
hasuniea
fa972fbf36 adding platform ios to cdm-config.xml 2016-10-11 16:55:40 +05:30
hasuniea
799beb3c59 removing ios platform entry from cdm-config.xml 2016-10-11 13:52:46 +05:30
charitha
670ca7c228 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
 2016-10-10 15:29:10 +05:30
harshanl
45e584a064 Fixed arithmetic overflow issue in MSSQL 2016-10-10 14:46:05 +05:30
ayyoob
92d30eaadc config update 2016-10-09 22:47:17 +05:30
ayyoob
5727886ea1 few changes after apimgt integration 2016-10-09 03:16:02 +05:30
hasuniea
05e95e2675 fix the EMM-1702 2016-10-07 15:48:43 +05:30
charitha
e89b4015b6 Introduced pagination 2016-10-06 11:51:54 +05:30
harshanl
ee97631eac Updated MSSQL scripts to have IF-NOT-EXISTS statements 2016-10-03 12:16:01 +05:30
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
dilanua
fea2170f65 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-29 14:07:04 +05:30
Harshan Liyanage
cd06637546 Merge pull request #364 from Megala21/master 
Correcting the problem related with oracle syntax
 2016-09-29 14:06:49 +05:30
dilanua
acae51d756 Fixing MSSQL dashboard create view script issues 2016-09-29 14:06:44 +05:30
charitha
e6c4053135 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-29 11:12:52 +05:30
charitha
da0977bd85 Fix SQL error when could happen due to large response payloads 2016-09-29 11:12:28 +05:30
Megala
47d6268c9e Correcting the problem related with oracle syntax 2016-09-29 01:43:33 +05:30
Megala
82be4ef5a8 Fixing oracle script issues 2016-09-28 15:15:24 +05:30
amalhub
428ce25b6f Fixing issue: https://wso2.org/jira/browse/EMM-1646 2016-09-27 20:46:00 +05:30
Ruwan
0c92f80e68 Merge pull request #361 from ruwany/carbon-kernel-4.4.7 
Migrating kernel/apim/appm/identity to latest versions
 2016-09-23 17:04:18 +05:30
harshanl
9b6973226c EMM-1609 : Changed postgres and oracle db scripts to support boolean data 2016-09-23 11:29:58 +05:30
harshanl
5a6120d6fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-22 20:31:14 +05:30
harshanl
a6ee98cb7f Increased notification description column size 2016-09-22 20:31:09 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
 2016-09-22 19:08:21 +05:30
Ace
f4d6eb6898 Upgrading jscep and other fixes 2016-09-22 08:24:58 +05:30
dilanua
87f4939ba5 Updating MSSQL script with dasboard analytics views 2016-09-21 15:05:45 +05:30
Ace
9548bdc263 Fixing dependency related issues 2016-09-21 12:56:40 +05:30
Ace
099ffd6a74 Updating velocity dependencies to OSGI enabled bundle version 2016-09-20 10:38:39 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
harshanl
7dc93ff010 MSSQL script fixes and added the /users/count REST API 2016-09-09 15:06:30 +05:30
harshanl
d60daae97f MSSQL fixes to dbscrpits and DAO layer 2016-09-09 12:15:51 +05:30
harshanl
2e17dce0ae Fixed DM_DEVICE column issue in MSSQL scrpt 2016-09-07 16:19:50 +05:30
harshanl
b7ffaf0b0f Fixed issues in DAO implementations and MSSQL db script 2016-09-07 15:01:09 +05:30
harshanl
60a7796efb Fixed issues in DB scripts 2016-09-06 18:53:04 +05:30
prabathabey
99ff4cbc10 Improving MSSQL SQL scripts of CDM-F and removing a redundant table declaration found in H2 SQL Script 2016-09-05 23:43:24 +05:30
mharindu
24930b3042 Partial commit of migration 2016-09-05 16:37:09 +05:30
Rasika Perera
8148b5b06c Separating CDMF base app and uuf-template app 2016-09-01 16:28:05 +05:30
hasuniea
d1e058ce8e fixing api-mgt upgrading issues 2016-08-26 17:40:30 +05:30
mharindu
d7e8cc30dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7 2016-08-24 14:56:06 +05:30
harshanl
556c82b2e8 Fixed ORACLE DB script issue 2016-08-23 17:59:52 +05:30
Chatura Dilan Perera
8b17cbb339 Fix conflicts 2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938 [maven-release-plugin] prepare for next development iteration 2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667 [maven-release-plugin] prepare release v1.1.2 2016-08-18 22:09:33 +05:30
charitha
d0cb80273b Add indexing to mysql 2016-08-18 11:41:15 +05:30
harshanl
6bb924fa7b Removed unnecessary mysql query from the mysl script 2016-08-12 13:53:32 +05:30
mharindu
f5609cc8ff Adding carbon 4.4.7 migration changes 2016-08-11 12:19:05 +05:30
prabathabey
c161d7b659 Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities 2016-08-10 15:01:11 +05:30
harshanl
ffc9628ae1 Fixed merge issue 2016-08-10 13:14:13 +05:30
harshanl
e25aa26e1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 12:07:49 +05:30
prabathabey
b28ed6803e Adding Indexes upon tables that involve in expensive SQL operations 2016-08-10 11:26:07 +05:30
prabathabey
b4479e92ba Adding Indexes upon tables that involve in expensive SQL operations 2016-08-10 11:25:08 +05:30
harshanl
f82ce82648 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 11:14:53 +05:30
harshanl
08ff70bb3c Refactored CertMgt component 2016-08-10 11:14:46 +05:30
mharindu
886e2e08f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-08 18:49:40 +05:30
madhawap
d2ad852db1 changes to certificate-mgt mysql dbscript, fix for the jira EMM-1487 2016-08-05 12:16:59 +05:30
madhawap
682b5f81e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-05 12:06:20 +05:30
madhawap
ccae64c374 changes to certificate-mgt mssql dbscript 2016-08-05 12:05:55 +05:30
harshanl
35ea88b9de Fixed EMM-1476. 2016-08-04 20:39:31 +05:30
madhawap
32fb410da4 mysql db script related changes 2016-08-04 18:15:45 +05:30
mharindu
eb5216091e Fixed conflicts and merged 2016-08-03 12:36:56 +05:30
harshanl
03835bdeb7 Fixed EMM-1449 issue 2016-08-02 17:40:20 +05:30
harshanl
6cc1bb088c Fixed EMM-1447, EMM-1424 2016-08-01 20:29:21 +05:30
mharindu
4dc0e23f8d Added license file to features 2016-07-29 12:44:51 +05:30
mharindu
84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-29 12:39:05 +05:30
Milan Perera
c49dc435e1 Merge pull request #319 from ayyoob/transport 
Updated grant type implementation
 2016-07-28 14:14:03 +05:30
prabathabey
5adfab9f8a Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API 2016-07-26 23:37:42 +05:30
mharindu
564c2b280e Fixed conflicts and merged 2016-07-26 16:38:51 +05:30
prabathabey
ea032337d3 Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range 2016-07-26 11:30:28 +05:30
ayyoob
8eb29a77cc adding device-mgt-scopes config 2016-07-25 11:46:45 +05:30
hasuniea
74658d1e85 adding certificate scripts 2016-07-22 11:42:55 +05:30
Chatura Dilan
4ec11e8c08 [maven-release-plugin] prepare for next development iteration 2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543 [maven-release-plugin] prepare release v1.1.1 2016-07-08 19:09:55 +05:30
prabathabey
9aa54f2ead Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information 2016-07-07 13:10:19 +05:30
Chatura Dilan
2befefc967 Added OS build date 2016-07-01 15:45:59 +05:30
prabathabey
49ce42b797 Code cleanup 2016-06-30 18:19:11 +05:30
Chatura Dilan
24b462f4f4 Added is-active field to the Application 2016-06-29 17:41:45 +05:30
Ruwan
6ce7f8c65a Merge pull request #307 from ayyoob/transport 
Few changes added after testing with the cluster
 2016-06-27 09:39:17 +05:30
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +05:30
prabathabey
aeb4ad3295 Merging rest-api-improvements branch to master 2016-06-21 15:52:35 +05:30
ayyoob
ebebca8573 Added support for push notification for xmpp, mqtt and few changes to the after testing 2016-06-20 02:33:59 +05:30
ayyoob
1373e995fb added support to load device type configuration in base ui 2016-06-17 17:21:39 +05:30
hasuniea
220a34faa9 renamed scep feature 2016-06-10 10:04:52 +05:30
ayyoob
52e84273d1 added profile check before publishing apis 2016-06-08 22:38:49 +05:30
prabathabey
8819c6e36b Adding support for 'If-Modified-Since' header and 'since' query filter 2016-06-03 04:35:22 +05:30
prabathabey
d65174d026 making the certificate management war adhere the REST API guidelines 2016-05-31 16:27:35 +05:30
hasuniea
57d445237a add certificateMgtService 2016-05-31 12:48:26 +05:30
prabathabey
13db7c906f changing the webapp name of cdmf admin APIs 2016-05-30 12:08:22 +05:30
prabathabey
6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services 2016-05-30 08:21:59 +05:30
dilanua
f4f47cbfdd Changing view names to fix oracle naming issues in dashboard analytics feature 2016-05-28 00:41:21 +05:30
Madhawa Perera
4b128a6ebd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-27 22:15:53 +05:30
Madhawa Perera
d805245ffc added username field to the device certificate db and related changes 2016-05-27 22:15:21 +05:30
Hasunie
981db24ca8 Merge pull request #279 from hasuniea/master 
add certificate feature
 2016-05-27 19:48:49 +05:30
hasuniea
271170c26e refactored cert feature 2016-05-27 18:42:24 +05:30
prabathabey
32cb32b706 modifying the name of the device management admin api war 2016-05-27 12:28:48 +05:30
prabathabey
30f6fc53b5 Merging the latest changes introduced in master 2016-05-27 11:44:58 +05:30
prabathabey
7e3865a233 Fixing admin webapp path in p2.inf 2016-05-27 10:55:47 +05:30
geethkokila
f29cacffff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-26 18:23:40 +05:30
geethkokila
6365e5a8a9 Fixing activity the activity id 2016-05-26 18:23:29 +05:30
hasuniea
ad7fa09e32 add certificate service 2016-05-26 18:11:07 +05:30
Dileesha Rajapakse
8821227de2 Fixed Oracle driver related syntax issues and table names 2016-05-26 17:15:35 +05:30
hasuniea
c281b6a6f0 SCEP csr sign feature 2016-05-25 18:14:28 +05:30
hasuniea
7281abf876 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 18:11:29 +05:30
GPrathap
c9c0a75430 added a bundleDef :net.minidev:json-smart 2016-05-25 14:39:59 +05:30
hasuniea
ad1a4cbd6a fixed code conflicts 2016-05-25 13:51:46 +05:30
hasuniea
e2e517d7ca SCEP endpoint 2016-05-25 13:44:42 +05:30
mharindu
3e291c5b13 [maven-release-plugin] prepare for next development iteration 2016-05-20 16:43:16 +05:30
mharindu
9549ac446b [maven-release-plugin] prepare release v1.1.0 2016-05-20 16:43:02 +05:30
mharindu
968cb00f35 Fixed conflicts and merged 2016-05-19 00:42:14 +05:30
prabathabey
a375252a94 Adding pluggable push notification framework 2016-05-19 00:20:45 +05:30
mharindu
bca1b4b059 Fixed conflicts 2016-05-18 22:01:38 +05:30
dilanua
7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature 2016-05-18 18:48:43 +05:30
mharindu
d08f691886 Fixed issue in webapp-publisher-config.xml 2016-05-17 12:30:05 +05:30
mharindu
5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-17 12:25:57 +05:30
mharindu
16a8f61f79 Refactored jwt authenticator 2016-05-17 08:48:55 +05:30
charitha
25cff47335 Moved email templates to emm base plugin as they are related to emm 2016-05-16 21:11:31 +05:30
mharindu
9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-16 11:55:35 +05:30
mharindu
f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:46:30 +05:30
charitha
0a838923cb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/api/Group.java
 2016-05-13 12:43:53 +05:30
geethkokila
362cf40d85 Fixing the operation activity id issues 2016-05-13 00:25:13 +05:30
mharindu
fd39b31369 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-12 22:00:24 +05:30
mharindu
1f21144668 Renamed EMM permission to CDMF 2016-05-12 22:00:15 +05:30
ayyoob
42dde2c8eb updated property 2016-05-12 19:17:31 +05:30
ayyoob
df473e4284 revert back 2016-05-12 13:49:32 +05:30
ayyoob
34f1f4dfe2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport 2016-05-12 13:41:08 +05:30
charitha
18957b0110 Add required jagerry modules for the app 2016-05-11 19:30:55 +05:30
dilanua
e151bca0c7 Adding device-identification attribute for database views in dashboard analytics feature 2016-05-11 16:25:00 +05:30
dilanua
754195bee6 Adding mssql support to dashboard analytics feature 2016-05-11 12:01:39 +05:30
Dilan U. Ariyaratne
c9eed309aa Merge pull request #238 from dilee/master 
Fixed errors in MSSQL DB script
 2016-05-11 11:08:14 +05:30
Dileesha Rajapakse
e055519d4c Fixed errors in MSSQL DB script 2016-05-11 11:02:43 +05:30
mharindu
b58e2b13c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-11 10:50:46 +05:30
mharindu
5ad8d2938e Fixed issues of publishing APIs to synapse gateway 2016-05-11 10:50:32 +05:30
dilanua
adec59e934 Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature 2016-05-10 15:26:20 +05:30
Dileesha Rajapakse
cb5736854a Fixed issues in Oracle DB script 2016-05-10 14:58:02 +05:30
Dileesha Rajapakse
de08e96646 Fixed errors in PostgreSQL script 2016-05-09 14:35:45 +05:30
dilanua
13c5fe3d1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-09 12:33:34 +05:30
dilanua
0ab4035b37 Adding H2, MySQL Support for dashboard analytics feature 2016-05-09 12:33:11 +05:30
Kasun Delgolla
4cb7b86f4c Fixing SQL errors 2016-05-09 12:20:43 +05:30
ayyoob
c165156dcd remove imports 2016-05-09 01:05:08 +05:30
ayyoob
5f302fce63 removed unused code and resolved host issues 2016-05-04 01:19:56 +05:30
geethkokila
e4b400a5e7 Disabling device analytics publishing by default 2016-05-02 10:45:10 +05:30
geethkokila
3396a5066d Adding changes for the updated time of device info and device location 2016-04-29 22:30:07 +05:30
geethkokila
5a77e08fd5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 17:57:05 +05:30
dilanua
2a55c50ad1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 13:58:58 +05:30
dilanua
2b62eac4f5 Adding temporary development code bits for dashboard analytics feature 2016-04-27 13:58:53 +05:30
geethkokila
4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6 Adding the changes for the device group with policy. 2016-04-27 10:26:47 +05:30
prabathabey
95d3b97c5f Code cleanup 2016-04-26 15:59:22 +05:30
geethkokila
f1aeb1a846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-24 08:38:28 +05:30
geethkokila
37e431d6a0 Adding the h2.sql for resolving conflicts 2016-04-24 08:33:57 +05:30
dilanua
274aa0ecd3 Adding temporary development code bits for cdmf-product dashboard feature 2016-04-22 10:48:42 +05:30
dilanua
a888cf39c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-04-21 13:32:58 +05:30
Prabath Abeysekara
8ced6cf38e Merge pull request #211 from charithag/master 
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
 2016-04-19 13:36:37 +05:30
charithag
516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins 2016-04-18 16:39:35 +05:30
ayyoob
afe965e787 adding code review changes on JWT and API App registration 2016-04-14 19:55:55 +05:30
dilanua
c7af1a1e23 Adding temporary development code bits of dashboard analytics feature 2016-04-08 15:22:36 +05:30
dilanua
ce8d4b53a2 Adding temporary development code bits of dashboard analytics feature 2016-04-08 15:10:01 +05:30
Kasun Delgolla
4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes 2016-04-07 10:42:56 +05:30
geethkokila
7318502697 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-31 18:07:55 +05:30
geethkokila
e60a383f4d Adding fixes to the device search 2016-03-31 18:07:05 +05:30
ayyoob
1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name 2016-03-31 04:24:30 +05:30
ayyoob
562ced1be7 Added api application extension feature 2016-03-31 00:10:40 +05:30
ayyoob
7632d4e929 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest 2016-03-30 22:03:48 +05:30
inosh-perera
41ba2f4f0a adding database changes 2016-03-30 19:08:42 +05:30
ayyoob
81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype 
merge device type
 2016-03-30 12:20:02 +05:30
charithag
0a8e00fd1e Merged with upstream and resolved conflicts. 2016-03-30 02:00:47 +05:30
charithag
3e4ccf6337 Add missing features and component from IoTS-1.0.0-M4 2016-03-30 01:44:04 +05:30
geethkokila
888971ae39 Fixing the oracl and postgres sql datasources and removing the start and end from the search context 2016-03-29 22:46:09 +05:30
geethkokila
aa63b5f592 Fixing the application memory usage and adding location based search 2016-03-29 17:48:36 +05:30
charithag
fa2f61f48a Add missing parts in group management 2016-03-29 12:41:38 +05:30
ayyoob
c45895685b Added device type multi tenancy capability. 2016-03-29 11:40:58 +05:30
prabathabey
38f3b037eb Code cleanup 2016-03-27 21:17:33 +05:30
prabathabey
099613da73 Merging device.mgt.ui features 2016-03-27 17:29:26 +05:30
prabathabey
e9954dab4b merging device.mgt.ui feature 2016-03-27 17:11:31 +05:30
prabathabey
284ca1b8e8 Removing obsolete source structures 2016-03-27 16:08:22 +05:30
prabathabey
43926b64b4 Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher 2016-03-27 13:01:26 +05:30
prabathabey
5dcd9dfe4a Merging device analytics feature impl to master 2016-03-27 00:23:37 +05:30
geethkokila
e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0 2016-03-24 11:41:52 +05:30
geethkokila
3a3df04331 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-03-21 10:33:49 +05:30
geethkokila
41191d6df0 Adding the search feature to device mgt plugin 2016-03-21 10:33:35 +05:30
inosh-perera
ef117ffa74 adding mutual SLL authentication and certificate management DAOs 2016-03-17 14:14:59 +05:30
geethkokila
7a809c1c01 Doing a partial commit 2016-03-14 11:48:43 +05:30
prabathabey
3726a57d96 Making email-sender a separate component and code cleanup 2016-03-13 00:51:54 +05:30
prabathabey
3772d54ea1 Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution 2016-03-12 16:07:08 +05:30
prabathabey
0b31042aa2 More improvements to the email sending functionality 2016-03-12 15:42:08 +05:30
geethkokila
e0e0a57c11 [maven-release-plugin] prepare for next development iteration 2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712 [maven-release-plugin] prepare release v1.0.3 2016-01-05 18:15:28 +05:30
Dileesha Rajapakse
edec1452b2 Fixed EMM-1171 2016-01-05 14:16:36 +05:30
geethkokila
e66d291947 [maven-release-plugin] prepare for next development iteration 2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75 [maven-release-plugin] prepare release v1.0.2 2015-12-30 14:18:57 +05:30
geethkokila
185a59fbd4 [maven-release-plugin] prepare for next development iteration 2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b [maven-release-plugin] prepare release v1.0.1 2015-12-23 22:39:20 +05:30
geethkokila
4e9255fbc9 [maven-release-plugin] prepare for next development iteration 2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34 [maven-release-plugin] prepare release v1.0.0 2015-12-22 08:28:33 +05:30
prabathabey
30cd44a7fb Fixing name of the BSTAuthenticator 2015-12-22 03:48:21 +05:30
prabathabey
ed8242fc66 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 20:22:14 +05:30
prabathabey
a7b447b7db Adding BST authenticator 2015-12-21 20:21:51 +05:30
pasinduj
8628e5e523 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 15:03:46 +05:30
harshanl
42a8df75e6 Changed default oauth validator type to local 2015-12-21 15:01:18 +05:30
pasinduj
c7b53f7110 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 14:44:23 +05:30
prabathabey
67e1bfb012 Making attribute names schema compliant and code cleanup 2015-12-21 12:23:59 +05:30
prabathabey
0cdc139a0b Adding updated webapp authenticator config 2015-12-21 11:57:50 +05:30
pasinduj
08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-21 09:37:21 +05:30
prabathabey
337afa5da2 Revert "Further optimizing webapp authenticator valve implementation" 
This reverts commit 262e53ddcc.
 2015-12-19 13:27:45 +05:30
prabathabey
262e53ddcc Further optimizing webapp authenticator valve implementation 2015-12-19 13:09:31 +05:30
Dileesha Rajapakse
9e5891a728 Fixed EMM-1116 2015-12-18 15:34:50 +05:30
pasinduj
9a50455a29 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-14 08:57:36 +05:30
harshanl
00cf61c44c Fixed EMM-1069 and refactore DCR services 2015-12-11 20:04:22 +05:30
pasinduj
7be1de1b85 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-11 11:30:41 +05:30
harshanl
08ebd7f881 Added DCR proxy endpoint & refactored code. 2015-12-11 11:10:53 +05:30
pasinduj
5ac2447080 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-10 17:00:35 +05:30
pasinduj
bb010bde28 modified oracle db script to remove a foriegn key 2015-12-10 16:59:03 +05:30
Dileesha Rajapakse
96366de4dd Fixed syntax errors in sequence creation 2015-12-10 15:30:17 +05:30
pasinduj
4656a9eae7 modified all dbscripts removing a foriegn key 2015-12-10 11:43:44 +05:30
pasinduj
6e94a084a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2015-12-09 10:18:10 +05:30
pasinduj
6ed2710550 revert mysql edited lines 2015-12-09 10:15:43 +05:30