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
2,855 Commits 31 Branches 461 Tags 183 MiB
9467efe0f6
Commit Graph

302 Commits

Author SHA1 Message Date
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
Chatura Dilan Perera
7395c76408 Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-09-20 17:45:24 +05:30
Ace
33d8829540 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7 
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
 2016-09-20 17:02:28 +05:30
dilanua
d8e057abdd Fix for JIRA: https://wso2.org/jira/browse/EMM-1582 2016-09-20 15:28:45 +05:30
Ace
87ad1e0e71 Fixing intermittent jackson bind issue 2016-09-20 12:07:14 +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
harshanl
75df243a33 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-19 12:22:08 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
harshanl
4169d3b2bd Fixed EMM-1554 2016-09-19 12:08:06 +05:30
dilanua
713c8ac4d8 Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations 2016-09-18 07:34:14 +05:30
dilanua
58f8656e94 Changing permissions - /devices/owning to /devices/owning-device 2016-09-17 17:22:47 +05:30
harshanl
78cab76101 Fixed EMM-1531 2016-09-15 12:36:55 +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
harshanl
0eaf33aa5c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 19:16:27 +05:30
harshanl
87a5b09266 Added users/count API 2016-09-09 19:16:00 +05:30
thusithakalugamage
0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:42:46 +05:30
kamidu
0fdcbae817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-09-09 17:47:49 +05:30
kamidu
878daae5c5 Permission modifications 2016-09-09 17:47:42 +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
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
dilanua
d24ba98643 Updating activate and deactivate policy endpoints from PUT to POST 2016-09-07 16:15:26 +05:30
charitha
3575c9a33d Fix issue in get devices with since parameter. 2016-08-31 17:43:13 +05:30
Chatura Dilan Perera
f29b9e84f2 Fixed 200 returns when activities are empty and since is a future date 2016-08-31 13:56:59 +05:30
Chatura Dilan Perera
9aa5f2793f return date format as UTC in APIs 2016-08-30 14:17:06 +05:30
Chatura Dilan Perera
475b832c59 Changed return date format to UTC date 2016-08-29 18:50:23 +05:30
charitha
0fe827ca9f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-25 13:10:48 +05:30
charitha
9246cdcf30 Return empty array when results not found with since parameter 2016-08-25 12:28:55 +05:30
Saad Sahibjan
a72b47f6f7 Fixing incorrect response for remove policy 2016-08-24 19:18:35 +05:30
harshanl
f3aefcca77 Fixed EMM-1450 2016-08-23 17:57:08 +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
harshanl
67942d5c1d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-18 19:45:47 +05:30
dilanua
6b4ab635af Fixing jiras: EMM-1472, EMM-1505 2016-08-18 14:30:53 +05:30
harshanl
2cb8f0b313 Fixed EMM-1392 2016-08-16 18:02:30 +05:30
Ruwan
6134f94e3c Merge pull request #332 from ayyoob/com 
fixing commit issues
 2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09 Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3 2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2 fixing getAllActivity H2 issue 2016-08-15 21:00:15 +05:30
mharindu
7346313d27 Modified scope management service 2016-08-15 20:30:45 +05:30
ayyoob
442c2b86da fixed formatting issues 2016-08-15 15:19:18 +05:30
harshanl
a7d7c689e8 Removed unsupported roleName parameter from device API 2016-08-15 13:59:30 +05:30
ayyoob
3b56668af0 merged with upstream 2016-08-13 10:47:18 +05:30
madhawap
ecfe94235f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3 fixes to role updating endpoint 2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com 2016-08-12 12:27:35 +05:30