Commit Graph

320 Commits

Author SHA1 Message Date
WSO2 Builder
cf3d543fea [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare for next development iteration 2017-03-24 15:45:48 +05:30
WSO2 Builder
59194a1286 [WSO2 Release] [Jenkins #2605] [Release 3.0.18] prepare release v3.0.18 2017-03-24 15:45:32 +05:30
WSO2 Builder
82ac8417d3 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare for next development iteration 2017-03-23 13:14:16 +05:30
WSO2 Builder
d0e9362ee1 [WSO2 Release] [Jenkins #2602] [Release 3.0.17] prepare release v3.0.17 2017-03-23 13:14:05 +05:30
sameera910409
d907f1bc51 fix https://wso2.org/jira/browse/EMM-1880 2017-03-22 19:02:47 +05:30
WSO2 Builder
2049e44319 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare for next development iteration 2017-03-22 15:53:43 +05:30
WSO2 Builder
d15dc25c13 [WSO2 Release] [Jenkins #2596] [Release 3.0.16] prepare release v3.0.16 2017-03-22 15:53:34 +05:30
WSO2 Builder
8df6e56f40 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare for next development iteration 2017-03-21 20:11:47 +05:30
WSO2 Builder
2e8f5a63d2 [WSO2 Release] [Jenkins #2593] [Release 3.0.15] prepare release v3.0.15 2017-03-21 20:11:33 +05:30
Harshan Liyanage
bd2ded8563 Removed unnecessary braces. 2017-03-16 15:54:39 +05:30
Hasunie
809a30fc7a fixing code format issue 2017-03-16 14:22:24 +05:30
Hasunie
7de234c164 resolved #616 2017-03-16 14:14:32 +05:30
Hasunie
143569b83b Fixing null property in AndriodAPIUtils 2017-03-16 12:26:37 +05:30
WSO2 Builder
c49b33bb4a [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare for next development iteration 2017-03-15 18:08:34 +05:30
WSO2 Builder
e1064dca07 [WSO2 Release] [Jenkins #2584] [Release 3.0.14] prepare release v3.0.14 2017-03-15 18:08:26 +05:30
WSO2 Builder
68f329cbda [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare for next development iteration 2017-03-14 16:48:21 +05:30
WSO2 Builder
8669d1b44e [WSO2 Release] [Jenkins #2581] [Release 3.0.13] prepare release v3.0.13 2017-03-14 16:48:11 +05:30
Harshan Liyanage
2753deb365 Merge pull request #602 from sameeragunarathne/master
refactor code for firebase cloud messaging
2017-03-14 16:41:19 +05:30
WSO2 Builder
18d3518236 [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare for next development iteration 2017-03-13 17:43:20 +05:30
WSO2 Builder
867790d3cb [WSO2 Release] [Jenkins #2576] [Release 3.0.12] prepare release v3.0.12 2017-03-13 17:43:10 +05:30
sameera910409
078209347a refactor code for firebase cloud messaging 2017-03-13 14:30:27 +05:30
Susinda Perera
fb6cfb6699 Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
2017-03-09 12:45:44 +05:30
Hasunie
3e50f0b737 adding initial operations 2017-03-03 17:37:55 +05:30
susinda
5ad6dc1f1d Fxing PhoneNumber Serach for android 2017-02-28 20:28:48 +05:30
ayyoob
a294c20a2a added device management api to be default 2017-02-09 09:59:24 +05:30
Kamidu Sachith Punchihewa
68b36babe6 Merge pull request #575 from wso2/master
UI fixes for device cloud
2017-02-03 16:53:19 +05:30
WSO2 Builder
d7e4580e77 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare for next development iteration 2017-02-02 16:06:06 +05:30
WSO2 Builder
1737eaaa79 [WSO2 Release] [Jenkins #2510] [Release 3.0.11] prepare release v3.0.11 2017-02-02 16:05:58 +05:30
Hasunie
3b98e0f754 Merge pull request #572 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:58:11 +05:30
charitha
9bf38af4f7 Fix issues in swagger docs 2017-02-01 15:03:10 +05:30
Milan Perera
99782e6360 Resolved conflicts and merged 2017-02-01 14:13:01 +05:30
WSO2 Builder
7034dae2b5 [maven-release-plugin] prepare for next development iteration 2017-01-31 12:58:56 +05:30
WSO2 Builder
a2224f96ff [maven-release-plugin] prepare release v3.0.10 2017-01-31 12:58:45 +05:30
WSO2 Builder
4554d8929d [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare for next development iteration 2017-01-30 18:07:35 +05:30
WSO2 Builder
da7c040224 [WSO2 Release] [Jenkins #2500] [Release 3.0.9] prepare release v3.0.9 2017-01-30 18:07:24 +05:30
ayyoob
4f1f1a3e7e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-24 19:46:39 +05:30
WSO2 Builder
e64fe695ab [maven-release-plugin] prepare for next development iteration 2017-01-20 13:36:50 +00:00
WSO2 Builder
5fbd40c579 [maven-release-plugin] prepare release v3.0.8 2017-01-20 13:31:44 +00:00
WSO2 Builder
9687362258 [maven-release-plugin] prepare for next development iteration 2017-01-20 02:04:54 +00:00
WSO2 Builder
ee063a1a43 [maven-release-plugin] prepare release v3.0.7 2017-01-20 02:03:09 +00:00
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
WSO2 Builder
b10579950b [maven-release-plugin] prepare for next development iteration 2017-01-07 11:25:51 +00:00
WSO2 Builder
b7a5454c2f [maven-release-plugin] prepare release v3.0.5 2017-01-07 11:22:33 +00:00
Milan Perera
77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 16:48:02 +05:30
Rasika Perera
81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x
made policy manager to be part of device mgt service
2017-01-06 14:15:23 +05:30
inoshperera
7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 11:38:41 +05:30
inoshperera
22a58121d2 changing the Andrid API tag to standerdise 2017-01-06 11:38:09 +05:30
Milan Perera
86aac810ce Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 10:11:16 +05:30
Milan Perera
d2d912fb6d Refactored scopes strings 2017-01-06 10:10:45 +05:30
ayyoob
f603f58fd1 moved compliance payload generation code to api impl 2017-01-05 22:06:37 +05:30
Maninda
0c7f1adcba Fixed some issues reported with FindBugs while security plugin is enabled. 2017-01-05 19:36:52 +05:30
ayyoob
54011d2197 removed provider tenant domain and user from the web.xml 2017-01-05 17:57:04 +05:30
ayyoob
3fa679a3e9 made policy manager to be part of device type mgt service 2017-01-05 14:37:27 +05:30
Madawa Soysa
1b56ebb831 Improving scope annotations in android plugin 2017-01-05 14:26:43 +05:30
WSO2 Builder
227d4685c9 [maven-release-plugin] prepare for next development iteration 2016-12-24 03:15:18 +00:00
WSO2 Builder
6c38ce6385 [maven-release-plugin] prepare release v3.0.4 2016-12-24 03:13:35 +00:00
Ace
c302d7b25a Coorecting version import ranges 2016-12-23 09:58:28 +05:30
charitha
a4841d87ba Add custom email template for android 2016-12-22 18:31:05 +05:30
charitha
0c2465d03e Add enrollment invitations API EP for android 2016-12-20 23:48:21 +05:30
Ace
488c2abafa removing slf4j from packing in the android devicemgt jaxrs 2016-12-19 15:24:02 +05:30
WSO2 Builder
a398686ec7 [maven-release-plugin] prepare for next development iteration 2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303 [maven-release-plugin] prepare release v3.0.3 2016-12-09 05:43:17 +00:00
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
WSO2 Builder
4ae70fe1f1 [maven-release-plugin] prepare for next development iteration 2016-11-29 10:24:35 +00:00
WSO2 Builder
42c2b04c62 [maven-release-plugin] prepare release v2.2.7 2016-11-29 10:12:05 +00:00
WSO2 Builder
ab087bf934 [maven-release-plugin] prepare for next development iteration 2016-11-29 07:23:41 +00:00
WSO2 Builder
072dd089ef [maven-release-plugin] prepare release v2.2.6 2016-11-29 07:21:29 +00:00
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
WSO2 Builder
c9861e9636 [maven-release-plugin] prepare for next development iteration 2016-10-31 11:57:15 +00:00
WSO2 Builder
3e664dc304 [maven-release-plugin] prepare release v2.2.5 2016-10-31 11:55:04 +00:00
Harshan Liyanage
242253b8f2 Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
2016-10-27 12:21:26 +05:30
Shavindri
f6c0aeecfc Added swagger annotations and refined the messages 2016-10-27 12:05:17 +05:30
Megala
e23ecc5b64 Fixing EMM-1779 2016-10-25 17:34:53 +05:30
WSO2 Builder
19e0d65db0 [maven-release-plugin] prepare for next development iteration 2016-10-21 11:27:51 +00:00
WSO2 Builder
537a99d05d [maven-release-plugin] prepare release v2.2.4 2016-10-21 11:25:53 +00:00
WSO2 Builder
b095196e65 [maven-release-plugin] prepare for next development iteration 2016-10-18 15:36:09 +00:00
WSO2 Builder
d455b13e62 [maven-release-plugin] prepare release v2.2.3 2016-10-18 15:33:59 +00:00
hasuniea
2ad390b877 removing duplicate event related classes 2016-09-30 13:40:17 +05:30
Chatura Dilan Perera
0b66649841 [maven-release-plugin] prepare for next development iteration 2016-09-29 21:47:43 +05:30
Chatura Dilan Perera
362003c9ab [maven-release-plugin] prepare release v2.2.2 2016-09-29 21:47:34 +05:30
harshanl
fd82cfcddd Added new agent with policy fix 2016-09-29 18:51:31 +05:30
charitha
975fb078b5 (cherry picked from commit d68c4c8) 2016-09-27 15:24:18 +05:30
charitha
9886e2e75f Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
# Conflicts:
#	components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
2016-09-26 18:01:46 +05:30
charitha
ba2acb5e75 Refactor code
(cherry picked from commit 01f2a91)
2016-09-26 18:01:12 +05:30
Ace
0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-22 19:09:26 +05:30
harshanl
212dcae8e7 Added scheduled time to App-install operation 2016-09-22 18:26:13 +05:30
dilanua
215093b9a8 Updating android operation failure notification message format 2016-09-22 13:00:31 +05:30
Chatura Dilan Perera
7174945f21 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-21 13:51:44 +05:30
Chatura Dilan Perera
ae99d189e7 Fixed logcat and events get APIs 2016-09-21 13:51:29 +05:30
dilanua
b99529d9d0 Fixing JIRA: https://wso2.org/jira/browse/EMM-1588 2016-09-21 11:21:35 +05:30
dilanua
ab14f9516c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-09-20 19:04:36 +05:30
dilanua
13d784009c Updating android operation failure notification message 2016-09-20 19:04:15 +05:30
Ace
6c3ba5e688 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 2016-09-20 18:02:42 +05:30
Chatura Dilan Perera
bf72d212f7 [maven-release-plugin] prepare for next development iteration 2016-09-19 19:53:27 +05:30
Chatura Dilan Perera
18780e5274 [maven-release-plugin] prepare release v2.2.1 2016-09-19 19:52:58 +05:30