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
5,910 Commits 31 Branches 461 Tags 183 MiB
b652d025c8
Commit Graph

1179 Commits

Author SHA1 Message Date
WSO2 Builder
407fdf66da [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare for next development iteration 2017-07-06 15:02:03 +05:30
WSO2 Builder
ba0a0c4687 [WSO2 Release] [Jenkins #2430] [Release 3.0.22] prepare release v3.0.22 2017-07-06 15:01:52 +05:30
WSO2 Builder
1950126459 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare for next development iteration 2017-07-05 23:45:39 +05:30
WSO2 Builder
2388bd5f05 [WSO2 Release] [Jenkins #2427] [Release 3.0.21] prepare release v3.0.21 2017-07-05 23:45:24 +05:30
WSO2 Builder
f106a914bb [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare for next development iteration 2017-07-05 14:59:52 +05:30
WSO2 Builder
0cc8f902ae [WSO2 Release] [Jenkins #2425] [Release 3.0.20] prepare release v3.0.20 2017-07-05 14:59:38 +05:30
Rasika Perera
7079fea83b Merge pull request #826 from dunithd/master 
Making geo location data publishing disabled on the default pack.
 2017-07-05 11:04:33 +05:30
dunithd
47766a5c6a Making geo location data publishing disabled on the default pack. 2017-07-05 10:55:35 +05:30
WSO2 Builder
09bf240ff6 [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare for next development iteration 2017-07-04 19:13:38 +05:30
WSO2 Builder
3c63162f7a [WSO2 Release] [Jenkins #2422] [Release 3.0.19] prepare release v3.0.19 2017-07-04 19:13:23 +05:30
WSO2 Builder
e65f0b1afa [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare for next development iteration 2017-07-03 18:31:48 +05:30
WSO2 Builder
e1bbc9fe47 [WSO2 Release] [Jenkins #2419] [Release 3.0.18] prepare release v3.0.18 2017-07-03 18:31:35 +05:30
WSO2 Builder
7a02ecbe68 [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare for next development iteration 2017-07-01 12:47:09 +05:30
WSO2 Builder
5b32f7813a [WSO2 Release] [Jenkins #2415] [Release 3.0.17] prepare release v3.0.17 2017-07-01 12:46:54 +05:30
WSO2 Builder
c376208943 [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare for next development iteration 2017-06-30 17:44:28 +05:30
WSO2 Builder
5c013a3abd [WSO2 Release] [Jenkins #2413] [Release 3.0.16] prepare release v3.0.16 2017-06-30 17:44:14 +05:30
WSO2 Builder
cc13b1446e [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare for next development iteration 2017-06-30 15:46:09 +05:30
WSO2 Builder
08831cb9f4 [WSO2 Release] [Jenkins #2412] [Release 3.0.15] prepare release v3.0.15 2017-06-30 15:45:56 +05:30
WSO2 Builder
6330164676 [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare for next development iteration 2017-06-29 14:54:03 +05:30
WSO2 Builder
153fb3984e [WSO2 Release] [Jenkins #2409] [Release 3.0.14] prepare release v3.0.14 2017-06-29 14:53:50 +05:30
WSO2 Builder
fc41a165a8 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare for next development iteration 2017-06-28 19:26:16 +05:30
WSO2 Builder
7acd8e70c4 [WSO2 Release] [Jenkins #2406] [Release 3.0.13] prepare release v3.0.13 2017-06-28 19:26:02 +05:30
WSO2 Builder
cb078fbb0f [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare for next development iteration 2017-06-28 18:26:18 +05:30
WSO2 Builder
8e874b2ef0 [WSO2 Release] [Jenkins #2404] [Release 3.0.12] prepare release v3.0.12 2017-06-28 18:26:05 +05:30
Milan Perera
a60566a417 Removed DCR dependancies 2017-06-28 12:19:09 +05:30
Milan Perera
72a19085ad Removed DCR feature 2017-06-28 08:41:41 +05:30
Milan Perera
eb89aa4ff4 Removed DCR feature 2017-06-27 23:20:04 +05:30
WSO2 Builder
c03e1ec1d1 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare for next development iteration 2017-06-27 12:15:35 +05:30
WSO2 Builder
997affda65 [WSO2 Release] [Jenkins #2401] [Release 3.0.11] prepare release v3.0.11 2017-06-27 12:15:21 +05:30
WSO2 Builder
e23ef52e61 [maven-release-plugin]prepare for next development iteration 2017-06-23 20:27:17 +05:30
WSO2 Builder
c333f28461 [maven-release-plugin]prepare release v3.0.10 2017-06-23 20:27:03 +05:30
WSO2 Builder
27e494f153 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare for next development iteration 2017-06-23 17:22:32 +05:30
WSO2 Builder
21ab65e6d5 [WSO2 Release] [Jenkins #2393] [Release 3.0.9] prepare release v3.0.9 2017-06-23 17:22:20 +05:30
WSO2 Builder
54d25522ba [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare for next development iteration 2017-06-22 20:09:55 +05:30
WSO2 Builder
69b168f3b2 [WSO2 Release] [Jenkins #2390] [Release 3.0.8] prepare release v3.0.8 2017-06-22 20:09:41 +05:30
ayyoob
d70cea2e46 fixed commit issues 2017-06-22 19:29:04 +05:30
ayyoob
3a87c4bd41 mssql table updates 2017-06-22 05:47:24 +05:30
ayyoob
6c041c7b6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-22 04:34:45 +05:30
sinthuja
ee8f29503d Merge branch 'wso2-master' 2017-06-21 16:31:06 +05:30
sinthuja
8197547383 Fixing MSSQL related issues, and dbscript issues. 2017-06-21 16:30:19 +05:30
ayyoob
80cc690a42 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-21 04:11:40 +05:30
WSO2 Builder
68cb8d3f81 [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare for next development iteration 2017-06-20 22:37:58 +05:30
WSO2 Builder
d0f52c48ef [WSO2 Release] [Jenkins #2380] [Release 3.0.7] prepare release v3.0.7 2017-06-20 22:37:45 +05:30
ayyoob
3224f3a50c few changes in dbscript 2017-06-20 19:33:24 +05:30
WSO2 Builder
2896b55f5e [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare for next development iteration 2017-06-20 18:03:42 +05:30
WSO2 Builder
bdb57383b1 [WSO2 Release] [Jenkins #2378] [Release 3.0.6] prepare release v3.0.6 2017-06-20 18:03:28 +05:30
sinthuja
9398e7ee0b Merge branch 'wso2-master' 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractGroupDAOImpl.java
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationMappingDAOImpl.java
 2017-06-19 23:10:15 +05:30
sinthuja
124c0b4cf8 Fixing issues related to oracle database. 2017-06-19 23:05:05 +05:30
WSO2 Builder
8badc2bc37 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare for next development iteration 2017-06-19 17:23:13 +05:30
WSO2 Builder
43182aede9 [WSO2 Release] [Jenkins #2375] [Release 3.0.5] prepare release v3.0.5 2017-06-19 17:22:58 +05:30
WSO2 Builder
f70535ed20 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare for next development iteration 2017-06-19 16:22:55 +05:30
WSO2 Builder
c3d154ee65 [WSO2 Release] [Jenkins #2373] [Release 3.0.4] prepare release v3.0.4 2017-06-19 16:22:42 +05:30
ayyoob
3b7d4d8966 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-17 19:17:42 +05:30
ayyoob
f4605a5cfb disabling pullnotification in default pack 2017-06-17 19:00:10 +05:30
Ayyoob Hamza
2875fb2ca0 Merge pull request #755 from rasika/geo-fencing 
Added Geo Service into Device Mgt Core
 2017-06-17 12:20:10 +05:30
WSO2 Builder
e924a86d73 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare for next development iteration 2017-06-16 17:40:41 +05:30
WSO2 Builder
b35aaab992 [WSO2 Release] [Jenkins #2368] [Release 3.0.3] prepare release v3.0.3 2017-06-16 17:40:27 +05:30
Harshan Liyanage
d8b756df3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-16 16:48:30 +05:30
Harshan Liyanage
0c041c3556 Fixed issues in Postgre SQL script which resolves wso2/product-iots#494 2017-06-16 16:48:17 +05:30
Rasika Perera
8da1f62cd9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-16 15:50:45 +05:30
madhawap
b78a11d3d9 reformatting code 2017-06-16 13:16:29 +05:30
Rasika Perera
0cea35647f Removed location stream copy 2017-06-16 11:03:54 +05:30
WSO2 Builder
2b76317f40 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare for next development iteration 2017-06-16 11:00:40 +05:30
WSO2 Builder
02bc10e6d2 [WSO2 Release] [Jenkins #2366] [Release 3.0.2] prepare release v3.0.2 2017-06-16 11:00:26 +05:30
Supun94
df06953069 Adding MQTT pagination details 2017-06-16 10:50:47 +05:30
ayyoob
f47d0deb1a few changes after testing. 2017-06-16 03:48:08 +05:30
WSO2 Builder
1e58f762da [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare for next development iteration 2017-06-15 16:23:05 +05:30
WSO2 Builder
bae931f3c5 [WSO2 Release] [Jenkins #2365] [Release 3.0.1] prepare release v3.0.1 2017-06-15 16:22:51 +05:30
ayyoob
0d08c42f5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-15 09:48:00 +05:30
ayyoob
1600426951 updated tenant id 2017-06-15 09:47:24 +05:30
WSO2 Builder
69d2cff7bd [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare for next development iteration 2017-06-14 18:08:46 +05:30
WSO2 Builder
3795011895 [WSO2 Release] [Jenkins #2363] [Release 3.0.0] prepare release v3.0.0 2017-06-14 18:08:31 +05:30
ayyoob
07bdd5cb6c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-14 13:19:07 +05:30
ayyoob
da68f8fac1 fixed on config operation flow 2017-06-14 12:38:56 +05:30
Chatura Dilan
38b7689e28 Merge pull request #773 from harshanL/master 
Fixed java-doc comments issues and added comments to the configs.
 2017-06-14 12:35:39 +05:30
Harshan Liyanage
b510a422b4 Fixed java-doc comments issues and added comments to the configs. 2017-06-14 12:28:16 +05:30
Geeth
115ccb739a Merge pull request #765 from harshanL/master 
Added comments to the device status configs.
 2017-06-14 11:42:21 +05:30
Rasika Perera
798e551673 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-14 10:43:19 +05:30
WSO2 Builder
16420433b5 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare for next development iteration 2017-06-13 17:26:56 +05:30
WSO2 Builder
5c06b9dcb2 [WSO2 Release] [Jenkins #2352] [Release 2.0.75] prepare release v2.0.75 2017-06-13 17:26:42 +05:30
Harshan Liyanage
43ba1e1b43 Added Device-Cache for caching device objects which resolves harshanl/product-iots#1005 2017-06-13 17:08:26 +05:30
Rasika Perera
6d02075a99 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-12 15:11:14 +05:30
ayyoob
22a4716443 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-12 11:35:43 +05:30
ayyoob
c93410eb92 added few changes after review 2017-06-12 11:35:33 +05:30
Harshan Liyanage
951cd7b001 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-12 10:36:51 +05:30
WSO2 Builder
8927158086 [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare for next development iteration 2017-06-09 12:57:29 +05:30
WSO2 Builder
28423c45bc [WSO2 Release] [Jenkins #2346] [Release 2.0.74] prepare release v2.0.74 2017-06-09 12:57:15 +05:30
ayyoob
6c7f911cbc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 
Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.js
 2017-06-08 14:39:51 +05:30
ayyoob
7ab52af66e add http pushnotification 2017-06-08 14:24:33 +05:30
Harshan Liyanage
f215b5ee44 Added comments to the device status configs. 2017-06-07 17:34:06 +05:30
WSO2 Builder
e3dfbdfdbd [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare for next development iteration 2017-06-07 13:44:29 +05:30
WSO2 Builder
598332b640 [WSO2 Release] [Jenkins #2342] [Release 2.0.73] prepare release v2.0.73 2017-06-07 13:44:15 +05:30
WSO2 Builder
73fa026eeb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare for next development iteration 2017-06-06 12:33:06 +05:30
WSO2 Builder
2415762ccb [WSO2 Release] [Jenkins #2340] [Release 2.0.72] prepare release v2.0.72 2017-06-06 12:32:53 +05:30
Madawa Soysa
f9b759ddf7 Parameterizing the iot-api-config file 
Fixes wso2/product-iots#449
 2017-06-05 15:17:45 +05:30
Rasika Perera
ec343cef1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into geo-fencing 2017-06-05 10:26:10 +05:30
Rasika Perera
d37aafff48 iot location stream added for event publishing 2017-06-05 10:08:09 +05:30
ayyoob
a7ebc96cb7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-03 18:06:32 +05:30
WSO2 Builder
39a7037821 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare for next development iteration 2017-06-02 16:44:55 +05:30
WSO2 Builder
22782ec125 [WSO2 Release] [Jenkins #2334] [Release 2.0.71] prepare release v2.0.71 2017-06-02 16:44:41 +05:30
Harshan Liyanage
fda9410a2a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-06-02 15:07:48 +05:30
ayyoob
04b8b74e4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-06-01 17:22:33 +05:30
ayyoob
a0d7518cbe Implemented Pull Notification Support 2017-06-01 17:19:25 +05:30
WSO2 Builder
c7fd70145d [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare for next development iteration 2017-06-01 08:58:27 +05:30
WSO2 Builder
0c9d104401 [WSO2 Release] [Jenkins #2331] [Release 2.0.70] prepare release v2.0.70 2017-06-01 08:58:13 +05:30
Harshan Liyanage
4ec139608e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-05-30 17:00:52 +05:30
Harshan Liyanage
35d1c9897e Resolves harshanl/product-iots#518 2017-05-30 17:00:23 +05:30
WSO2 Builder
69a63baa43 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare for next development iteration 2017-05-30 11:24:51 +05:30
WSO2 Builder
713b948ea9 [WSO2 Release] [Jenkins #2328] [Release 2.0.69] prepare release v2.0.69 2017-05-30 11:24:37 +05:30
ayyoob
75d6813d8a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-24 00:43:02 +05:30
WSO2 Builder
7e83b53bb4 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare for next development iteration 2017-05-22 15:33:56 +05:30
WSO2 Builder
768073ea51 [WSO2 Release] [Jenkins #2314] [Release 2.0.68] prepare release v2.0.68 2017-05-22 15:33:42 +05:30
ayyoob
dd1c2e4338 Added few fixes after testing and added default UI for device type management 2017-05-22 02:51:35 +05:30
ayyoob
f945da194d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into devicetype-3.1.0 2017-05-19 01:56:40 +05:30
ayyoob
abc9315f95 Added Pluggable Device Type 2017-05-19 01:49:10 +05:30
WSO2 Builder
88bab85750 [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare for next development iteration 2017-05-18 17:33:39 +05:30
WSO2 Builder
4e506a547e [WSO2 Release] [Jenkins #2308] [Release 2.0.67] prepare release v2.0.67 2017-05-18 17:33:25 +05:30
WSO2 Builder
3092423d4d [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare for next development iteration 2017-05-17 19:11:50 +05:30
WSO2 Builder
e21520392c [WSO2 Release] [Jenkins #2305] [Release 2.0.66] prepare release v2.0.66 2017-05-17 19:11:36 +05:30
WSO2 Builder
d4baa72328 [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare for next development iteration 2017-05-16 18:34:27 +05:30
WSO2 Builder
7b549f623d [WSO2 Release] [Jenkins #2300] [Release 2.0.65] prepare release v2.0.65 2017-05-16 18:34:13 +05:30
ayyoob
fbb5f5ae88 merged with origin 2017-05-15 18:15:24 +05:30
WSO2 Builder
84d305dcd4 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare for next development iteration 2017-05-11 09:15:49 +05:30
WSO2 Builder
3bf945fe95 [WSO2 Release] [Jenkins #2293] [Release 2.0.64] prepare release v2.0.64 2017-05-11 09:15:33 +05:30
WSO2 Builder
f7300645a5 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare for next development iteration 2017-05-09 15:05:26 +05:30
WSO2 Builder
ca83609703 [WSO2 Release] [Jenkins #2289] [Release 2.0.63] prepare release v2.0.63 2017-05-09 15:05:11 +05:30
WSO2 Builder
964eae6f92 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare for next development iteration 2017-05-08 17:42:41 +05:30
WSO2 Builder
31f91f80b9 [WSO2 Release] [Jenkins #2285] [Release 2.0.62] prepare release v2.0.62 2017-05-08 17:42:28 +05:30
WSO2 Builder
639eeb225a [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare for next development iteration 2017-05-05 11:41:19 +05:30
WSO2 Builder
7d3025a25b [WSO2 Release] [Jenkins #2280] [Release 2.0.61] prepare release v2.0.61 2017-05-05 11:41:03 +05:30
WSO2 Builder
a546355cf3 [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare for next development iteration 2017-05-04 15:42:27 +05:30
WSO2 Builder
eb6b1db3fe [WSO2 Release] [Jenkins #2277] [Release 2.0.60] prepare release v2.0.60 2017-05-04 15:42:14 +05:30
WSO2 Builder
4797fc9600 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare for next development iteration 2017-05-03 20:29:05 +05:30
WSO2 Builder
896bc24f21 [WSO2 Release] [Jenkins #2274] [Release 2.0.59] prepare release v2.0.59 2017-05-03 20:28:51 +05:30
WSO2 Builder
98991fe89b [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare for next development iteration 2017-05-03 15:28:16 +05:30
WSO2 Builder
8b31b93181 [WSO2 Release] [Jenkins #2272] [Release 2.0.58] prepare release v2.0.58 2017-05-03 15:28:02 +05:30
WSO2 Builder
6fddf9c8d0 [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare for next development iteration 2017-05-03 08:28:19 +05:30
WSO2 Builder
2f4051019c [WSO2 Release] [Jenkins #2268] [Release 2.0.57] prepare release v2.0.57 2017-05-03 08:28:05 +05:30
WSO2 Builder
80bf3c8fbd [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare for next development iteration 2017-05-02 18:01:00 +05:30
WSO2 Builder
2a7173c66d [WSO2 Release] [Jenkins #2266] [Release 2.0.56] prepare release v2.0.56 2017-05-02 18:00:46 +05:30
WSO2 Builder
95a80301e9 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare for next development iteration 2017-05-02 17:15:09 +05:30
WSO2 Builder
236db75700 [WSO2 Release] [Jenkins #2265] [Release 2.0.55] prepare release v2.0.55 2017-05-02 17:14:54 +05:30
Geeth
6798dea68a Merge pull request #725 from warunalakshitha/master 
Add Scheduler Task for Sending Push Notification
 2017-05-02 17:04:03 +05:30
WSO2 Builder
43e76e4678 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare for next development iteration 2017-05-02 09:37:33 +05:30
WSO2 Builder
34865f0d25 [WSO2 Release] [Jenkins #2263] [Release 2.0.54] prepare release v2.0.54 2017-05-02 09:37:16 +05:30
warunalakshitha
1470abeb0b Add initial thread delay config for cdm-config.xml 2017-05-01 20:43:32 +05:30
warunalakshitha
8df87b23bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-30 13:56:12 +05:30
WSO2 Builder
3a9986d054 [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare for next development iteration 2017-04-28 10:29:44 +05:30
WSO2 Builder
b53610ff8b [WSO2 Release] [Jenkins #2257] [Release 2.0.53] prepare release v2.0.53 2017-04-28 10:29:35 +05:30
warunalakshitha
003c9c5907 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-27 12:23:17 +05:30
WSO2 Builder
726422dc81 [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare for next development iteration 2017-04-26 21:31:21 +05:30
WSO2 Builder
4bf6bf73cc [WSO2 Release] [Jenkins #2250] [Release 2.0.52] prepare release v2.0.52 2017-04-26 21:31:08 +05:30
WSO2 Builder
4429482a29 [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare for next development iteration 2017-04-26 15:26:48 +05:30
WSO2 Builder
1bbd982e1f [WSO2 Release] [Jenkins #2248] [Release 2.0.51] prepare release v2.0.51 2017-04-26 15:26:35 +05:30
WSO2 Builder
52b0165275 [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare for next development iteration 2017-04-26 11:16:14 +05:30
WSO2 Builder
ada2669ecf [WSO2 Release] [Jenkins #2245] [Release 2.0.50] prepare release v2.0.50 2017-04-26 11:15:58 +05:30
warunalakshitha
97a53a7387 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-04-25 19:08:36 +05:30
warunalakshitha
642f64c2d4 Add new push notification scheduler 2017-04-25 18:51:44 +05:30
warunalakshitha
eecb0a0a31 Add push notification status column to DM_ENROLMENT_OP_MAPPING 2017-04-25 18:50:59 +05:30
WSO2 Builder
543e603298 [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare for next development iteration 2017-04-25 10:14:34 +05:30
WSO2 Builder
5010a3eebf [WSO2 Release] [Jenkins #2242] [Release 2.0.49] prepare release v2.0.49 2017-04-25 10:14:21 +05:30
WSO2 Builder
eb8ba53092 [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare for next development iteration 2017-04-25 08:58:47 +05:30
WSO2 Builder
4764bff47e [WSO2 Release] [Jenkins #2240] [Release 2.0.48] prepare release v2.0.48 2017-04-25 08:58:32 +05:30
ayyoob
f834001d22 merged with origin 2017-04-22 01:24:24 +05:30
WSO2 Builder
c1b5a649f6 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare for next development iteration 2017-04-21 16:06:53 +05:30
WSO2 Builder
6ccccb67b4 [WSO2 Release] [Jenkins #2234] [Release 2.0.47] prepare release v2.0.47 2017-04-21 16:06:39 +05:30
Harshan Liyanage
0dc15324ad Merge pull request #701 from amalhub/master 
Merging Cloud updates to master
 2017-04-21 15:59:00 +05:30
Jasintha
e6b38fbdb4 Implemeting dynamic recivers and streams deployment into DAS 2017-04-21 15:51:24 +05:30
WSO2 Builder
1ecb4edbd7 [WSO2 Release] [Jenkins #2232] [Release 2.0.46] prepare for next development iteration 2017-04-21 15:31:09 +05:30
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