charitha
|
431ce58c65
|
Merge with release-2.0.x branch
|
8 years ago |
charitha
|
1bcea7cc1b
|
Move components with org.wso2.mdm group id to org.wso2.carbon.devicemgt group
|
8 years ago |
WSO2 Builder
|
8431b30ddc
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
ae2e283f14
|
[maven-release-plugin] prepare release v2.0.1
|
8 years ago |
charitha
|
726bbcd35d
|
Merged with upstream
|
8 years ago |
charitha
|
c07d77b85d
|
Updated group sharing model
|
8 years ago |
ayyoob
|
fede8ec409
|
few changes after testing with authoriser
|
8 years ago |
ayyoob
|
fe263efe60
|
changed device access verification approach
|
8 years ago |
WSO2 Builder
|
19c1b3566d
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
cff6e242c8
|
[maven-release-plugin] prepare release v2.0.0
|
8 years ago |
sinthuja
|
a8b5c92698
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt into IoTS-1.0.0
|
8 years ago |
sinthuja
|
bb5ebd7b4d
|
changing the expected kernel version to be 4.4.9 or higher as it's needed to be installed in DAS.
|
8 years ago |
charitha
|
a6064d2561
|
Update component versions for IoTS-1.0.0 release
|
8 years ago |
Ace
|
5eaca0b1b1
|
merging with upstream
|
8 years ago |
Ace
|
2aa1c98d0b
|
bringing common features to cdmf
|
8 years ago |
ayyoob
|
202e0d5619
|
merged with origin
|
8 years ago |
ayyoob
|
33bb9b5a14
|
merged with IoTS-1.0.0 branch
|
8 years ago |
sinthuja
|
bc84ff85ea
|
Changing the default port of publishing to 7612.
|
8 years ago |
sinthuja
|
8767dd9b44
|
Adding missing dependency jersey core with device mgt.
|
8 years ago |
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
|
8 years ago |
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
8 years ago |
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
|
8 years ago |
ayyoob
|
e3ef66aa1a
|
added deployer feature
|
8 years ago |
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
hasuniea
|
2128f08658
|
fixing EMM-1750
|
8 years ago |
hasuniea
|
fa972fbf36
|
adding platform ios to cdm-config.xml
|
8 years ago |
hasuniea
|
799beb3c59
|
removing ios platform entry from cdm-config.xml
|
8 years ago |
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
|
8 years ago |
harshanl
|
45e584a064
|
Fixed arithmetic overflow issue in MSSQL
|
8 years ago |
ayyoob
|
92d30eaadc
|
config update
|
8 years ago |
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
8 years ago |
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
8 years ago |
charitha
|
e89b4015b6
|
Introduced pagination
|
8 years ago |
harshanl
|
ee97631eac
|
Updated MSSQL scripts to have IF-NOT-EXISTS statements
|
8 years ago |
Chatura Dilan Perera
|
c16cc4cae1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
ed4bca7032
|
[maven-release-plugin] prepare release v1.2.2
|
8 years ago |
dilanua
|
fea2170f65
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Harshan Liyanage
|
cd06637546
|
Merge pull request #364 from Megala21/master
Correcting the problem related with oracle syntax
|
8 years ago |
dilanua
|
acae51d756
|
Fixing MSSQL dashboard create view script issues
|
8 years ago |
charitha
|
e6c4053135
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
charitha
|
da0977bd85
|
Fix SQL error when could happen due to large response payloads
|
8 years ago |
Megala
|
47d6268c9e
|
Correcting the problem related with oracle syntax
|
8 years ago |
Megala
|
82be4ef5a8
|
Fixing oracle script issues
|
8 years ago |
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
8 years ago |
Ruwan
|
0c92f80e68
|
Merge pull request #361 from ruwany/carbon-kernel-4.4.7
Migrating kernel/apim/appm/identity to latest versions
|
8 years ago |
harshanl
|
9b6973226c
|
EMM-1609 : Changed postgres and oracle db scripts to support boolean data
|
8 years ago |
harshanl
|
5a6120d6fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
a6ee98cb7f
|
Increased notification description column size
|
8 years ago |
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
|
8 years ago |
Ace
|
f4d6eb6898
|
Upgrading jscep and other fixes
|
8 years ago |
dilanua
|
87f4939ba5
|
Updating MSSQL script with dasboard analytics views
|
8 years ago |
Ace
|
9548bdc263
|
Fixing dependency related issues
|
8 years ago |
Ace
|
099ffd6a74
|
Updating velocity dependencies to OSGI enabled bundle version
|
8 years ago |
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
8 years ago |
Ace
|
6a8a5cbd5a
|
Merging with master
|
8 years ago |
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
8 years ago |
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
harshanl
|
7dc93ff010
|
MSSQL script fixes and added the /users/count REST API
|
8 years ago |
harshanl
|
d60daae97f
|
MSSQL fixes to dbscrpits and DAO layer
|
8 years ago |
harshanl
|
2e17dce0ae
|
Fixed DM_DEVICE column issue in MSSQL scrpt
|
8 years ago |
harshanl
|
b7ffaf0b0f
|
Fixed issues in DAO implementations and MSSQL db script
|
8 years ago |
harshanl
|
60a7796efb
|
Fixed issues in DB scripts
|
8 years ago |
prabathabey
|
99ff4cbc10
|
Improving MSSQL SQL scripts of CDM-F and removing a redundant table declaration found in H2 SQL Script
|
8 years ago |
mharindu
|
24930b3042
|
Partial commit of migration
|
8 years ago |
Rasika Perera
|
8148b5b06c
|
Separating CDMF base app and uuf-template app
|
8 years ago |
hasuniea
|
d1e058ce8e
|
fixing api-mgt upgrading issues
|
8 years ago |
mharindu
|
d7e8cc30dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
|
8 years ago |
harshanl
|
556c82b2e8
|
Fixed ORACLE DB script issue
|
8 years ago |
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
8 years ago |
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
8 years ago |
charitha
|
d0cb80273b
|
Add indexing to mysql
|
8 years ago |
harshanl
|
6bb924fa7b
|
Removed unnecessary mysql query from the mysl script
|
8 years ago |
mharindu
|
f5609cc8ff
|
Adding carbon 4.4.7 migration changes
|
8 years ago |
prabathabey
|
c161d7b659
|
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
|
8 years ago |
harshanl
|
ffc9628ae1
|
Fixed merge issue
|
8 years ago |
harshanl
|
e25aa26e1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
prabathabey
|
b28ed6803e
|
Adding Indexes upon tables that involve in expensive SQL operations
|
8 years ago |
prabathabey
|
b4479e92ba
|
Adding Indexes upon tables that involve in expensive SQL operations
|
8 years ago |
harshanl
|
f82ce82648
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
8 years ago |
mharindu
|
886e2e08f2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
8 years ago |
madhawap
|
d2ad852db1
|
changes to certificate-mgt mysql dbscript, fix for the jira EMM-1487
|
8 years ago |
madhawap
|
682b5f81e0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
madhawap
|
ccae64c374
|
changes to certificate-mgt mssql dbscript
|
8 years ago |
harshanl
|
35ea88b9de
|
Fixed EMM-1476.
|
8 years ago |
madhawap
|
32fb410da4
|
mysql db script related changes
|
8 years ago |
mharindu
|
eb5216091e
|
Fixed conflicts and merged
|
8 years ago |
harshanl
|
03835bdeb7
|
Fixed EMM-1449 issue
|
8 years ago |
harshanl
|
6cc1bb088c
|
Fixed EMM-1447, EMM-1424
|
8 years ago |
mharindu
|
4dc0e23f8d
|
Added license file to features
|
8 years ago |
mharindu
|
84090fb16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
8 years ago |
Milan Perera
|
c49dc435e1
|
Merge pull request #319 from ayyoob/transport
Updated grant type implementation
|
8 years ago |
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
|
8 years ago |
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
8 years ago |
prabathabey
|
ea032337d3
|
Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range
|
8 years ago |
ayyoob
|
8eb29a77cc
|
adding device-mgt-scopes config
|
8 years ago |
hasuniea
|
74658d1e85
|
adding certificate scripts
|
8 years ago |
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
8 years ago |
prabathabey
|
9aa54f2ead
|
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
|
8 years ago |
Chatura Dilan
|
2befefc967
|
Added OS build date
|
8 years ago |
prabathabey
|
49ce42b797
|
Code cleanup
|
8 years ago |
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
8 years ago |
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
8 years ago |
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
8 years ago |
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
8 years ago |
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
8 years ago |
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
8 years ago |
hasuniea
|
220a34faa9
|
renamed scep feature
|
9 years ago |
ayyoob
|
52e84273d1
|
added profile check before publishing apis
|
9 years ago |
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
9 years ago |
prabathabey
|
d65174d026
|
making the certificate management war adhere the REST API guidelines
|
9 years ago |
hasuniea
|
57d445237a
|
add certificateMgtService
|
9 years ago |
prabathabey
|
13db7c906f
|
changing the webapp name of cdmf admin APIs
|
9 years ago |
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
9 years ago |
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
9 years ago |
Madhawa Perera
|
4b128a6ebd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Madhawa Perera
|
d805245ffc
|
added username field to the device certificate db and related changes
|
9 years ago |
Hasunie
|
981db24ca8
|
Merge pull request #279 from hasuniea/master
add certificate feature
|
9 years ago |
hasuniea
|
271170c26e
|
refactored cert feature
|
9 years ago |
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
9 years ago |
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
prabathabey
|
7e3865a233
|
Fixing admin webapp path in p2.inf
|
9 years ago |
geethkokila
|
f29cacffff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
6365e5a8a9
|
Fixing activity the activity id
|
9 years ago |
hasuniea
|
ad7fa09e32
|
add certificate service
|
9 years ago |
Dileesha Rajapakse
|
8821227de2
|
Fixed Oracle driver related syntax issues and table names
|
9 years ago |
hasuniea
|
c281b6a6f0
|
SCEP csr sign feature
|
9 years ago |
hasuniea
|
7281abf876
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
GPrathap
|
c9c0a75430
|
added a bundleDef :net.minidev:json-smart
|
9 years ago |
hasuniea
|
ad1a4cbd6a
|
fixed code conflicts
|
9 years ago |
hasuniea
|
e2e517d7ca
|
SCEP endpoint
|
9 years ago |
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
9 years ago |
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
9 years ago |
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
9 years ago |
mharindu
|
bca1b4b059
|
Fixed conflicts
|
9 years ago |
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
9 years ago |
mharindu
|
d08f691886
|
Fixed issue in webapp-publisher-config.xml
|
9 years ago |
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
16a8f61f79
|
Refactored jwt authenticator
|
9 years ago |
charitha
|
25cff47335
|
Moved email templates to emm base plugin as they are related to emm
|
9 years ago |
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
f2ac5c5cad
|
Implemented extended scope validator and improved webapp publisher to support Synapse
|
9 years ago |
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
|
9 years ago |
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
9 years ago |
mharindu
|
fd39b31369
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
1f21144668
|
Renamed EMM permission to CDMF
|
9 years ago |
ayyoob
|
42dde2c8eb
|
updated property
|
9 years ago |
ayyoob
|
df473e4284
|
revert back
|
9 years ago |
ayyoob
|
34f1f4dfe2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
9 years ago |
charitha
|
18957b0110
|
Add required jagerry modules for the app
|
9 years ago |
dilanua
|
e151bca0c7
|
Adding device-identification attribute for database views in dashboard analytics feature
|
9 years ago |
dilanua
|
754195bee6
|
Adding mssql support to dashboard analytics feature
|
9 years ago |
Dilan U. Ariyaratne
|
c9eed309aa
|
Merge pull request #238 from dilee/master
Fixed errors in MSSQL DB script
|
9 years ago |
Dileesha Rajapakse
|
e055519d4c
|
Fixed errors in MSSQL DB script
|
9 years ago |
mharindu
|
b58e2b13c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
5ad8d2938e
|
Fixed issues of publishing APIs to synapse gateway
|
9 years ago |
dilanua
|
adec59e934
|
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
|
9 years ago |
Dileesha Rajapakse
|
cb5736854a
|
Fixed issues in Oracle DB script
|
9 years ago |
Dileesha Rajapakse
|
de08e96646
|
Fixed errors in PostgreSQL script
|
9 years ago |
dilanua
|
13c5fe3d1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
0ab4035b37
|
Adding H2, MySQL Support for dashboard analytics feature
|
9 years ago |
Kasun Delgolla
|
4cb7b86f4c
|
Fixing SQL errors
|
9 years ago |
ayyoob
|
c165156dcd
|
remove imports
|
9 years ago |
ayyoob
|
5f302fce63
|
removed unused code and resolved host issues
|
9 years ago |
geethkokila
|
e4b400a5e7
|
Disabling device analytics publishing by default
|
9 years ago |
geethkokila
|
3396a5066d
|
Adding changes for the updated time of device info and device location
|
9 years ago |
geethkokila
|
5a77e08fd5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
2a55c50ad1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
dilanua
|
2b62eac4f5
|
Adding temporary development code bits for dashboard analytics feature
|
9 years ago |
geethkokila
|
4029c86da4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
2fb42518b6
|
Adding the changes for the device group with policy.
|
9 years ago |
prabathabey
|
95d3b97c5f
|
Code cleanup
|
9 years ago |
geethkokila
|
f1aeb1a846
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
37e431d6a0
|
Adding the h2.sql for resolving conflicts
|
9 years ago |
dilanua
|
274aa0ecd3
|
Adding temporary development code bits for cdmf-product dashboard feature
|
9 years ago |
dilanua
|
a888cf39c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Prabath Abeysekara
|
8ced6cf38e
|
Merge pull request #211 from charithag/master
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
9 years ago |
charithag
|
516155dae5
|
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
9 years ago |
ayyoob
|
afe965e787
|
adding code review changes on JWT and API App registration
|
9 years ago |
dilanua
|
c7af1a1e23
|
Adding temporary development code bits of dashboard analytics feature
|
9 years ago |
dilanua
|
ce8d4b53a2
|
Adding temporary development code bits of dashboard analytics feature
|
9 years ago |
Kasun Delgolla
|
4e57e5bc85
|
Committing restructuring mdm-admin + UI merging style fixes
|
9 years ago |
geethkokila
|
7318502697
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
e60a383f4d
|
Adding fixes to the device search
|
9 years ago |
ayyoob
|
1b4a9227d8
|
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
|
9 years ago |
ayyoob
|
562ced1be7
|
Added api application extension feature
|
9 years ago |
ayyoob
|
7632d4e929
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
|
9 years ago |
inosh-perera
|
41ba2f4f0a
|
adding database changes
|
9 years ago |
ayyoob
|
81ae512f13
|
Merge pull request #6 from ayyoob/merge-devicetype
merge device type
|
9 years ago |
charithag
|
0a8e00fd1e
|
Merged with upstream and resolved conflicts.
|
9 years ago |
charithag
|
3e4ccf6337
|
Add missing features and component from IoTS-1.0.0-M4
|
9 years ago |
geethkokila
|
888971ae39
|
Fixing the oracl and postgres sql datasources and removing the start and end from the search context
|
9 years ago |
geethkokila
|
aa63b5f592
|
Fixing the application memory usage and adding location based search
|
9 years ago |
charithag
|
fa2f61f48a
|
Add missing parts in group management
|
9 years ago |
ayyoob
|
c45895685b
|
Added device type multi tenancy capability.
|
9 years ago |
prabathabey
|
38f3b037eb
|
Code cleanup
|
9 years ago |
prabathabey
|
099613da73
|
Merging device.mgt.ui features
|
9 years ago |
prabathabey
|
e9954dab4b
|
merging device.mgt.ui feature
|
9 years ago |
prabathabey
|
284ca1b8e8
|
Removing obsolete source structures
|
9 years ago |
prabathabey
|
43926b64b4
|
Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher
|
9 years ago |
prabathabey
|
5dcd9dfe4a
|
Merging device analytics feature impl to master
|
9 years ago |
geethkokila
|
e9da24c9e8
|
Changing the snapshot versions from 1.0.4 to 1.1.0
|
9 years ago |
geethkokila
|
3a3df04331
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
41191d6df0
|
Adding the search feature to device mgt plugin
|
9 years ago |
inosh-perera
|
ef117ffa74
|
adding mutual SLL authentication and certificate management DAOs
|
9 years ago |
geethkokila
|
7a809c1c01
|
Doing a partial commit
|
9 years ago |
prabathabey
|
3726a57d96
|
Making email-sender a separate component and code cleanup
|
9 years ago |
prabathabey
|
3772d54ea1
|
Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution
|
9 years ago |
prabathabey
|
0b31042aa2
|
More improvements to the email sending functionality
|
9 years ago |
geethkokila
|
e0e0a57c11
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
cebb88e712
|
[maven-release-plugin] prepare release v1.0.3
|
9 years ago |
Dileesha Rajapakse
|
edec1452b2
|
Fixed EMM-1171
|
9 years ago |
geethkokila
|
e66d291947
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
f416a73e75
|
[maven-release-plugin] prepare release v1.0.2
|
9 years ago |
geethkokila
|
185a59fbd4
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
b3580d754b
|
[maven-release-plugin] prepare release v1.0.1
|
9 years ago |
geethkokila
|
4e9255fbc9
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
geethkokila
|
ceb60adb34
|
[maven-release-plugin] prepare release v1.0.0
|
9 years ago |
prabathabey
|
30cd44a7fb
|
Fixing name of the BSTAuthenticator
|
9 years ago |
prabathabey
|
ed8242fc66
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
a7b447b7db
|
Adding BST authenticator
|
9 years ago |
pasinduj
|
8628e5e523
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
harshanl
|
42a8df75e6
|
Changed default oauth validator type to local
|
9 years ago |
pasinduj
|
c7b53f7110
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
67e1bfb012
|
Making attribute names schema compliant and code cleanup
|
9 years ago |
prabathabey
|
0cdc139a0b
|
Adding updated webapp authenticator config
|
9 years ago |
pasinduj
|
08387e178d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
337afa5da2
|
Revert "Further optimizing webapp authenticator valve implementation"
This reverts commit 262e53ddcc .
|
9 years ago |
prabathabey
|
262e53ddcc
|
Further optimizing webapp authenticator valve implementation
|
9 years ago |
Dileesha Rajapakse
|
9e5891a728
|
Fixed EMM-1116
|
9 years ago |
pasinduj
|
9a50455a29
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
harshanl
|
00cf61c44c
|
Fixed EMM-1069 and refactore DCR services
|
9 years ago |
pasinduj
|
7be1de1b85
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
harshanl
|
08ebd7f881
|
Added DCR proxy endpoint & refactored code.
|
9 years ago |
pasinduj
|
5ac2447080
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
pasinduj
|
bb010bde28
|
modified oracle db script to remove a foriegn key
|
9 years ago |
Dileesha Rajapakse
|
96366de4dd
|
Fixed syntax errors in sequence creation
|
9 years ago |
pasinduj
|
4656a9eae7
|
modified all dbscripts removing a foriegn key
|
9 years ago |
pasinduj
|
6e94a084a0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
pasinduj
|
6ed2710550
|
revert mysql edited lines
|
9 years ago |
pasinduj
|
1a7b888102
|
modified dbscript added missing comma
|
9 years ago |
pasinduj
|
f49f13501f
|
modified dbscripts removing policy ID forigen key from one table
|
9 years ago |
pasinduj
|
3154582abe
|
remove policy id foriegn key from one table
|
9 years ago |
pasinduj
|
a390df68ec
|
modified dbscripts to remove foriegn key reference
|
9 years ago |
Dileesha Rajapakse
|
799ece6b36
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
b3e2c856a9
|
Fixing the end point for invititaion
|
9 years ago |
Dileesha Rajapakse
|
699d92f7bd
|
Added DM_DEVICE_CERTIFICATE Table into SQL Scripts
|
9 years ago |
inosh-perera
|
d4403c6d87
|
adding new table to h2 script
|
9 years ago |
Kamidu Sachith
|
53064516d3
|
Fix for the Jira Issue EMM-989
|
9 years ago |
Kamidu Sachith
|
8573a284e0
|
Enable Domain name in the invitation main
|
9 years ago |
manoj
|
a04658af14
|
App Manager integration
|
9 years ago |
manoj
|
79c268cb41
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Dileesha Rajapakse
|
2a30a4a144
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Dileesha Rajapakse
|
767ea70436
|
Refactored CommandOperation DAO class
|
9 years ago |
geethkokila
|
5772ca4a35
|
Removing the unique key
|
9 years ago |
geethkokila
|
6b9dc0d6a5
|
Removing the unnessary unique key
|
9 years ago |
manoj
|
dbf8d13ced
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
manoj
|
20db31c2a9
|
Add app manager features
|
9 years ago |
Dileesha Rajapakse
|
6f0276ab2f
|
Modified Application Mapping DAO classes
|
9 years ago |
Dileesha Rajapakse
|
8c1d418e44
|
Refactored oracle DB script
|
9 years ago |
Dileesha Rajapakse
|
123ea228ad
|
Refactored Enrolment DAO class
|
9 years ago |
Dileesha Rajapakse
|
1975821446
|
Refactored Device and Application DAO classes
|
9 years ago |
harshanl
|
026a7c187a
|
Fixed EMM-945, EMM-910, EMM-911, EMM-870
|
9 years ago |
Dileesha Rajapakse
|
b7e4e90358
|
Refactored mssql DB script
|
9 years ago |
Dileesha Rajapakse
|
11c6b94368
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
30c53b7d14
|
Fixing the EMM-900, Ading the LB host name and port to the email url
|
9 years ago |
Dileesha Rajapakse
|
fca2e515b0
|
Refactored oracle DB script
|
9 years ago |
Dileesha Rajapakse
|
473c06f347
|
Refactored oracle DB script
|
9 years ago |
Dileesha Rajapakse
|
67ecf0daa0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
feab85796f
|
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
|
9 years ago |
Dileesha Rajapakse
|
d6a30daac1
|
Resolved merge conflicts
|
9 years ago |
mharindu
|
d2b8224f31
|
Changed the VARCHAR size of application identifier
|
9 years ago |
prabathabey
|
27f293b09f
|
Fixing merge conflicts
|
9 years ago |
prabathabey
|
5ec27d989f
|
Removing unnecessary INSERT statements found in device management schema
|
9 years ago |
Dileesha Rajapakse
|
aeb4455e2d
|
Fixed merge conflicts
|
9 years ago |
Dileesha Rajapakse
|
abe49b57d0
|
Refactored CDM sql scripts
|
9 years ago |
Dileesha Rajapakse
|
935455f700
|
Refactored postgresql.sql DB script
|
9 years ago |
prabathabey
|
fb3e7f4c33
|
Fixing issues encountered in CDM-F core database schema
|
9 years ago |
Dileesha Rajapakse
|
1b62efebc5
|
Renamed SQL Table 'DM_ENROLMENT_OPERATION_MAPPING' to 'DM_ENROLMENT_OP_MAPPING'
|
9 years ago |
Dileesha Rajapakse
|
13d9672b74
|
Fixed merge conflicts
|
9 years ago |
prabathabey
|
0282cff5b3
|
Adding missing auto_increment declaration in DEVICE_TYPE table config and script clean up
|
9 years ago |
Dileesha Rajapakse
|
86935ac16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
79cc441c71
|
Renaming postgres.sql to postgresql.sql
|
9 years ago |
Dileesha Rajapakse
|
ab969c7369
|
Refactored postgresql DB Script
|
9 years ago |
Dileesha Rajapakse
|
d7dc46d3a7
|
Refactored DB Scripts
|
9 years ago |
Dileesha Rajapakse
|
ac73155147
|
Refactored DB Scripts
|
9 years ago |
Dileesha Rajapakse
|
b55c5bc793
|
Refactored mysql DB Script
|
9 years ago |
Dileesha Rajapakse
|
323357d613
|
Refactored mysql DB Script
|
9 years ago |
harshanl
|
340a690995
|
Added sql script
|
9 years ago |
Kamidu Sachith
|
d5dcf44f27
|
Change the service registration
|
9 years ago |
geethkokila
|
d52df2474e
|
Fixing policy descriptions
|
9 years ago |
harshanl
|
648d8ec209
|
Added OAuth scope validator & fixed DataHolders
|
9 years ago |
harshanl
|
234cd47931
|
Added identity-extensions
|
9 years ago |
milanperera
|
126c2ec371
|
Implemented permission authorizing module
|
9 years ago |
milanperera
|
47ac0b1146
|
Fixed conflicts and merged local changes
|
9 years ago |
harshanl
|
b8720917e1
|
Added Dynamic-client-registration module
|
9 years ago |
milanperera
|
517039cccb
|
Partial commit
|
9 years ago |
Dilshan Edirisuriya
|
d17f1356e7
|
Certificate authenticator changes
|
9 years ago |
milanperera
|
3cb68355b4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
harshanl
|
9ae6099d2b
|
Fixed nitification table
|
9 years ago |
milanperera
|
8d38c37d53
|
Fixed conflicts and merged
|
9 years ago |
milanperera
|
23bb023686
|
Partial Commit for Permission Authorizer module
|
9 years ago |
harshanl
|
bbec523a47
|
Added notification mechanism
|
9 years ago |
mharindu
|
1903b375f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
prabathabey
|
46c5dba5c5
|
Improving web-app authenticator framework
|
9 years ago |
mharindu
|
fd29deb372
|
Fixed conflicts of local repo and merged
|
9 years ago |
Dilshan Edirisuriya
|
b391681438
|
Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Dilshan Edirisuriya
|
3d736d628e
|
adding conf file to touchpoint
|
9 years ago |
geethkokila
|
458618191d
|
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
|
9 years ago |
geethkokila
|
c673395ce6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Dilshan Edirisuriya
|
5a146ed907
|
POM changes
|
9 years ago |
Dilshan Edirisuriya
|
c547d85f35
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
c6d993e532
|
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
|
9 years ago |
Dilshan Edirisuriya
|
439e0dde6d
|
pom changes to adopt certificate component integrations
|
9 years ago |
Dilshan Edirisuriya
|
99d3745a9b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
Dilshan Edirisuriya
|
fd84190342
|
Adding certificate management components
|
9 years ago |
geethkokila
|
cada581396
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
12a2e1f11f
|
Partially commiting to fix update problem
|
9 years ago |
harshanl
|
ae03025546
|
Fixed syntax issues in sql scripts
|
9 years ago |
mharindu
|
8c748b3dfd
|
Removed unnecessary comments
|
9 years ago |
mharindu
|
8949992148
|
Fixed 204 issue in LicenseManager
|
9 years ago |
geethkokila
|
cceb3ac5db
|
Fixing errors and adding caching sketch
|
9 years ago |
geethkokila
|
90f8f4aab6
|
Adding test cases and fixing some logic issues and fixing the null pointer from the policy core
|
9 years ago |
geethkokila
|
b8462b02ac
|
Fixing the conflicts
|
9 years ago |
prabathabey
|
54cd6b80f4
|
Fixing merge conflicts
|
9 years ago |
prabathabey
|
955c119006
|
Adding policy delegation
|
9 years ago |
geethkokila
|
dc205aa081
|
Fixing the conflicts
|
9 years ago |
geethkokila
|
6d687364c6
|
Fixing the monitoring tasks
|
9 years ago |
milanperera
|
256880089e
|
Merged
|
9 years ago |
milanperera
|
f0ec3dbe4c
|
Fixed NPE issues in policy-mgt
|
9 years ago |
prabathabey
|
b298407160
|
Fixing improper parent configurations found in apimgt.extensions component and feature
|
9 years ago |
prabathabey
|
1716c2c7f6
|
Making apimgt extensions module a separate component/feature pair
|
9 years ago |
prabathabey
|
1a6526fc77
|
Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
|
9 years ago |
prabathabey
|
bfa1ea1875
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
milanperera
|
5b2e0c8989
|
Merged
|
9 years ago |
prabathabey
|
8fb37722ea
|
Fixing an invalid artifact id used in device management extensions pom
|
9 years ago |
geethkokila
|
fde54d2d32
|
Fixing the monitoring service
|
9 years ago |
prabathabey
|
2694b98883
|
Adding device management extension feature
|
9 years ago |
milanperera
|
5a8975d7ac
|
Partial Commit
|
9 years ago |
prabathabey
|
701228810b
|
Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
|
9 years ago |
harshanl
|
57299063b3
|
Added policy configuration to the cdm-config
|
9 years ago |
milanperera
|
5a42314855
|
Added dynamic-client-authentication-feature
|
9 years ago |
manoj
|
0e2e0fdd0e
|
Remove package attribute form Application
|
9 years ago |
manoj
|
cc5dd3baa6
|
Move add application list, get applist methods to applicationServiceProvider
|
9 years ago |
prabathabey
|
22bf894d45
|
Removing the redundant user-mgt component, which has been there as part of carbon-device-mgt repository
|
9 years ago |
manoj
|
82cbbef83b
|
Application list saving method and device operation response saving
|
9 years ago |
manoj
|
917c0cf965
|
Refractor Operations to handle Policy Operations and remove joins
|
10 years ago |
manoj
|
cfe9bd5f9f
|
Email format
|
10 years ago |
manoj
|
7364345a0f
|
Refractor API publish end points
|
10 years ago |
geethkokila
|
0638ec2357
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
geethkokila
|
548ce6873f
|
Changing the get effective policy method to store the policy as a operation, and adding ownership type to the policy database
|
10 years ago |
manoj
|
880c08885a
|
Add uninstall and install app end points to api publisher
|
10 years ago |
manoj
|
1bbaac168b
|
change devices API
|
10 years ago |
manoj
|
1d902cc724
|
correct end points by adding context
|
10 years ago |
geethkokila
|
1d180c1a1e
|
Adding the policy related new tables
|
10 years ago |
harshanl
|
db2065435b
|
Added getAllDevicesOfUser and getAllDevicesOfRole methods with user feature
|
10 years ago |
manoj
|
1b1b66fc29
|
Handle DB close within rollback transaction
|
10 years ago |
prabathabey
|
d5cafe843d
|
Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution
|
10 years ago |
prabathabey
|
afbf6a9bf8
|
Fixing issues related to webapp-authenticator-config.xml not getting copied into the MDM distribution
|
10 years ago |
prabathabey
|
d76501cf15
|
Fixing startup issues caused by not properly updating the Carbon-commons version in the parent pom of carbon-devicemgt repository
|
10 years ago |
geethkokila
|
73b185e1e6
|
Removing feature implementation from the policy, adding criteria based policy
|
10 years ago |
prabathabey
|
a4485af0c9
|
Completing JAX-RS authentication framework implementation
|
10 years ago |
manoj
|
4f4240f176
|
Operations Refractor
|
10 years ago |
manoj
|
d0b553d26a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
manoj
|
a46aff84fd
|
fetch command operation enable property
|
10 years ago |
DilanUA
|
aabe9afff5
|
Updated back-end email notification functionality
|
10 years ago |
manoj
|
382b876f7f
|
User Registration email
|
10 years ago |
manoj
|
20463cca57
|
User registration email configurations
|
10 years ago |
manoj
|
3fc11654e7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
manoj
|
41edb530bc
|
Refactor Operations
|
10 years ago |
Geeth Munasinghe
|
90ff502b21
|
Adding the final changes of the policy implementation, Added the simple policy evaluation implementation
|
10 years ago |
Dilshan Edirisuriya
|
bddf71f2de
|
Temporarily adding device type to the table
|
10 years ago |
manoj
|
1c80fcd124
|
Remove paylooad property from Operation
|
10 years ago |
manoj
|
4a9a27ab7e
|
Refactor operation DAO methods.Add connection close util method
|
10 years ago |
manoj
|
32b86c7ff1
|
ADD Operation Code to core operation table
|
10 years ago |
manoj
|
a32e811183
|
Update operation DAO implementation
|
10 years ago |
prabathabey
|
93b88828cc
|
Refactoring Device management related configuration file intialization process to associate appropriate schemas corresponding to each of the said configs
|
10 years ago |
Dilshan Edirisuriya
|
1f77183bb5
|
changing the foreign key command
|
10 years ago |
manoj
|
85b1d4c7d1
|
Add payload type to profile operation table
|
10 years ago |
prabathabey
|
53d6dcb8ef
|
Fixing build failures caused by an improper parent pom config
|
10 years ago |
inosh-perera
|
2002c92032
|
adding existing API check before publishing
|
10 years ago |
inosh-perera
|
d242b3ffe1
|
device list retrival url is added to api auto publishing
|
10 years ago |
inosh-perera
|
0565c63f2f
|
copying app manager config
|
10 years ago |
inosh-perera
|
504099a2c4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |
inosh-perera
|
4a061e7be2
|
adding App management integeration related code
|
10 years ago |
prabathabey
|
bcc1cad6e5
|
Merging Webapp authenticator framework implementation
|
10 years ago |
manoj
|
fee9fbad7d
|
Refactor Email Functionality
|
10 years ago |
manoj
|
55d57f6577
|
Refactor email functionality
|
10 years ago |
manoj
|
ee6c067398
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
10 years ago |