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 |
|
warunalakshitha
|
25ed0cf370
|
Fix build issue with swagger version
|
2016-09-29 18:28:09 +05:30 |
|
Rasika Perera
|
3b68ccb4ba
|
Merge pull request #365 from rasika/iots-ga
Merge iot-ga branch
|
2016-09-29 15:21:17 +05:30 |
|
Megala
|
400199e965
|
Merge remote-tracking branch 'upstream/master'
|
2016-09-29 14:18:24 +05:30 |
|
Megala
|
38677f84e8
|
Fixing SQL syntax problem
|
2016-09-29 14:09:44 +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 |
|
Megala
|
12aed521e5
|
Refactoring code
|
2016-09-29 13:57:06 +05:30 |
|
Megala
|
2cdaf5aa21
|
Reverting changes made to generic implementations and moving them to oracle specific ones
|
2016-09-29 13:44:33 +05:30 |
|
Megala
|
ecc87f370c
|
Fixing oracle error
|
2016-09-29 13:19:33 +05:30 |
|
Rasika Perera
|
b2eb715fb7
|
REsolving conflicts
|
2016-09-29 13:01:01 +05:30 |
|
Rasika Perera
|
5c8c28d28c
|
Merge pull request #1 from warunalakshitha/master
upgrade product iot to carbon 4.4.9
|
2016-09-29 11:24:05 +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 |
|
warunalakshitha
|
397c1daa2a
|
Fix package import conflicts of org.wso2.carbon.device.mgt.common bundle
|
2016-09-29 00:40:58 +05:30 |
|
Rasika Perera
|
237b9a7078
|
Creating api endpoint to retrieve features of a device-type
|
2016-09-28 23:42:44 +05:30 |
|
Rasika Perera
|
b2f31be1d6
|
Fixing iot operation bar not listing operations
|
2016-09-28 23:42:15 +05:30 |
|
Megala
|
cd50fe88bc
|
Reformatting the code
|
2016-09-28 16:22:59 +05:30 |
|
Megala
|
45cda92082
|
Merge remote-tracking branch 'upstream/master'
|
2016-09-28 15:33:42 +05:30 |
|
Megala
|
82be4ef5a8
|
Fixing oracle script issues
|
2016-09-28 15:15:24 +05:30 |
|
dilanua
|
7596f7876d
|
Improving device view info.retrieval - UI
|
2016-09-28 14:11:00 +05:30 |
|
Rasika Perera
|
6d4ddf7b54
|
Removed info log on view device
|
2016-09-27 23:19:14 +05:30 |
|
Rasika Perera
|
1bae3d2213
|
Fixing policy retrieve api
|
2016-09-27 22:06:48 +05:30 |
|
Rasika Perera
|
99fee36f2c
|
Fixing error when properties is null
|
2016-09-27 21:13:00 +05:30 |
|
amalhub
|
428ce25b6f
|
Fixing issue: https://wso2.org/jira/browse/EMM-1646
|
2016-09-27 20:46:00 +05:30 |
|
harshanl
|
9467efe0f6
|
Fixed notification issue
|
2016-09-27 17:54:31 +05:30 |
|
kamidu
|
1a9ca2d59e
|
Fix for Jira issue: EMM-1635
|
2016-09-27 15:41:47 +05:30 |
|
Rasika Perera
|
12c8483b4b
|
Changes to devices policy
|
2016-09-27 15:28:06 +05:30 |
|
kamidu
|
174555b387
|
Fix for EMM-1627
|
2016-09-27 11:29:34 +05:30 |
|
Rasika Perera
|
056f6d2f4e
|
Adding proper error message when no device type is avaialble
|
2016-09-27 04:49:07 +05:30 |
|
Imesh Chandrasiri
|
de63beaaa6
|
Roles listing icon resize fix
|
2016-09-26 20:04:14 +05:30 |
|
Imesh Chandrasiri
|
5e7d3a00ad
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-26 20:02:44 +05:30 |
|
dilanua
|
8232bf7484
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1633
|
2016-09-26 19:52:18 +05:30 |
|
Imesh Chandrasiri
|
5954fd9070
|
EMM-1595 : Fixing Icon of Users get enlarged when sorting by user name in List Mode
|
2016-09-26 19:41:20 +05:30 |
|
Imesh Chandrasiri
|
2c0df21491
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-26 19:37:43 +05:30 |
|
Rasika Perera
|
56a81e431c
|
Removed extra license headers
|
2016-09-26 19:21:46 +05:30 |
|
Rasika Perera
|
6bfe166b5d
|
Correcting appContext=>@app.context, self.publicUri=>@unit.publicUri/@page.publicUri, currentUser.username=>@user.username
|
2016-09-26 19:17:05 +05:30 |
|
Rasika Perera
|
54c518a4fd
|
Making datatables-extended to get context path from global js variable
|
2016-09-26 19:13:12 +05:30 |
|
Rasika Perera
|
77720dd61a
|
Fixing devices listing page styling issue.
|
2016-09-26 18:25:11 +05:30 |
|
Rasika Perera
|
1bef7a38ef
|
Minor style fix for wr-hidden-operations
|
2016-09-26 18:08:06 +05:30 |
|
kamidu
|
225268bd78
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-26 18:05:36 +05:30 |
|
kamidu
|
0ab9db2afd
|
Fix for EMM-1575
|
2016-09-26 18:05:29 +05:30 |
|
dilanua
|
378dd4084c
|
FIX for JIRAS: https://wso2.org/jira/browse/EMM-1591,EMM-1590,EMM-1585
|
2016-09-26 17:27:57 +05:30 |
|
harshanl
|
1a12838b7c
|
Fixed issue in NotificationDAO due to invalid column name
|
2016-09-26 17:16:27 +05:30 |
|
Rasika Perera
|
4c4eba93d8
|
Returning correct representation of the device to template.
|
2016-09-26 17:15:12 +05:30 |
|
Rasika Perera
|
cef865f53a
|
Parsing deviceType configs with %https.ip% and %http.ip%
|
2016-09-26 17:13:43 +05:30 |
|
Rasika Perera
|
86a45fec2e
|
Fixes to mqtt notification strategy when message body is null
|
2016-09-26 14:57:10 +05:30 |
|
Rasika Perera
|
a61be7a7ec
|
Enable group management api
|
2016-09-26 14:56:34 +05:30 |
|
Rasika Perera
|
b5b4f508b0
|
Fixing NPE when fetching opeartion
|
2016-09-26 14:53:04 +05:30 |
|
Rasika Perera
|
f2af4bd078
|
Fixing undefined exception when device properties not available
|
2016-09-24 01:35:59 +05:30 |
|
harshanl
|
27a9eeb692
|
Removed unnecessary DM service
|
2016-09-23 23:22:58 +05:30 |
|
harshanl
|
f24242fb8a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-23 21:17:50 +05:30 |
|
harshanl
|
dd03d0b740
|
Added device status change upon inactivity mechanism
|
2016-09-23 21:17:37 +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 |
|
Rasika Perera
|
ccf4b6492c
|
Fixing devices listing issue
|
2016-09-23 12:45:45 +05:30 |
|
Rasika Perera
|
3e2731a772
|
Fixing invoker service return nothing on httpClient requests.
|
2016-09-23 12:45:15 +05:30 |
|
dilanua
|
ebead1249c
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
2016-09-23 11:38:40 +05:30 |
|
Ace
|
6aad76eff1
|
Synching with master and updating jscep and bcpkix dependencies
|
2016-09-23 11:24:49 +05:30 |
|
dilanua
|
87a03e8312
|
Fix for jira: https://wso2.org/jira/browse/EMM-1617
|
2016-09-23 11:15:12 +05:30 |
|
dilanua
|
71424c4bb7
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1613
|
2016-09-22 22:47:18 +05:30 |
|
dilanua
|
e3256417a3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 22:16:24 +05:30 |
|
dilanua
|
a4b39f92e5
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1593
|
2016-09-22 22:15:55 +05:30 |
|
harshanl
|
5a6120d6fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 20:31:14 +05:30 |
|
harshanl
|
1b6c7ea502
|
Refactored PolcyMgt component
|
2016-09-22 20:30:18 +05:30 |
|
dilanua
|
92aa413773
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 19:53:36 +05:30 |
|
dilanua
|
f7a38b2313
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1612
|
2016-09-22 19:53:18 +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 |
|
harshanl
|
17127c3846
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 16:54:56 +05:30 |
|
Rasika Perera
|
98ab29fe94
|
Fixing virtual firealarm device agent download
|
2016-09-22 15:53:16 +05:30 |
|
Rasika Perera
|
eb5a36ef42
|
Supporting stream download on service invoker
|
2016-09-22 15:52:52 +05:30 |
|
Rasika Perera
|
728307defd
|
Adding bundle import
|
2016-09-22 14:57:00 +05:30 |
|
Rasika Perera
|
4691bedbc5
|
Fixes to devices listing
|
2016-09-22 14:35:17 +05:30 |
|
Rasika Perera
|
c6c555abc6
|
Fixing null pointer issue on mqtt notification strategy implementation
|
2016-09-22 14:34:25 +05:30 |
|
Rasika Perera
|
1d3f5f39a7
|
Adding custom headers support to invoker util
|
2016-09-22 14:33:53 +05:30 |
|
Imesh Chandrasiri
|
f8b08849cd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-22 14:14:20 +05:30 |
|
Imesh Chandrasiri
|
3d5b6cd89f
|
Removing unwanted url params from datatable serverside search
|
2016-09-22 14:14:07 +05:30 |
|
harshanl
|
12713f3301
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-22 10:45:47 +05:30 |
|
Rasika Perera
|
e71d3947cb
|
Adding intuitive error when specified notification provider is not found
|
2016-09-22 08:57:34 +05:30 |
|
Rasika Perera
|
513015c1b5
|
Changing context path /emm into /devicemgt on cdmf base app
|
2016-09-22 08:56:41 +05:30 |
|
Rasika Perera
|
0fb87f3aa2
|
Fixing device types not shown issue
|
2016-09-22 08:56:12 +05:30 |
|
Rasika Perera
|
9148c3baea
|
Fixing dashboard styling issues
|
2016-09-22 08:55:29 +05:30 |
|
Ace
|
f4d6eb6898
|
Upgrading jscep and other fixes
|
2016-09-22 08:24:58 +05:30 |
|
harshanl
|
108ea98677
|
Refactor policy mgt components and fixed add operations for invalid devices from task service
|
2016-09-21 19:44:46 +05:30 |
|
Ace
|
9548bdc263
|
Fixing dependency related issues
|
2016-09-21 12:56:40 +05:30 |
|
harshanl
|
c967fc34d0
|
Fixed EMM-1513
|
2016-09-20 18:43:50 +05:30 |
|
Ace
|
5f90587564
|
Synching with master
|
2016-09-20 18:13:53 +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
|
81c684be50
|
Refactoring user-menu - UI
|
2016-09-20 16:27:07 +05:30 |
|
dilanua
|
d8e057abdd
|
Fix for JIRA: https://wso2.org/jira/browse/EMM-1582
|
2016-09-20 15:28:45 +05:30 |
|
dilanua
|
6fea974c90
|
Refactoring notifications side-pane - UI
|
2016-09-20 14:21:17 +05:30 |
|
dilanua
|
ce1a063688
|
Refactoring notifications side-pane - UI
|
2016-09-20 12:49:41 +05:30 |
|
dilanua
|
9a095fa670
|
Refactoring change password modal - UI
|
2016-09-20 12:14:45 +05:30 |
|
Ace
|
87ad1e0e71
|
Fixing intermittent jackson bind issue
|
2016-09-20 12:07:14 +05:30 |
|
dilanua
|
b16f0fd592
|
Refactoring change password modal - UI
|
2016-09-20 11:27:04 +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 |
|
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
|
b4e4b114a5
|
Updating dashboard title
|
2016-09-18 17:01:36 +05:30 |
|
dilanua
|
e8571b7b65
|
Updating operation-mod with windows operation apis
|
2016-09-18 16:06:32 +05:30 |
|
dilanua
|
408e10a890
|
Changing admin dashboard name to 'Navigating Dashboard' - UI
|
2016-09-18 08:39:41 +05:30 |
|
dilanua
|
713c8ac4d8
|
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
|
2016-09-18 07:34:14 +05:30 |
|
dilanua
|
cd66f64945
|
Correcting typo: diableScreenCapture to disableScreenCapture - Operation-mod & Policy UI
|
2016-09-17 20:05:34 +05:30 |
|
dilanua
|
37131afb4a
|
Adding radio:checked and input[type=hidden] support to operation mod - UI
|
2016-09-17 19:57:02 +05:30 |
|
dilanua
|
e4dae67fea
|
Changing permissions - /devices/any to /devices/any-device
|
2016-09-17 17:36:06 +05:30 |
|
dilanua
|
58f8656e94
|
Changing permissions - /devices/owning to /devices/owning-device
|
2016-09-17 17:22:47 +05:30 |
|
Rasika Perera
|
d9b25eda08
|
Adding deviceName into notifications
|
2016-09-16 09:39:21 +05:30 |
|
Dilan U. Ariyaratne
|
1651ade4a7
|
Merge pull request #357 from thusithak/master
Theme migration - 2.2.0 alpha defect fixes
|
2016-09-15 16:49:41 +05:30 |
|
Dilan U. Ariyaratne
|
df7c54b1af
|
Merge pull request #356 from DimalChandrasiri/theme-migration
Model Fixes
|
2016-09-15 16:49:14 +05:30 |
|
thusithakalugamage
|
2f5d90cb6c
|
[EMM-1571] Add policies page wizard styling and layout defects
|
2016-09-15 13:46:48 +05:30 |
|
harshanl
|
5b0e99aeff
|
Fixed EMM-1562
|
2016-09-15 12:37:35 +05:30 |
|
harshanl
|
78cab76101
|
Fixed EMM-1531
|
2016-09-15 12:36:55 +05:30 |
|
Imesh Chandrasiri
|
1599b84e54
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-15 10:19:42 +05:30 |
|
Imesh Chandrasiri
|
e2576b21a8
|
Adding default button class to modal popups
|
2016-09-15 10:19:22 +05:30 |
|
kamidu
|
a448959fe0
|
Fix for EMM-1548
|
2016-09-15 06:40:05 +05:30 |
|
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
2016-09-14 17:23:09 +05:30 |
|
kamidu
|
e2d0f7d040
|
Fix for EMM-1559
|
2016-09-14 16:23:21 +05:30 |
|
Imesh Chandrasiri
|
3e5064feed
|
Fix for datatable icon size change on pagination
|
2016-09-14 15:13:54 +05:30 |
|
Imesh Chandrasiri
|
9573bce48f
|
Fix for datatable icon size change on pagination
|
2016-09-14 14:35:56 +05:30 |
|
Imesh Chandrasiri
|
317252ebb0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-14 10:22:00 +05:30 |
|
Rasika Perera
|
1d7546916c
|
Changes to the policiesCount, rolesCount, usersCount methods
|
2016-09-14 07:09:05 +05:30 |
|
Rasika Perera
|
0fab418187
|
Fixing invalid device count and group count
|
2016-09-13 19:43:43 +05:30 |
|
Imesh Chandrasiri
|
b56fb667b7
|
Modal fixes
|
2016-09-13 15:16:50 +05:30 |
|
kamidu
|
d7c7315f16
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-13 12:15:03 +05:30 |
|
kamidu
|
70dd5ded77
|
Fix for the policy edit internal server issue
|
2016-09-13 12:14:55 +05:30 |
|
Dilan U. Ariyaratne
|
3cbaecfbbf
|
Merge pull request #355 from DimalChandrasiri/theme-migration
Data Table CSS Removed from custom.desktop file
|
2016-09-13 11:19:30 +05:30 |
|
thusithakalugamage
|
144dd92c47
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-12 18:09:57 +05:30 |
|
thusithakalugamage
|
d2a44647dd
|
[EMM-1549] - Heading defect fix
|
2016-09-12 18:09:33 +05:30 |
|
dilanua
|
00d79c9ece
|
Changing certificates breadcrumb name from certificate to certificates - UI
|
2016-09-12 17:09:40 +05:30 |
|
Imesh Chandrasiri
|
7a452d09ab
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-12 15:18:37 +05:30 |
|
Imesh Chandrasiri
|
e3b230937e
|
Remove data table styles
|
2016-09-12 15:18:21 +05:30 |
|
thusithakalugamage
|
4cb5238112
|
[EMM-1543] styling defect fix
|
2016-09-12 14:37:52 +05:30 |
|
thusithakalugamage
|
3b3962b772
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-12 14:36:25 +05:30 |
|
thusithakalugamage
|
0273a6e369
|
responsive tab panel component - markup rewrite for uuf
|
2016-09-12 14:35:58 +05:30 |
|
dilanua
|
6aa01d2e7a
|
Fixing NPE issue in token-protected-service-invokers - UI
|
2016-09-12 14:17:44 +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 |
|
Rasika Perera
|
ae7f4b8373
|
Adding permission update error message box
|
2016-09-09 19:27:09 +05:30 |
|
Rasika Perera
|
7edc7f29db
|
Fixing role add permission update issue
|
2016-09-09 19:27:09 +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
|
6825a87bb9
|
button component - active and focus style defect fix
|
2016-09-09 19:11:02 +05:30 |
|
thusithakalugamage
|
c871fbcdad
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-09 18:53:17 +05:30 |
|
thusithakalugamage
|
b2cde2228f
|
wizard component - layout defect fixes
|
2016-09-09 18:44:20 +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 |
|
Imesh Chandrasiri
|
b08aeefbbc
|
Modal Changes
|
2016-09-09 18:42:31 +05:30 |
|
kamidu
|
2ec2600471
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 18:40:12 +05:30 |
|
harshanl
|
671ef77b63
|
Fixed EMM-1107 issue
|
2016-09-09 18:25:28 +05:30 |
|
Imesh Chandrasiri
|
8f68a3658e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-09 18:23:53 +05:30 |
|
Imesh Chandrasiri
|
f908738659
|
Modal Changes
|
2016-09-09 18:23:44 +05:30 |
|
Rasika Perera
|
8e247bda62
|
Fixing font warning on page load
|
2016-09-09 17:58:33 +05:30 |
|
Rasika Perera
|
4d0fd67539
|
Adding missing woff2 fonts
|
2016-09-09 17:50:30 +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 |
|
Imesh Chandrasiri
|
47b46c50b0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-09 17:19:18 +05:30 |
|
thusithakalugamage
|
42c6500a31
|
adding responsive, date addition and version number update
|
2016-09-09 17:16:08 +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 |
|
thusithakalugamage
|
ef646800fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-09 16:05:42 +05:30 |
|
thusithakalugamage
|
dc23e55444
|
responsive tab panel component - style changes
|
2016-09-09 16:02:09 +05:30 |
|
Imesh Chandrasiri
|
d182c194ed
|
removing data table css from custom.desktop.css
|
2016-09-09 15:47:55 +05:30 |
|
harshanl
|
2f1c03ae1f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 15:36:17 +05:30 |
|
dilanua
|
7a0e52e8f9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 15:30:54 +05:30 |
|
dilanua
|
6a9225d249
|
Updating device module for permissions - Ui
|
2016-09-09 15:30:23 +05:30 |
|
harshanl
|
97cb3cc015
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-09 15:10:21 +05:30 |
|
harshanl
|
7dc93ff010
|
MSSQL script fixes and added the /users/count REST API
|
2016-09-09 15:06:30 +05:30 |
|
Imesh Chandrasiri
|
690bd7de5c
|
modal popup changes
|
2016-09-09 14:58:31 +05:30 |
|
Rasika Perera
|
940f2aaede
|
Merge pull request #348 from DimalChandrasiri/theme-migration
Theme migration
|
2016-09-09 12:29:41 +05:30 |
|
harshanl
|
d60daae97f
|
MSSQL fixes to dbscrpits and DAO layer
|
2016-09-09 12:15:51 +05:30 |
|
Imesh Chandrasiri
|
613d0ff7be
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
2016-09-09 11:39:29 +05:30 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|