Shavindri
|
c64581dc59
|
Removed the GroupManagementService and GroupManagementAdminService references from the APIs after discussing with the team and continued adding swagger annotations and refining tex
|
2016-10-13 13:45:02 +05:30 |
|
Kamidu Sachith Punchihewa
|
cb825a7f26
|
Merge pull request #389 from susinda/master
Device delete implemented (only in api level) for iot and the fix for the EMM-1715
|
2016-10-13 12:25:56 +05:30 |
|
kamidu
|
2ea21a6fdc
|
renaming public js to match the unit structure
|
2016-10-13 12:22:07 +05:30 |
|
susinda
|
eb20d1fc1c
|
Device delete implemented (only in api level) for iot
|
2016-10-13 12:02:00 +05:30 |
|
kamidu
|
959e3a63af
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-13 11:17:32 +05:30 |
|
kamidu
|
bfc04a7f16
|
Fixing EMM-EMM-1753
|
2016-10-13 11:17:15 +05:30 |
|
hasuniea
|
2128f08658
|
fixing EMM-1750
|
2016-10-13 10:00:08 +05:30 |
|
Rasika Perera
|
790ca36443
|
Removed unnecessary debug log
|
2016-10-13 08:22:37 +05:30 |
|
Rasika Perera
|
135b6e8881
|
Fixing device view page
|
2016-10-13 08:16:51 +05:30 |
|
kamidu
|
c4a0ac4bf3
|
Enable centralized modal handling unit for cdmf
|
2016-10-12 17:39:31 +05:30 |
|
kamidu
|
6605a86bf7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-12 16:11:00 +05:30 |
|
kamidu
|
43b1a9f278
|
Fix for EMM-1651
|
2016-10-12 16:09:28 +05:30 |
|
charitha
|
528687bde3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-12 12:59:41 +05:30 |
|
charitha
|
0498c68ca5
|
Add validation to maximum limit value
(cherry picked from commit 4ed757f)
|
2016-10-12 12:57:57 +05:30 |
|
Megala
|
4999b84169
|
Reformatting code
|
2016-10-12 09:41:43 +05:30 |
|
Megala
|
5b96e1b849
|
Fixing EMM-1333
|
2016-10-12 09:38:11 +05:30 |
|
thusithakalugamage
|
fa3db47400
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-11 18:36:56 +05:30 |
|
thusithakalugamage
|
48337ee16c
|
[EMM-1618] - related improvements on remaining occurences
|
2016-10-11 18:35:47 +05:30 |
|
Rasika Perera
|
2340611a9b
|
Removing mdm specific dependencies from CDMF
|
2016-10-11 15:41:25 +05:30 |
|
Milan Perera
|
da4a558d87
|
Merge pull request #387 from ayyoob/st2
added gateway mode to decide to which oauth app to use.
|
2016-10-11 15:35:26 +05:30 |
|
ayyoob
|
2f58e0ba15
|
added gateway mode to decide to which oauth app to use.
|
2016-10-11 15:15:50 +05:30 |
|
Kamidu Sachith Punchihewa
|
ecc70ead08
|
Merge pull request #385 from hastef88/emm1726
EMM-1726
|
2016-10-11 11:12:57 +05:30 |
|
Kamidu Sachith Punchihewa
|
af4989e56d
|
Merge pull request #384 from shavidissa/master
swagger annotations and definition update continued for device type, …
|
2016-10-11 11:12:16 +05:30 |
|
Hasitha Amal De Silva
|
4555819211
|
EMM-1726 - disable apply changes button if the priority has changed without pressing save priority button.
|
2016-10-11 11:01:30 +05:30 |
|
Shavindri
|
0842dcb2bb
|
swagger annotations and definition update continued for device type, device, policy, role, user, group and user management.
|
2016-10-11 10:33:05 +05:30 |
|
Milan Perera
|
bb60caa171
|
Merge pull request #383 from ayyoob/st2
fixed api name for device type
|
2016-10-10 20:51:40 +05:30 |
|
ayyoob
|
93c1725e32
|
fixed api name for device type
|
2016-10-10 20:47:31 +05:30 |
|
charitha
|
e53b0c3860
|
Fix group count listing in dashboard
|
2016-10-10 20:00:39 +05:30 |
|
kamidu
|
8c94e83431
|
Fix for Jira : EMM-1682 and EMM-1653
|
2016-10-10 18:27:53 +05:30 |
|
charitha
|
a2c0526b40
|
Fix typo
|
2016-10-10 15:34:18 +05:30 |
|
charitha
|
670ca7c228
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/BasePaginatedResult.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
|
2016-10-10 15:29:10 +05:30 |
|
kamidu
|
836ed2bc1c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-10 14:16:00 +05:30 |
|
kamidu
|
3223e29df9
|
Fix for EMM-1185 , EMM- 1619
|
2016-10-10 14:15:52 +05:30 |
|
Megala
|
235e9797d4
|
Fixing EMM-1717
|
2016-10-10 11:36:25 +05:30 |
|
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
2016-10-09 03:16:02 +05:30 |
|
hasuniea
|
05e95e2675
|
fix the EMM-1702
|
2016-10-07 15:48:43 +05:30 |
|
Imesh Chandrasiri
|
125b827f4f
|
Fix for modal popup overlay bug
|
2016-10-07 14:27:00 +05:30 |
|
Kamidu Sachith Punchihewa
|
a8e7396589
|
Merge pull request #377 from DimalChandrasiri/master
Parameterized datatable sorting function
|
2016-10-07 13:10:35 +05:30 |
|
Kamidu Sachith Punchihewa
|
6dafd11ca9
|
Merge pull request #379 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
2016-10-07 13:10:20 +05:30 |
|
harshanl
|
4ce9c95044
|
Changed getOperations API to return operation list of removed devices
|
2016-10-07 12:34:42 +05:30 |
|
thusithakalugamage
|
84a7d5517f
|
EMM-1685] - fix and few other related improvements
|
2016-10-07 12:31:46 +05:30 |
|
Imesh Chandrasiri
|
bce1d9e060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-07 10:11:35 +05:30 |
|
Imesh Chandrasiri
|
3e4c1f9121
|
Parametarized datatable sorting function
|
2016-10-07 10:11:21 +05:30 |
|
Kamidu Sachith Punchihewa
|
5e6d8e667d
|
Merge pull request #376 from thusithak/master
EMM 2.2.0-Alpha2 theme migration and issue fixes
|
2016-10-06 22:46:51 +05:30 |
|
kamidu
|
131bcd48f9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 22:33:15 +05:30 |
|
kamidu
|
cc6922bfad
|
Fix for EMM-1680
|
2016-10-06 22:33:08 +05:30 |
|
charitha
|
664b3d4d43
|
Fix issue in duplicate mapping
|
2016-10-06 20:32:09 +05:30 |
|
harshanl
|
4bcf350236
|
EMM-1678:Updated the oauth component versions
|
2016-10-06 19:43:23 +05:30 |
|
thusithakalugamage
|
1a1f79b1b4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 17:46:59 +05:30 |
|
thusithakalugamage
|
ac27349dae
|
Header nav menu responsiveness improvements
|
2016-10-06 17:45:55 +05:30 |
|
kamidu
|
fc902ba602
|
fix database extended issue
|
2016-10-06 17:25:47 +05:30 |
|
thusithakalugamage
|
909e7836ca
|
Header nav menu responsiveness improvements
|
2016-10-06 16:41:31 +05:30 |
|
kamidu
|
fc50b851bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 16:26:55 +05:30 |
|
kamidu
|
4bbb378d26
|
conicting solving
|
2016-10-06 16:26:50 +05:30 |
|
charitha
|
94a50584f4
|
Improve group listing with pagination
|
2016-10-06 16:01:41 +05:30 |
|
kamidu
|
e2ee797462
|
Fix for EMM-1700
|
2016-10-06 12:20:07 +05:30 |
|
madhawap
|
16b334b0b3
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
2016-10-06 12:13:27 +05:30 |
|
madhawap
|
7b8518a9db
|
changes to swagger SecurityDefinitionConfigurator and annotations
|
2016-10-06 11:59:20 +05:30 |
|
charitha
|
ce5d63925a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-06 11:58:12 +05:30 |
|
charitha
|
e89b4015b6
|
Introduced pagination
|
2016-10-06 11:51:54 +05:30 |
|
Kamidu Sachith Punchihewa
|
06e70c8326
|
Merge pull request #373 from shavidissa/master
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
2016-10-06 11:33:31 +05:30 |
|
Shavindri
|
f0164b5a01
|
swagger annotations and definitions changes for role management, configuration management and application management(admin)
|
2016-10-06 10:12:25 +05:30 |
|
thusithakalugamage
|
2ae60cc415
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-05 19:18:22 +05:30 |
|
thusithakalugamage
|
88ec5246ec
|
[EMM-1694] - Header responsive issues fix
|
2016-10-05 19:17:51 +05:30 |
|
kamidu
|
1fe74905f2
|
Fix for the redirection and ui related issues
|
2016-10-05 18:11:46 +05:30 |
|
Imesh Chandrasiri
|
ebad678bab
|
Datatables serverside paging redirection bug fix
|
2016-10-05 15:08:34 +05:30 |
|
kamidu
|
8c98accd18
|
Fixing conflitcs
|
2016-10-05 12:24:23 +05:30 |
|
kamidu
|
c6fffb0b3a
|
Fixies for the ui issues in EMM -beta
|
2016-10-05 12:22:32 +05:30 |
|
charitha
|
06176898d0
|
Exposed group id to API level
|
2016-10-05 12:20:35 +05:30 |
|
Megala
|
e77d8b8b29
|
Adding isEmpty check
|
2016-10-05 11:34:05 +05:30 |
|
Megala
|
0642cc10d7
|
Reformatting code
|
2016-10-05 10:52:40 +05:30 |
|
Megala
|
f9204add08
|
Merge remote-tracking branch 'upstream/master'
|
2016-10-05 10:10:12 +05:30 |
|
Megala
|
42a9ba92a6
|
Fixing EMM-1683
|
2016-10-05 10:09:35 +05:30 |
|
charitha
|
f22d392978
|
Upgrade to comply with latest CDMF changes
|
2016-10-04 19:03:07 +05:30 |
|
Megala
|
b7990b9146
|
Fixing problems in retriveing data from secondary user store
|
2016-10-04 17:22:45 +05:30 |
|
Kamidu Sachith Punchihewa
|
c7bd0de033
|
Merge pull request #369 from thusithak/master
Platform configuration style defect fixes
|
2016-10-04 17:09:53 +05:30 |
|
Dilan U. Ariyaratne
|
2d7506d9b8
|
Merge pull request #368 from amalhub/master
Fixing issue: EMM-1537
|
2016-10-04 17:04:55 +05:30 |
|
dilanua
|
dff32af832
|
Adding initial swagger annotations and permissions to Dashboard APIs
|
2016-10-04 16:25:17 +05:30 |
|
dilanua
|
1ca5762c44
|
Uncommenting Dashboard APIs
|
2016-10-04 15:49:29 +05:30 |
|
thusithakalugamage
|
f664749c1f
|
platform configuration style defect fixes
|
2016-10-04 15:22:41 +05:30 |
|
kamidu
|
f32caf1833
|
UI fixes in 2.2.0-beta
|
2016-10-04 13:20:09 +05:30 |
|
charitha
|
a0050d8f4d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-04 12:26:29 +05:30 |
|
kamidu
|
7898a7475c
|
UI fixes in 2.2.0-beta
|
2016-10-04 12:24:41 +05:30 |
|
charitha
|
d1d6eefd17
|
Upgrading grouping backend
|
2016-10-04 12:24:40 +05:30 |
|
amalhub
|
c87c5a8322
|
Fixing issue: EMM-1537
|
2016-10-04 11:14:39 +05:30 |
|
harshanl
|
f0f0182d20
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-10-03 18:28:43 +05:30 |
|
harshanl
|
a4538a6d6c
|
Removed unnecessary params from paginated queries
|
2016-10-03 18:27:20 +05:30 |
|
Rasika Perera
|
35c23174be
|
Fixing android sense download issue
|
2016-10-03 16:05:49 +05:30 |
|
Rasika Perera
|
0290c710e1
|
Fixing enrollment url for device types
|
2016-10-03 16:05:49 +05:30 |
|
Harshan Liyanage
|
13d9bdfb53
|
Merge pull request #367 from Megala21/master
[EMM-1129]Fixing SSO problem
|
2016-10-03 15:42:13 +05:30 |
|
Megala
|
359bd8f317
|
Fixing tenant loading problem
|
2016-10-03 15:15:27 +05:30 |
|
harshanl
|
672de3a09e
|
Device status change fix for iOS
|
2016-10-03 14:57:46 +05:30 |
|
Megala
|
e8eb0123c7
|
Fixing the tenant loading problem when sso is enabled
|
2016-10-03 14:18:43 +05:30 |
|
harshanl
|
befb5b0ad8
|
EMM-1658:Changed the API contract to not to send username parameter. User can only change his own password.
|
2016-10-03 14:13:06 +05:30 |
|
amalhub
|
8b4649b4e5
|
Fixing issue: EMM-1537
|
2016-10-03 11:39:03 +05:30 |
|
Megala
|
a0586ca977
|
Adding comment
|
2016-10-03 11:34:00 +05:30 |
|
Megala
|
e5870e1306
|
Fixing the problem of common log out
|
2016-10-02 23:15:25 +05:30 |
|
Megala
|
b10c323582
|
Fixing the problem in login
|
2016-10-02 21:26:13 +05:30 |
|
Megala
|
bacd7ccfd2
|
Merge remote-tracking branch 'upstream/master'
|
2016-10-01 22:02:35 +05:30 |
|
Megala
|
4af2a37d9d
|
Fixing SSO problem
|
2016-10-01 22:00:59 +05:30 |
|
harshanl
|
406d49ad61
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-09-30 18:43:38 +05:30 |
|
harshanl
|
399ef2fc06
|
Windows getOpending operations fix
|
2016-09-30 15:33:59 +05:30 |
|
kamidu
|
5595100cc2
|
UI fixes in role and policy management
|
2016-09-30 15:10:34 +05:30 |
|
harshanl
|
9d31590e83
|
Windows getPending operations fix
|
2016-09-30 14:27:11 +05:30 |
|
harshanl
|
10f8b12b88
|
OperationManagerImpl Code refactored
|
2016-09-30 11:39:15 +05:30 |
|
harshanl
|
f9ba45f439
|
Fixed the device status changing issue when there are multiple enrollments for the same device
|
2016-09-30 11:04:28 +05:30 |
|
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 |
|