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