WSO2 Builder
|
48a8f43cb3
|
[WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare release v2.0.46
|
2017-04-21 15:30:57 +05:30 |
|
WSO2 Builder
|
16d97d62be
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare for next development iteration
|
2017-04-20 14:41:55 +05:30 |
|
WSO2 Builder
|
8891784b99
|
[WSO2 Release] [Jenkins #2229] [Release 2.0.45] prepare release v2.0.45
|
2017-04-20 14:41:41 +05:30 |
|
ayyoob
|
ea6afee772
|
added device properties to a single table
|
2017-04-19 21:04:56 +05:30 |
|
WSO2 Builder
|
f7d1a7cf99
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare for next development iteration
|
2017-04-18 10:40:31 +05:30 |
|
WSO2 Builder
|
4b85af950c
|
[WSO2 Release] [Jenkins #2225] [Release 2.0.44] prepare release v2.0.44
|
2017-04-18 10:40:22 +05:30 |
|
WSO2 Builder
|
b9e614e383
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare for next development iteration
|
2017-04-17 16:39:50 +05:30 |
|
WSO2 Builder
|
d37951ef3f
|
[WSO2 Release] [Jenkins #2222] [Release 2.0.43] prepare release v2.0.43
|
2017-04-17 16:39:37 +05:30 |
|
WSO2 Builder
|
fc15f43b31
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare for next development iteration
|
2017-04-07 14:07:15 +05:30 |
|
WSO2 Builder
|
27b84bfc22
|
[WSO2 Release] [Jenkins #2210] [Release 2.0.42] prepare release v2.0.42
|
2017-04-07 14:07:01 +05:30 |
|
WSO2 Builder
|
5496159f9d
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare for next development iteration
|
2017-04-05 11:58:36 +05:30 |
|
WSO2 Builder
|
ef94e90366
|
[WSO2 Release] [Jenkins #2206] [Release 2.0.41] prepare release v2.0.41
|
2017-04-05 11:58:23 +05:30 |
|
WSO2 Builder
|
a826370019
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare for next development iteration
|
2017-04-05 09:37:06 +05:30 |
|
WSO2 Builder
|
4654a4db45
|
[WSO2 Release] [Jenkins #2204] [Release 2.0.40] prepare release v2.0.40
|
2017-04-05 09:36:53 +05:30 |
|
WSO2 Builder
|
8b7e458592
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare for next development iteration
|
2017-04-04 18:08:44 +05:30 |
|
WSO2 Builder
|
6297993560
|
[WSO2 Release] [Jenkins #2201] [Release 2.0.39] prepare release v2.0.39
|
2017-04-04 18:08:31 +05:30 |
|
WSO2 Builder
|
802c83de39
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare for next development iteration
|
2017-03-29 23:16:15 +05:30 |
|
WSO2 Builder
|
98dda03784
|
[WSO2 Release] [Jenkins #2193] [Release 2.0.38] prepare release v2.0.38
|
2017-03-29 23:16:04 +05:30 |
|
WSO2 Builder
|
f3e119cd78
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare for next development iteration
|
2017-03-28 12:48:31 +05:30 |
|
WSO2 Builder
|
a8f8a49a80
|
[WSO2 Release] [Jenkins #2190] [Release 2.0.37] prepare release v2.0.37
|
2017-03-28 12:48:20 +05:30 |
|
WSO2 Builder
|
0e5895ec78
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare for next development iteration
|
2017-03-24 12:06:23 +05:30 |
|
WSO2 Builder
|
d6080159cb
|
[WSO2 Release] [Jenkins #2183] [Release 2.0.36] prepare release v2.0.36
|
2017-03-24 12:06:12 +05:30 |
|
WSO2 Builder
|
3f8f8b3ab9
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare for next development iteration
|
2017-03-23 18:59:18 +05:30 |
|
WSO2 Builder
|
6a9a5ba9c8
|
[WSO2 Release] [Jenkins #2180] [Release 2.0.35] prepare release v2.0.35
|
2017-03-23 18:59:07 +05:30 |
|
WSO2 Builder
|
e8ee33e7a4
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare for next development iteration
|
2017-03-22 15:24:27 +05:30 |
|
WSO2 Builder
|
6cc898d2ab
|
[WSO2 Release] [Jenkins #2177] [Release 2.0.34] prepare release v2.0.34
|
2017-03-22 15:24:16 +05:30 |
|
WSO2 Builder
|
a26a4bb539
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare for next development iteration
|
2017-03-22 14:25:54 +05:30 |
|
WSO2 Builder
|
000601911f
|
[WSO2 Release] [Jenkins #2175] [Release 2.0.33] prepare release v2.0.33
|
2017-03-22 14:25:43 +05:30 |
|
WSO2 Builder
|
50c9eb9ba4
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare for next development iteration
|
2017-03-21 20:02:26 +05:30 |
|
WSO2 Builder
|
ca79804c5c
|
[WSO2 Release] [Jenkins #2172] [Release 2.0.32] prepare release v2.0.32
|
2017-03-21 20:02:14 +05:30 |
|
WSO2 Builder
|
a35205c480
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare for next development iteration
|
2017-03-20 16:49:31 +05:30 |
|
WSO2 Builder
|
ac379c9bf9
|
[WSO2 Release] [Jenkins #2169] [Release 2.0.31] prepare release v2.0.31
|
2017-03-20 16:49:20 +05:30 |
|
WSO2 Builder
|
de25f3afe3
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare for next development iteration
|
2017-03-16 16:59:42 +05:30 |
|
WSO2 Builder
|
55ecafe7f4
|
[WSO2 Release] [Jenkins #2163] [Release 2.0.30] prepare release v2.0.30
|
2017-03-16 16:59:28 +05:30 |
|
WSO2 Builder
|
15d57f71ad
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare for next development iteration
|
2017-03-16 11:10:29 +05:30 |
|
WSO2 Builder
|
3af9e1729a
|
[WSO2 Release] [Jenkins #2161] [Release 2.0.29] prepare release v2.0.29
|
2017-03-16 11:10:11 +05:30 |
|
WSO2 Builder
|
322f39596e
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare for next development iteration
|
2017-03-15 18:46:16 +05:30 |
|
WSO2 Builder
|
18244d6c96
|
[WSO2 Release] [Jenkins #2158] [Release 2.0.28] prepare release v2.0.28
|
2017-03-15 18:46:03 +05:30 |
|
WSO2 Builder
|
12f21868dc
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare for next development iteration
|
2017-03-15 18:04:26 +05:30 |
|
WSO2 Builder
|
4328c3c39d
|
[WSO2 Release] [Jenkins #2157] [Release 2.0.27] prepare release v2.0.27
|
2017-03-15 18:04:12 +05:30 |
|
WSO2 Builder
|
c6bb8e0128
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare for next development iteration
|
2017-03-14 17:47:54 +05:30 |
|
WSO2 Builder
|
da9002ba9f
|
[WSO2 Release] [Jenkins #2154] [Release 2.0.26] prepare release v2.0.26
|
2017-03-14 17:47:43 +05:30 |
|
WSO2 Builder
|
6114f4b2d5
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare for next development iteration
|
2017-03-14 15:27:06 +05:30 |
|
WSO2 Builder
|
ea8f19f26d
|
[WSO2 Release] [Jenkins #2152] [Release 2.0.25] prepare release v2.0.25
|
2017-03-14 15:26:55 +05:30 |
|
Harshan Liyanage
|
e686b2af0e
|
Resolved merge conflicts
|
2017-03-14 14:54:48 +05:30 |
|
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 |
|
harshanl
|
a6ee98cb7f
|
Increased notification description column size
|
2016-09-22 20:31:09 +05:30 |
|
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
|
2016-09-22 19:08:21 +05:30 |
|
Ace
|
f4d6eb6898
|
Upgrading jscep and other fixes
|
2016-09-22 08:24:58 +05:30 |
|
dilanua
|
87f4939ba5
|
Updating MSSQL script with dasboard analytics views
|
2016-09-21 15:05:45 +05:30 |
|
Ace
|
9548bdc263
|
Fixing dependency related issues
|
2016-09-21 12:56:40 +05:30 |
|
Ace
|
099ffd6a74
|
Updating velocity dependencies to OSGI enabled bundle version
|
2016-09-20 10:38:39 +05:30 |
|
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-19 18:54:48 +05:30 |
|
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
2016-09-19 18:54:38 +05:30 |
|
Ace
|
6a8a5cbd5a
|
Merging with master
|
2016-09-19 12:21:41 +05:30 |
|
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
2016-09-14 17:23:09 +05:30 |
|
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-09 20:18:25 +05:30 |
|
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
2016-09-09 20:18:12 +05:30 |
|
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
2016-09-09 17:10:19 +05:30 |
|
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
2016-09-09 17:10:04 +05:30 |
|
harshanl
|
7dc93ff010
|
MSSQL script fixes and added the /users/count REST API
|
2016-09-09 15:06:30 +05:30 |
|
harshanl
|
d60daae97f
|
MSSQL fixes to dbscrpits and DAO layer
|
2016-09-09 12:15:51 +05:30 |
|
harshanl
|
2e17dce0ae
|
Fixed DM_DEVICE column issue in MSSQL scrpt
|
2016-09-07 16:19:50 +05:30 |
|
harshanl
|
b7ffaf0b0f
|
Fixed issues in DAO implementations and MSSQL db script
|
2016-09-07 15:01:09 +05:30 |
|
harshanl
|
60a7796efb
|
Fixed issues in DB scripts
|
2016-09-06 18:53:04 +05:30 |
|
prabathabey
|
99ff4cbc10
|
Improving MSSQL SQL scripts of CDM-F and removing a redundant table declaration found in H2 SQL Script
|
2016-09-05 23:43:24 +05:30 |
|
mharindu
|
24930b3042
|
Partial commit of migration
|
2016-09-05 16:37:09 +05:30 |
|
Rasika Perera
|
8148b5b06c
|
Separating CDMF base app and uuf-template app
|
2016-09-01 16:28:05 +05:30 |
|
hasuniea
|
d1e058ce8e
|
fixing api-mgt upgrading issues
|
2016-08-26 17:40:30 +05:30 |
|
mharindu
|
d7e8cc30dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
|
2016-08-24 14:56:06 +05:30 |
|
harshanl
|
556c82b2e8
|
Fixed ORACLE DB script issue
|
2016-08-23 17:59:52 +05:30 |
|
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
2016-08-19 15:00:57 +05:30 |
|
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
2016-08-18 22:09:42 +05:30 |
|
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
2016-08-18 22:09:33 +05:30 |
|
charitha
|
d0cb80273b
|
Add indexing to mysql
|
2016-08-18 11:41:15 +05:30 |
|
harshanl
|
6bb924fa7b
|
Removed unnecessary mysql query from the mysl script
|
2016-08-12 13:53:32 +05:30 |
|
mharindu
|
f5609cc8ff
|
Adding carbon 4.4.7 migration changes
|
2016-08-11 12:19:05 +05:30 |
|
prabathabey
|
c161d7b659
|
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
|
2016-08-10 15:01:11 +05:30 |
|
harshanl
|
ffc9628ae1
|
Fixed merge issue
|
2016-08-10 13:14:13 +05:30 |
|
harshanl
|
e25aa26e1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-08-10 12:07:49 +05:30 |
|
prabathabey
|
b28ed6803e
|
Adding Indexes upon tables that involve in expensive SQL operations
|
2016-08-10 11:26:07 +05:30 |
|
prabathabey
|
b4479e92ba
|
Adding Indexes upon tables that involve in expensive SQL operations
|
2016-08-10 11:25:08 +05:30 |
|
harshanl
|
f82ce82648
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-08-10 11:14:53 +05:30 |
|
harshanl
|
08ff70bb3c
|
Refactored CertMgt component
|
2016-08-10 11:14:46 +05:30 |
|
mharindu
|
886e2e08f2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
2016-08-08 18:49:40 +05:30 |
|
madhawap
|
d2ad852db1
|
changes to certificate-mgt mysql dbscript, fix for the jira EMM-1487
|
2016-08-05 12:16:59 +05:30 |
|
madhawap
|
682b5f81e0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-08-05 12:06:20 +05:30 |
|
madhawap
|
ccae64c374
|
changes to certificate-mgt mssql dbscript
|
2016-08-05 12:05:55 +05:30 |
|
harshanl
|
35ea88b9de
|
Fixed EMM-1476.
|
2016-08-04 20:39:31 +05:30 |
|
madhawap
|
32fb410da4
|
mysql db script related changes
|
2016-08-04 18:15:45 +05:30 |
|
mharindu
|
eb5216091e
|
Fixed conflicts and merged
|
2016-08-03 12:36:56 +05:30 |
|
harshanl
|
03835bdeb7
|
Fixed EMM-1449 issue
|
2016-08-02 17:40:20 +05:30 |
|
harshanl
|
6cc1bb088c
|
Fixed EMM-1447, EMM-1424
|
2016-08-01 20:29:21 +05:30 |
|
mharindu
|
4dc0e23f8d
|
Added license file to features
|
2016-07-29 12:44:51 +05:30 |
|
mharindu
|
84090fb16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
2016-07-29 12:39:05 +05:30 |
|
Milan Perera
|
c49dc435e1
|
Merge pull request #319 from ayyoob/transport
Updated grant type implementation
|
2016-07-28 14:14:03 +05:30 |
|
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
|
2016-07-26 23:37:42 +05:30 |
|
mharindu
|
564c2b280e
|
Fixed conflicts and merged
|
2016-07-26 16:38:51 +05:30 |
|
prabathabey
|
ea032337d3
|
Changing Kernel version that carbon-device-mgt repository depends on and fixing the axiom version range
|
2016-07-26 11:30:28 +05:30 |
|
ayyoob
|
8eb29a77cc
|
adding device-mgt-scopes config
|
2016-07-25 11:46:45 +05:30 |
|
hasuniea
|
74658d1e85
|
adding certificate scripts
|
2016-07-22 11:42:55 +05:30 |
|
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
2016-07-08 19:11:40 +05:30 |
|
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
2016-07-08 19:09:55 +05:30 |
|
prabathabey
|
9aa54f2ead
|
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
|
2016-07-07 13:10:19 +05:30 |
|
Chatura Dilan
|
2befefc967
|
Added OS build date
|
2016-07-01 15:45:59 +05:30 |
|
prabathabey
|
49ce42b797
|
Code cleanup
|
2016-06-30 18:19:11 +05:30 |
|
Chatura Dilan
|
24b462f4f4
|
Added is-active field to the Application
|
2016-06-29 17:41:45 +05:30 |
|
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
2016-06-27 09:39:17 +05:30 |
|
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
2016-06-27 00:12:46 +05:30 |
|
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
2016-06-21 15:52:35 +05:30 |
|
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
2016-06-20 02:33:59 +05:30 |
|
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
2016-06-17 17:21:39 +05:30 |
|
hasuniea
|
220a34faa9
|
renamed scep feature
|
2016-06-10 10:04:52 +05:30 |
|
ayyoob
|
52e84273d1
|
added profile check before publishing apis
|
2016-06-08 22:38:49 +05:30 |
|
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
2016-06-03 04:35:22 +05:30 |
|
prabathabey
|
d65174d026
|
making the certificate management war adhere the REST API guidelines
|
2016-05-31 16:27:35 +05:30 |
|
hasuniea
|
57d445237a
|
add certificateMgtService
|
2016-05-31 12:48:26 +05:30 |
|
prabathabey
|
13db7c906f
|
changing the webapp name of cdmf admin APIs
|
2016-05-30 12:08:22 +05:30 |
|
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
2016-05-30 08:21:59 +05:30 |
|
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
2016-05-28 00:41:21 +05:30 |
|
Madhawa Perera
|
4b128a6ebd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-27 22:15:53 +05:30 |
|
Madhawa Perera
|
d805245ffc
|
added username field to the device certificate db and related changes
|
2016-05-27 22:15:21 +05:30 |
|
Hasunie
|
981db24ca8
|
Merge pull request #279 from hasuniea/master
add certificate feature
|
2016-05-27 19:48:49 +05:30 |
|
hasuniea
|
271170c26e
|
refactored cert feature
|
2016-05-27 18:42:24 +05:30 |
|
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
2016-05-27 12:28:48 +05:30 |
|
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
2016-05-27 11:44:58 +05:30 |
|
prabathabey
|
7e3865a233
|
Fixing admin webapp path in p2.inf
|
2016-05-27 10:55:47 +05:30 |
|
geethkokila
|
f29cacffff
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-26 18:23:40 +05:30 |
|
geethkokila
|
6365e5a8a9
|
Fixing activity the activity id
|
2016-05-26 18:23:29 +05:30 |
|
hasuniea
|
ad7fa09e32
|
add certificate service
|
2016-05-26 18:11:07 +05:30 |
|
Dileesha Rajapakse
|
8821227de2
|
Fixed Oracle driver related syntax issues and table names
|
2016-05-26 17:15:35 +05:30 |
|
hasuniea
|
c281b6a6f0
|
SCEP csr sign feature
|
2016-05-25 18:14:28 +05:30 |
|
hasuniea
|
7281abf876
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 18:11:29 +05:30 |
|
GPrathap
|
c9c0a75430
|
added a bundleDef :net.minidev:json-smart
|
2016-05-25 14:39:59 +05:30 |
|
hasuniea
|
ad1a4cbd6a
|
fixed code conflicts
|
2016-05-25 13:51:46 +05:30 |
|
hasuniea
|
e2e517d7ca
|
SCEP endpoint
|
2016-05-25 13:44:42 +05:30 |
|
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 16:43:16 +05:30 |
|
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
2016-05-20 16:43:02 +05:30 |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
2016-05-19 00:42:14 +05:30 |
|
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
2016-05-19 00:20:45 +05:30 |
|
mharindu
|
bca1b4b059
|
Fixed conflicts
|
2016-05-18 22:01:38 +05:30 |
|
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
2016-05-18 18:48:43 +05:30 |
|
mharindu
|
d08f691886
|
Fixed issue in webapp-publisher-config.xml
|
2016-05-17 12:30:05 +05:30 |
|
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-17 12:25:57 +05:30 |
|
mharindu
|
16a8f61f79
|
Refactored jwt authenticator
|
2016-05-17 08:48:55 +05:30 |
|
charitha
|
25cff47335
|
Moved email templates to emm base plugin as they are related to emm
|
2016-05-16 21:11:31 +05:30 |
|
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-16 11:55:35 +05:30 |
|
mharindu
|
f2ac5c5cad
|
Implemented extended scope validator and improved webapp publisher to support Synapse
|
2016-05-16 11:46:30 +05:30 |
|
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
|
2016-05-13 12:43:53 +05:30 |
|
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
2016-05-13 00:25:13 +05:30 |
|
mharindu
|
fd39b31369
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-12 22:00:24 +05:30 |
|
mharindu
|
1f21144668
|
Renamed EMM permission to CDMF
|
2016-05-12 22:00:15 +05:30 |
|
ayyoob
|
42dde2c8eb
|
updated property
|
2016-05-12 19:17:31 +05:30 |
|
ayyoob
|
df473e4284
|
revert back
|
2016-05-12 13:49:32 +05:30 |
|
ayyoob
|
34f1f4dfe2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
|
2016-05-12 13:41:08 +05:30 |
|
charitha
|
18957b0110
|
Add required jagerry modules for the app
|
2016-05-11 19:30:55 +05:30 |
|
dilanua
|
e151bca0c7
|
Adding device-identification attribute for database views in dashboard analytics feature
|
2016-05-11 16:25:00 +05:30 |
|
dilanua
|
754195bee6
|
Adding mssql support to dashboard analytics feature
|
2016-05-11 12:01:39 +05:30 |
|
Dilan U. Ariyaratne
|
c9eed309aa
|
Merge pull request #238 from dilee/master
Fixed errors in MSSQL DB script
|
2016-05-11 11:08:14 +05:30 |
|
Dileesha Rajapakse
|
e055519d4c
|
Fixed errors in MSSQL DB script
|
2016-05-11 11:02:43 +05:30 |
|
mharindu
|
b58e2b13c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-11 10:50:46 +05:30 |
|
mharindu
|
5ad8d2938e
|
Fixed issues of publishing APIs to synapse gateway
|
2016-05-11 10:50:32 +05:30 |
|
dilanua
|
adec59e934
|
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
|
2016-05-10 15:26:20 +05:30 |
|
Dileesha Rajapakse
|
cb5736854a
|
Fixed issues in Oracle DB script
|
2016-05-10 14:58:02 +05:30 |
|
Dileesha Rajapakse
|
de08e96646
|
Fixed errors in PostgreSQL script
|
2016-05-09 14:35:45 +05:30 |
|
dilanua
|
13c5fe3d1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-09 12:33:34 +05:30 |
|
dilanua
|
0ab4035b37
|
Adding H2, MySQL Support for dashboard analytics feature
|
2016-05-09 12:33:11 +05:30 |
|
Kasun Delgolla
|
4cb7b86f4c
|
Fixing SQL errors
|
2016-05-09 12:20:43 +05:30 |
|
ayyoob
|
c165156dcd
|
remove imports
|
2016-05-09 01:05:08 +05:30 |
|
ayyoob
|
5f302fce63
|
removed unused code and resolved host issues
|
2016-05-04 01:19:56 +05:30 |
|
geethkokila
|
e4b400a5e7
|
Disabling device analytics publishing by default
|
2016-05-02 10:45:10 +05:30 |
|
geethkokila
|
3396a5066d
|
Adding changes for the updated time of device info and device location
|
2016-04-29 22:30:07 +05:30 |
|
geethkokila
|
5a77e08fd5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 17:57:05 +05:30 |
|
dilanua
|
2a55c50ad1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 13:58:58 +05:30 |
|
dilanua
|
2b62eac4f5
|
Adding temporary development code bits for dashboard analytics feature
|
2016-04-27 13:58:53 +05:30 |
|
geethkokila
|
4029c86da4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 10:26:51 +05:30 |
|
geethkokila
|
2fb42518b6
|
Adding the changes for the device group with policy.
|
2016-04-27 10:26:47 +05:30 |
|
prabathabey
|
95d3b97c5f
|
Code cleanup
|
2016-04-26 15:59:22 +05:30 |
|
geethkokila
|
f1aeb1a846
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-24 08:38:28 +05:30 |
|
geethkokila
|
37e431d6a0
|
Adding the h2.sql for resolving conflicts
|
2016-04-24 08:33:57 +05:30 |
|
dilanua
|
274aa0ecd3
|
Adding temporary development code bits for cdmf-product dashboard feature
|
2016-04-22 10:48:42 +05:30 |
|
dilanua
|
a888cf39c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-21 13:32:58 +05:30 |
|
Prabath Abeysekara
|
8ced6cf38e
|
Merge pull request #211 from charithag/master
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
2016-04-19 13:36:37 +05:30 |
|
charithag
|
516155dae5
|
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
2016-04-18 16:39:35 +05:30 |
|
ayyoob
|
afe965e787
|
adding code review changes on JWT and API App registration
|
2016-04-14 19:55:55 +05:30 |
|
dilanua
|
c7af1a1e23
|
Adding temporary development code bits of dashboard analytics feature
|
2016-04-08 15:22:36 +05:30 |
|
dilanua
|
ce8d4b53a2
|
Adding temporary development code bits of dashboard analytics feature
|
2016-04-08 15:10:01 +05:30 |
|
Kasun Delgolla
|
4e57e5bc85
|
Committing restructuring mdm-admin + UI merging style fixes
|
2016-04-07 10:42:56 +05:30 |
|
geethkokila
|
7318502697
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-31 18:07:55 +05:30 |
|
geethkokila
|
e60a383f4d
|
Adding fixes to the device search
|
2016-03-31 18:07:05 +05:30 |
|
ayyoob
|
1b4a9227d8
|
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
|
2016-03-31 04:24:30 +05:30 |
|
ayyoob
|
562ced1be7
|
Added api application extension feature
|
2016-03-31 00:10:40 +05:30 |
|
ayyoob
|
7632d4e929
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
|
2016-03-30 22:03:48 +05:30 |
|
inosh-perera
|
41ba2f4f0a
|
adding database changes
|
2016-03-30 19:08:42 +05:30 |
|
ayyoob
|
81ae512f13
|
Merge pull request #6 from ayyoob/merge-devicetype
merge device type
|
2016-03-30 12:20:02 +05:30 |
|
charithag
|
0a8e00fd1e
|
Merged with upstream and resolved conflicts.
|
2016-03-30 02:00:47 +05:30 |
|
charithag
|
3e4ccf6337
|
Add missing features and component from IoTS-1.0.0-M4
|
2016-03-30 01:44:04 +05:30 |
|
geethkokila
|
888971ae39
|
Fixing the oracl and postgres sql datasources and removing the start and end from the search context
|
2016-03-29 22:46:09 +05:30 |
|
geethkokila
|
aa63b5f592
|
Fixing the application memory usage and adding location based search
|
2016-03-29 17:48:36 +05:30 |
|
charithag
|
fa2f61f48a
|
Add missing parts in group management
|
2016-03-29 12:41:38 +05:30 |
|
ayyoob
|
c45895685b
|
Added device type multi tenancy capability.
|
2016-03-29 11:40:58 +05:30 |
|