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
|
9 years ago |
madhawap
|
682b5f81e0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
madhawap
|
ccae64c374
|
changes to certificate-mgt mssql dbscript
|
9 years ago |
harshanl
|
35ea88b9de
|
Fixed EMM-1476.
|
9 years ago |
madhawap
|
32fb410da4
|
mysql db script related changes
|
9 years ago |
mharindu
|
eb5216091e
|
Fixed conflicts and merged
|
9 years ago |
harshanl
|
03835bdeb7
|
Fixed EMM-1449 issue
|
9 years ago |
harshanl
|
6cc1bb088c
|
Fixed EMM-1447, EMM-1424
|
9 years ago |
mharindu
|
4dc0e23f8d
|
Added license file to features
|
9 years ago |
mharindu
|
84090fb16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
9 years ago |
Milan Perera
|
c49dc435e1
|
Merge pull request #319 from ayyoob/transport
Updated grant type implementation
|
9 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
|
9 years ago |
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
9 years ago |
prabathabey
|
ea032337d3
|
Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range
|
9 years ago |
ayyoob
|
8eb29a77cc
|
adding device-mgt-scopes config
|
9 years ago |
hasuniea
|
74658d1e85
|
adding certificate scripts
|
9 years ago |
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
9 years ago |
prabathabey
|
9aa54f2ead
|
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
|
9 years ago |
Chatura Dilan
|
2befefc967
|
Added OS build date
|
9 years ago |
prabathabey
|
49ce42b797
|
Code cleanup
|
9 years ago |
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
9 years ago |
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
9 years ago |
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
9 years ago |
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
9 years ago |
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
9 years ago |
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
9 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 |