Commit Graph

2539 Commits

Author SHA1 Message Date
Chatura Dilan
046cd6586c Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-07-26 12:00:17 +05:30
Chatura Dilan
7af8ecc686 Added userstore for role listing 2016-07-26 11:59:10 +05:30
dilanua
34edbce1a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:35:17 +05:30
dilanua
c228f03481 Refactoring oauth token handling functions and dependants 2016-07-26 11:34:52 +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
prabathabey
89634a9c38 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:28:43 +05:30
prabathabey
bd1322e801 Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl 2016-07-26 11:28:31 +05:30
dilanua
2e5d046fbf Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:15:29 +05:30
dilanua
b72d099641 Refactoring oauth token handling functions 2016-07-26 11:14:46 +05:30
prabathabey
1798562386 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 11:02:36 +05:30
hasuniea
70f23b0919 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 10:22:42 +05:30
hasuniea
a02f7a5db1 fixing formatting issue 2016-07-26 10:21:25 +05:30
dilanua
d05c6e2170 Deprecating /api/token.jag (unused) 2016-07-25 22:23:22 +05:30
mharindu
3457bba4a3 Adding Annotation reading fix for device-mgt-extensions 2016-07-25 19:21:08 +05:30
prabathabey
df49788219 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-25 15:57:29 +05:30
dilanua
87dbb5f9e1 Refactoring ui token handling functions 2016-07-25 15:32:39 +05:30
dilanua
7facff4b58 Updating ui init logic 2016-07-25 15:28:41 +05:30
mharindu
19275634a1 Fixed webapp name resolving issue 2016-07-25 12:04:30 +05:30
ayyoob
8eb29a77cc adding device-mgt-scopes config 2016-07-25 11:46:45 +05:30
dilanua
c57c75945c Deprecating invoker-request-wrapper (unused) 2016-07-25 10:11:39 +05:30
dilanua
00f98f5cce Updating base ui app config reader 2016-07-25 05:50:49 +05:30
dilanua
d04cb54ae8 Refactoring base ui app config reader 2016-07-24 21:34:22 +05:30
dilanua
c12630e65c Refactoring base ui app config reader 2016-07-24 21:20:51 +05:30
dilanua
1916c4df5f Refactoring cdmf product page layout 2016-07-24 20:35:52 +05:30
dilanua
7d9cde3cfb Refactoring Navigation Bar 2016-07-24 12:46:40 +05:30
dilanua
99aca9b90a Updating user-listing 2016-07-23 20:23:21 +05:30
dilanua
bbce1a3d8a Refactoring user-listing front-end logic 2016-07-22 19:07:33 +05:30
dilanua
8f81f2bb01 Refactoring data-tables-invoker-api 2016-07-22 18:23:02 +05:30
dilanua
225b1ddc45 Refactoring device-mgt-props 2016-07-22 17:08:55 +05:30
mharindu
3331604699 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-22 16:42:00 +05:30
mharindu
827567733c Fixed scope update issue in API update 2016-07-22 16:41:40 +05:30
dilanua
7e7549437b Refactoring user module 2016-07-22 15:31:00 +05:30
dilanua
24d846a328 Refactoring user-create page and related modules 2016-07-22 15:25:33 +05:30
dilanua
b636738be3 Fixing issue: user-list not getting updated upon user-removal 2016-07-22 11:54:35 +05:30
hasuniea
74658d1e85 adding certificate scripts 2016-07-22 11:42:55 +05:30
Dilan U. Ariyaratne
2de1c63382 Merge pull request #317 from madhawap/master
fix to iOS device enrolment
2016-07-22 11:01:13 +05:30
madhawap
86fdc85d13 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-22 10:59:34 +05:30
madhawap
d79de070f1 fix to iOS device enrolment 2016-07-22 10:58:50 +05:30
ayyoob
250ce1f77c added device mgt grant types 2016-07-21 20:14:43 +05:30
mharindu
b3d309583d Fixed issues in scope service 2016-07-21 20:13:38 +05:30
dilanua
da6ff6e7fa Refactoring user-listing page 2016-07-21 18:04:51 +05:30
dilanua
177b7cf3df Refactoring data-tables-extended-unit 2016-07-21 17:58:59 +05:30
Ace
c8b37207fc Fixing context issue in service-invoker 2016-07-21 15:03:17 +05:30
mharindu
b8f2457046 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-21 14:32:26 +05:30
dilanua
31b62e6336 Adding jaggery.conf url mapping for data-tables-invoker-api 2016-07-21 12:54:39 +05:30
mharindu
7f1e2fdf0b Implemented scope management service 2016-07-21 12:43:21 +05:30
Ace
b8635db485 Adding changes to common modules to accomodate ui restructuring 2016-07-21 07:42:20 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +05:30
mharindu
9932f061fb Fixed webapp name resolving issue 2016-07-18 20:09:16 +05:30
mharindu
186432e1df Fixed webapp name resolving issue 2016-07-18 20:08:51 +05:30