Imesh Chandrasiri
|
f42215a926
|
Adding modal code changes
|
2016-09-09 11:37:41 +05:30 |
|
kamidu
|
c2471fc2bb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 11:17:50 +05:30 |
|
kamidu
|
2cd5a0e659
|
Enable permission check according to the new permissions
|
2016-09-09 11:13:37 +05:30 |
|
Rasika Perera
|
432c46601b
|
Fixing breadcrumb height issue
|
2016-09-09 11:12:08 +05:30 |
|
Rasika Perera
|
cfa32cf75c
|
Fixing icons background color issue
|
2016-09-09 11:10:01 +05:30 |
|
dilanua
|
2d864bf02e
|
Removing unnecessary spacing provided for operation-bar - UI
|
2016-09-09 10:23:11 +05:30 |
|
harshanl
|
1e00a012a8
|
Removed unnecessary import statements
|
2016-09-09 10:07:16 +05:30 |
|
harshanl
|
0ee6110b3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 09:57:48 +05:30 |
|
mharindu
|
ce1f5c5701
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 02:56:41 +05:30 |
|
mharindu
|
115099c8fe
|
Implemented permission based authorization
|
2016-09-09 02:56:21 +05:30 |
|
dilanua
|
4fe79be5f8
|
Updating datatables server-side-paging module
|
2016-09-08 22:44:18 +05:30 |
|
dilanua
|
9e9f3e859a
|
Updating custom-desktop.css to remove unnecessary bottom border of operation-bar
|
2016-09-08 22:41:11 +05:30 |
|
kamidu
|
f5e1fee561
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-08 18:42:18 +05:30 |
|
kamidu
|
411641bc57
|
Enable permission check according to the new permissions
|
2016-09-08 18:41:51 +05:30 |
|
Charitha Goonetilleke
|
51686dce08
|
Merge pull request #347 from charithag/master
Fix SQL error when could happen due to duplicate enrollments
|
2016-09-08 14:51:38 +05:30 |
|
charitha
|
de6f2558c5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-08 14:48:38 +05:30 |
|
charitha
|
2fde165b7c
|
Fix SQL error when could happen due to duplicate enrollments.
(cherry picked from commit c75307f)
|
2016-09-08 14:47:21 +05:30 |
|
Rasika Perera
|
5157cb81f8
|
Merge pull request #345 from thusithak/theme-migration
Theme migration - responsive small device view defect fixes
|
2016-09-08 12:34:07 +05:30 |
|
thusithakalugamage
|
e80daf7709
|
responsive small device view defect fixes
|
2016-09-08 12:29:49 +05:30 |
|
harshanl
|
e72d3147f0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-08 11:53:08 +05:30 |
|
harshanl
|
2e17dce0ae
|
Fixed DM_DEVICE column issue in MSSQL scrpt
|
2016-09-07 16:19:50 +05:30 |
|
dilanua
|
d24ba98643
|
Updating activate and deactivate policy endpoints from PUT to POST
|
2016-09-07 16:15:26 +05:30 |
|
harshanl
|
b7ffaf0b0f
|
Fixed issues in DAO implementations and MSSQL db script
|
2016-09-07 15:01:09 +05:30 |
|
dilanua
|
a74862d73b
|
Updating policy module - UI
|
2016-09-07 14:56:27 +05:30 |
|
thusithakalugamage
|
6583305e19
|
resolving conflicts
|
2016-09-07 12:31:39 +05:30 |
|
Rasika Perera
|
f37c2c6de8
|
Fixing requesting invalid url for Roboto-Regular web font
|
2016-09-07 01:39:22 +05:30 |
|
Rasika Perera
|
887322b716
|
Merge pull request #344 from DimalChandrasiri/theme-migration
Theme migration
|
2016-09-06 19:05:00 +05:30 |
|
harshanl
|
60a7796efb
|
Fixed issues in DB scripts
|
2016-09-06 18:53:04 +05:30 |
|
thusithakalugamage
|
d308a92726
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-06 14:21:56 +05:30 |
|
thusithakalugamage
|
dcce02a736
|
fixing conflicts
|
2016-09-06 14:21:14 +05:30 |
|
dilanua
|
795fbcb366
|
Updating ios operation endpoints - UI
|
2016-09-06 12:52:52 +05:30 |
|
Imesh Chandrasiri
|
f898ed838c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-06 11:43:08 +05:30 |
|
Imesh Chandrasiri
|
2786c576ea
|
Merge Conflicts Fixed
|
2016-09-06 11:42:54 +05:30 |
|
harshanl
|
8daf1b74e8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-06 11:11:46 +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 |
|
harshanl
|
0479742bc4
|
Fixed a minor issue in GCM notification provider
|
2016-09-05 17:43:04 +05:30 |
|
Imesh Chandrasiri
|
fe0bdb9ba6
|
Merge Conflicts Fixed
|
2016-09-05 14:45:41 +05:30 |
|
Imesh Chandrasiri
|
d1acfe1503
|
Modal Changes added
|
2016-09-05 14:44:21 +05:30 |
|
harshanl
|
bdb5b970fd
|
Removed access modifiers from Interface APIs
|
2016-09-05 11:51:51 +05:30 |
|
harshanl
|
8e6c15acf2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-05 09:49:16 +05:30 |
|
dilanua
|
e881aa6da4
|
Fixing Role Editing UI
|
2016-09-02 18:55:00 +05:30 |
|
dilanua
|
c57e9eba3a
|
Updating Roles listing UI to dynamically fetch app-context
|
2016-09-02 18:08:27 +05:30 |
|
dilanua
|
0427a6dd4b
|
Refactoring Role Create UI - moving units to page
|
2016-09-02 18:00:40 +05:30 |
|
dilanua
|
934c45cd95
|
Adding role creation UI
|
2016-09-02 17:43:43 +05:30 |
|
dilanua
|
746a4d4372
|
Refactoring roles listing UI - merging srcs in units to page
|
2016-09-02 10:27:52 +05:30 |
|
dilanua
|
fd6ddf7a52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-01 22:31:21 +05:30 |
|
dilanua
|
677385920e
|
Updating User Listing UI
|
2016-09-01 22:30:49 +05:30 |
|
Rasika Perera
|
ad5c97e354
|
Temporary resolving WARN logs for css fonts on the theme.
|
2016-09-01 22:12:51 +05:30 |
|
dilanua
|
687efa97b1
|
Updating Role Listing UI
|
2016-09-01 20:12:47 +05:30 |
|
dilanua
|
eedb66ec45
|
Updating User Listing UI
|
2016-09-01 19:08:20 +05:30 |
|