Commit Graph

666 Commits (886eaec271644361a493eb68d28b9f416eb29424)

Author SHA1 Message Date
Harshan Liyanage e686b2af0e Resolved merge conflicts
8 years ago
WSO2 Builder d433525145 [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
8 years ago
WSO2 Builder 35ee3eca3a [WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
8 years ago
sameera910409 33132b1f8e refactor code for firebase cloud messaging
8 years ago
WSO2 Builder 4e0afb7d39 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
8 years ago
WSO2 Builder 33f1448c82 [WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
8 years ago
WSO2 Builder e95e96f06c [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
8 years ago
WSO2 Builder 5d55413e02 [WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
8 years ago
Susinda Perera bd7d6939e5 Merge pull request #628 from susinda/master
8 years ago
WSO2 Builder ae3300afde [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
8 years ago
WSO2 Builder 6646c0c56f [WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
8 years ago
Susinda Perera 7c9659ed29 Merge pull request #1 from susinda/cloud-3.1.0
8 years ago
WSO2 Builder 21cdcdd21a [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
8 years ago
WSO2 Builder 23be60ebd0 [WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
8 years ago
ayyoob 964fb7ce72 regenerated swagger api based on apimgt 2.1.0 rest api
8 years ago
Susinda 09b74211c4 increment carbon-devicemgt version to 2.0.20
8 years ago
WSO2 Builder 7f98d37835 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare for next development iteration
8 years ago
WSO2 Builder b03936ca49 [WSO2 Release] [Jenkins #2122] [Release 2.0.19] prepare release v2.0.19
8 years ago
WSO2 Builder 82888e1d20 [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare for next development iteration
8 years ago
WSO2 Builder b11c2e451b [WSO2 Release] [Jenkins #2109] [Release 2.0.18] prepare release v2.0.18
8 years ago
WSO2 Builder 67a091ff5a [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare for next development iteration
8 years ago
WSO2 Builder dcc2088455 [WSO2 Release] [Jenkins #2094] [Release 2.0.17] prepare release v2.0.17
8 years ago
WSO2 Builder 927b2d451d [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare for next development iteration
8 years ago
WSO2 Builder dfe9b1ff9c [WSO2 Release] [Jenkins #2092] [Release 2.0.16] prepare release v2.0.16
8 years ago
ayyoob ed7b67dd24 made it accept tenant domain as parameter
8 years ago
ayyoob 274d3e9aeb used jwt grant type instead of saml
8 years ago
Kamidu Sachith Punchihewa 559fe98cc9 Merge pull request #585 from wso2/master
8 years ago
WSO2 Builder 54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration
8 years ago
WSO2 Builder 3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15
8 years ago
WSO2 Builder 1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration
8 years ago
WSO2 Builder 1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14
8 years ago
Milan Perera 701d6e4522 Updated the snapshot version of intergration client
8 years ago
Milan Perera a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud
8 years ago
ayyoob 38f61adf94 few changes after testing multi tenancy
8 years ago
WSO2 Builder 5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration
8 years ago
WSO2 Builder c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13
8 years ago
WSO2 Builder c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration
8 years ago
WSO2 Builder 14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12
8 years ago
Milan Perera 2b4a3cde61 Fixed conflicts and merged
8 years ago
Milan Perera 21d8d14b7e Fixed multy tenancy issues related to android device type
8 years ago
ayyoob 159e067fed changed integration client version
8 years ago
ayyoob b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y
8 years ago
WSO2 Builder cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration
8 years ago
WSO2 Builder abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11
8 years ago
ayyoob 7348ae2f2a resolved merge issues
8 years ago
ayyoob 3423ef025d merged with upstream
8 years ago
ayyoob e74b4e23c4 removed apim dependency from cdmf
8 years ago
WSO2 Builder 002fb8719b [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 04f32902fd [maven-release-plugin] prepare release v2.0.10
8 years ago
WSO2 Builder 5c207897ad [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 233d14edbd [maven-release-plugin] prepare release v2.0.9
8 years ago
Rasika Perera 04ffa1eb8a Merge pull request #565 from Vishanth/release-2.0.x
8 years ago
Vishanth e98af24f29 fixing dm_profile constraint issue
8 years ago
WSO2 Builder eedecf00ed [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder ef57fc463b [maven-release-plugin] prepare release v2.0.8
8 years ago
ayyoob 5927064435 apim seperation
8 years ago
Vishanth f45528147c fixing sql scripts to support multi tenancy
8 years ago
WSO2 Builder 585b9bde4d [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder d206148841 [maven-release-plugin] prepare release v2.0.7
8 years ago
ayyoob 2fbaf31b93 fixed permission and assigned environment variables for url context
8 years ago
ayyoob de957bec29 few changes after testing the cluster
8 years ago
ayyoob b35e0dd2fa added missing components
8 years ago
WSO2 Builder 5411d93103 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3ea83b925a [maven-release-plugin] prepare release v2.0.6
8 years ago
geethkokila 44c7383b15 Adding support to send ios request the synapse gateway
8 years ago
geethkokila 65cb12b5ac Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
WSO2 Builder 6aea6195e9 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 3db5b289ac [maven-release-plugin] prepare release v2.0.5
8 years ago
WSO2 Builder ed47094964 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8d409a7248 [maven-release-plugin] prepare release v2.0.4
8 years ago
Ace 674048ab27 Coorecting version import ranges
8 years ago
Ruwan 46c3b015fa Merge pull request #498 from charithag/release-2.0.x-email-invites
8 years ago
charitha 2b1d46f45f Finalized enrollment invitations
8 years ago
Ace 64da9479a1 Bumping identity dependencies
8 years ago
charitha 795ccb740c Add backend support for enrollment invitations
8 years ago
Supun94 a831dc6a9a Changing cdm-config file
8 years ago
Supun94 2751d4b856 Code refactoring
8 years ago
Supun94 eb1575126f Minor refactoring on policy merging
8 years ago
Supun94 02fb952cc0 Minor refactoring on policy decision point
8 years ago
Supun94 35f3fcc8f9 Changed policy evaluation point
8 years ago
Supun94 936e71a743 Adding configurations for different policy evaluation service components
8 years ago
Supun94 367fa927b0 Changed policy decision point package structure
8 years ago
geethkokila 8ca28fa1fd Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into mutual_ssl_feature
8 years ago
geethkokila 23dc0e62ab Partial commit
8 years ago
Rasika Perera 1465c56822 Revert "[WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4"
8 years ago
Ace 47d8baccf7 upgrading to latest version of identity
8 years ago
WSO2 Builder f9b6939cb7 [WSO2 Release] [Jenkins #61] [Release 2.0.4] prepare release v2.0.4
8 years ago
Rasika Perera 42930fe8c4 Revert "[WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4"
8 years ago
WSO2 Builder 78b9052c37 [WSO2 Release] [Jenkins #55] [Release 2.0.4] prepare release v2.0.4
8 years ago
Vishanth ebc896ccd4 removing the device type from constraint to support multi tenancy since it is not unique
8 years ago
WSO2 Builder a59edee410 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 8f9b21b41b [maven-release-plugin] prepare release v2.0.3
8 years ago
charitha 78dfddbbed Merge branch 'merge-master' of https://github.com/geethkokila/carbon-device-mgt into release-2.0.x
8 years ago
madhawap b889f6e384 adding separate tasks for each device type
8 years ago
geethkokila d911281ad1 Merging master branch with release-2.0.x
8 years ago
WSO2 Builder 228b24ca79 [maven-release-plugin] prepare for next development iteration
8 years ago
WSO2 Builder 5dbb258f55 [maven-release-plugin] prepare release v2.0.2
8 years ago
Chatura Dilan 82d865b104 Merge pull request #453 from madhawap/release-2.0.x
8 years ago
charitha 265b6248ef Add email templates
8 years ago
madhawap bec4ae681d Seperate out task operations
8 years ago
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
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
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
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
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
8 years ago
harshanl 9b6973226c EMM-1609 : Changed postgres and oracle db scripts to support boolean data
8 years ago