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 |