kamidu
7212e969d8
Fix for SQL query issue in mysql
2016-10-25 17:22:18 +05:30
Ruwan
072119d7df
Merge pull request #403 from ayyoob/commit-fixes
...
Commit fixes
2016-10-25 15:29:04 +05:30
charitha
5f68953b11
Merge branch 'master' into IoTS-1.0.0
...
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GroupManagementService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/GroupManagementAdminService.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GroupManagementServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/GroupManagementAdminServiceImpl.java
# components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
2016-10-25 14:22:44 +05:30
ayyoob
3140c36f7b
added missing license headers
2016-10-25 13:57:16 +05:30
Harshan Liyanage
1ba2e2f768
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-25 11:51:16 +05:30
Harshan Liyanage
f961b57f9f
EMM-1775:Fixed opleration log issue when multiple enrollments are there for a single device.
2016-10-25 11:50:38 +05:30
Madawa Soysa
774eaadb71
EMM-1298: Extracting serial number from the certificate itself when adding a certificate
2016-10-25 11:43:58 +05:30
kamidu
65ed6c2f6e
include owner for the operations api
2016-10-25 11:31:00 +05:30
sinthuja
a6203845c9
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:37:00 +05:30
sinthuja
00e57bd800
Fixing the empty methods for resources in the synapse configuration issue when auto publishing the apis for the REST service.
2016-10-24 16:31:41 +05:30
ayyoob
8293ed43ae
added missing imports
2016-10-24 02:17:20 +05:30
ayyoob
16f6a62dca
refactored DAO handler
2016-10-23 17:37:27 +05:30
ayyoob
fbfb86c53e
refactored DAO handler
2016-10-23 15:45:29 +05:30
ayyoob
d17241e51e
added comments and license
2016-10-23 14:18:15 +05:30
ayyoob
45c0d2d2f5
added logs if device type registration failed
2016-10-23 10:51:14 +05:30
ayyoob
c48f879205
added XmlAccessorType to root pom
2016-10-23 01:24:33 +05:30
ayyoob
e3ef66aa1a
added deployer feature
2016-10-22 22:36:38 +05:30
ayyoob
eeea1c372f
updated configs and Dao
2016-10-22 22:22:34 +05:30
ayyoob
d6090dd812
added device type deployer initial commit
2016-10-22 01:37:01 +05:30
Madawa Soysa
f6ee6aeb8d
Refactoring pages to use new modal unit
2016-10-21 17:19:36 +05:30
Saad Sahibjan
1cb969eb6d
Fix incorrect spacing
2016-10-21 13:52:33 +05:30
Megala
35d6d311a7
Fixing EMM-1763
2016-10-19 11:55:00 +05:30
WSO2 Builder
27a2c9b979
[maven-release-plugin] prepare for next development iteration
2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c
[maven-release-plugin] prepare release v1.2.5
2016-10-18 12:09:16 +00:00
harshanl
370f6de260
Removed applied policy upon removal of the last policy applicable for a device
2016-10-18 17:10:34 +05:30
Kamidu Sachith Punchihewa
fa7c8e85ce
Merge pull request #393 from thusithak/master
...
Fixing modal dialog markup defects in unit
2016-10-18 16:58:48 +05:30
Kamidu Sachith Punchihewa
7666bbfd05
Merge pull request #395 from Megala21/master
...
Fixing EMM-1752 and EMM-1755
2016-10-18 16:58:24 +05:30
WSO2 Builder
6a55e1be83
[maven-release-plugin] prepare for next development iteration
2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61
[maven-release-plugin] prepare release v1.2.4
2016-10-17 14:13:25 +00:00
Megala
3416ae78c4
Fixing the problems in displaying user list when the user names has special chracters
2016-10-17 16:35:58 +05:30
Megala
1ff86289fd
Fixing the problems that happend when we have special chracters in roles
2016-10-17 15:47:32 +05:30
Megala
4ec6883ec8
Merge remote-tracking branch 'upstream/master'
2016-10-17 14:51:20 +05:30
Kamidu Sachith Punchihewa
0d6364d77a
Merge pull request #394 from shavidissa/master
...
Continued adding swagger annotations and created the swagger extensions file
2016-10-17 14:28:07 +05:30
Megala
4a71be850c
Refactoring code
2016-10-17 14:23:55 +05:30
Shavindri
28cb653b06
Added swagger annotations and refined the messages for certificate management, and created the swagger extensions file.
2016-10-17 14:21:30 +05:30
Rasika Perera
b8f623e04a
Supporting custom contentTypes for service invoker
2016-10-17 10:51:39 +05:30
Megala
d9ec203727
Fixing EMM-1755
2016-10-16 13:24:32 +05:30
Megala
d5c62f74dc
Merge remote-tracking branch 'upstream/master'
2016-10-15 21:49:37 +05:30
harshanl
036ed6fe41
Added POLICY_REVOKE operation upon deletion of the last policy
2016-10-14 19:20:11 +05:30
thusithakalugamage
521a30c260
Fixing modal dialog markup defects in unit
2016-10-14 17:57:11 +05:30
harshanl
73539362d4
Refactored PolicyAdministratorPointImpl
2016-10-14 17:33:41 +05:30
harshanl
6e1fdabaad
EMM-1342:Added policy revoke operation
2016-10-14 17:13:43 +05:30
Megala
d90d51d412
Merge remote-tracking branch 'upstream/master'
2016-10-14 16:04:01 +05:30
Megala
e55b3a6d5f
Fixes related to having special characters in role name
2016-10-14 16:03:14 +05:30
kamidu
39bc2e6747
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 15:20:14 +05:30
kamidu
1af8184889
positioning modal content
2016-10-14 15:20:05 +05:30
thusithakalugamage
3aae81d9e4
resolving conflicts - removing deprecated modal related methods
2016-10-14 14:16:53 +05:30
thusithakalugamage
47ca8942b6
resolving conflicts - removing deprecated modal related methods
2016-10-14 14:11:49 +05:30
thusithakalugamage
308eeb6cf8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 13:52:42 +05:30
harshanl
a89b50197f
EMM-1757:Fixed admin device-detail view issue
2016-10-14 13:21:51 +05:30
Megala
a04f91cddb
Fixing issues related to mapping users and roles from different user stores
2016-10-14 10:59:56 +05:30
harshanl
954a2eb870
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-14 10:14:12 +05:30
Megala
87150f5074
Fixing secondary role deletion
2016-10-14 00:01:15 +05:30
Megala
2195a164e5
Merge remote-tracking branch 'upstream/master'
2016-10-13 21:28:51 +05:30
kamidu
6886233bb9
removing unnecessary and improving styling in modal unit
2016-10-13 19:53:54 +05:30
thusithakalugamage
6667a41378
resolving conflicts
2016-10-13 19:03:44 +05:30
harshanl
24c38602b8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 17:11:42 +05:30
harshanl
51910ee67a
EMM-1675:Added policy revoke operation
2016-10-13 17:11:36 +05:30
Megala
0756294724
Merge remote-tracking branch 'upstream/master'
2016-10-13 17:01:32 +05:30
Megala
d8555c34ab
Fixing issues related with roles of secondary user store
2016-10-13 16:58:22 +05:30
kamidu
bbfa1c334d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-13 15:16:31 +05:30
kamidu
ed70cb02b6
Sample implimentation using the new cdmf.ui.modal unit
2016-10-13 15:16:09 +05:30
Kamidu Sachith Punchihewa
cce4428a9d
Merge pull request #390 from shavidissa/master
...
Removed the GroupManagementService and GroupManagementAdminService references from the APIs and continued adding swagger annotations
2016-10-13 14:01:49 +05:30
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
ca68181541
Fixing NPE of EMM-1715
2016-10-13 12:11:37 +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
kamidu
2f852d84f4
Fix for the issue : EMM policy updating issue
2016-10-10 16:37:37 +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
852ea00403
refactored method name
2016-10-09 19:10:43 +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
a56aac7b87
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-10-06 16:42:20 +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
Megala
c022f51467
Fixing EMM-1587
2016-10-06 15:44:53 +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
Shavindri
3d383b0414
test push reverse
2016-10-04 13:39:08 +05:30
Shavindri
b77aefa02c
test push
2016-10-04 13:34:44 +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
harshanl
b1e140b58e
Removed unnecessary imports
2016-09-30 10:58:00 +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
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
Imesh Chandrasiri
2786c576ea
Merge Conflicts Fixed
2016-09-06 11:42:54 +05:30
harshanl
0479742bc4
Fixed a minor issue in GCM notification provider
2016-09-05 17:43:04 +05:30
mharindu
24930b3042
Partial commit of migration
2016-09-05 16:37:09 +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
dilanua
6f28bf1d94
Updating User Listing UI
2016-09-01 18:51:26 +05:30
dilanua
32fc58c917
Updating User Listing UI
2016-09-01 17:49:16 +05:30
dilanua
54807b99ee
Updating role listing UI
2016-09-01 17:00:43 +05:30
Rasika Perera
8148b5b06c
Separating CDMF base app and uuf-template app
2016-09-01 16:28:05 +05:30
Imesh Chandrasiri
4a69e162b3
Modal Changes added
2016-09-01 12:09:24 +05:30
Imesh Chandrasiri
1ed6213916
Modal Changes added
2016-09-01 10:51:38 +05:30
harshanl
54112a3f3d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-09-01 10:25:37 +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
harshanl
6554368bfa
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-31 11:04:44 +05:30
harshanl
551d77bd62
Refactored OperationMgr code
2016-08-30 16:58:25 +05:30
kamidu
cd77ce692e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-30 16:37:34 +05:30
kamidu
abb3aea9a9
fixes for notification isses
2016-08-30 16:36:26 +05:30
harshanl
675843d7f7
Added Valid device list to Activity response
2016-08-30 15:53:07 +05:30
harshanl
a77564ac2d
Added status for each device in Activity response
2016-08-30 14:53:56 +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
Chatura Dilan Perera
83442b0bca
Fixed issue in activity retrival
2016-08-29 15:52:54 +05:30
Chatura Dilan Perera
29d6b38d15
Fixed issue in activity getting with response
2016-08-29 15:52:36 +05:30
Chatura Dilan Perera
40cabd0064
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-08-27 01:53:20 +05:30
Chatura Dilan Perera
549a2773f2
Fixed issue releated to activity api since
2016-08-27 01:52:48 +05:30
harshanl
624bf7c7b4
Fixed EMM-1518
2016-08-26 23:07:07 +05:30
harshanl
56f23a83fc
changed comments
2016-08-26 20:52:14 +05:30
hasuniea
1ebf4e2c7c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-26 17:42:32 +05:30
hasuniea
d1e058ce8e
fixing api-mgt upgrading issues
2016-08-26 17:40:30 +05:30
Imesh Chandrasiri
e02264099b
Adding user menu update
2016-08-26 16:05:29 +05:30
thusithakalugamage
00bf595cb2
moving wso2 theme to emm - removing duplicated styles for buttons and links, navbar style update
2016-08-26 15:56:25 +05:30
thusithakalugamage
42a3d5f7e5
moving wso2 theme to emm - modal window content positioning and background fixes
2016-08-26 14:19:24 +05:30
thusithakalugamage
b5fda80377
emm login page layouts updated to wso2 theme markup
2016-08-26 13:39:10 +05:30
thusithakalugamage
b67b34e831
cdmf navbar hamburger menu and menu open state icons correction
2016-08-26 11:52:18 +05:30
thusithakalugamage
6b5d884fd5
vertical tab component bottom margin defect fix
2016-08-26 11:50:29 +05:30
thusithakalugamage
333e05dcc5
Merge branch 'theme-migration' of https://github.com/DimalChandrasiri/carbon-device-mgt into theme-migration
2016-08-26 10:25:14 +05:30
thusithakalugamage
ee856d6b8b
moving wso2 theme to emm - link hover defect fix
2016-08-26 07:43:06 +05:30
thusithakalugamage
cd6cf9f6b3
moving wso2 theme to emm - navbar cllapse color fixes
2016-08-26 06:03:22 +05:30
thusithakalugamage
849c2a4f55
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-08-25 14:44:51 +05:30
Imesh Chandrasiri
5cdafa04a6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
2016-08-25 14:44:31 +05:30
Imesh Chandrasiri
802d5e5fe9
Markup change to suite the padding
2016-08-25 14:42:26 +05:30
thusithakalugamage
aa23239f40
moving wso2 theme to emm - layout color update
2016-08-25 14:30:09 +05:30
Charitha Goonetilleke
9e0edf84ab
Merge pull request #337 from charithag/master
...
Fix issue in get devices with since parameter
2016-08-25 14:12:59 +05:30
harshanl
811d225bc3
Fixed adding operations to invalid devices
2016-08-25 13:58:38 +05:30
charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-25 13:10:48 +05:30
charitha
579d91bd79
Fix issue in get devices with since parameter.
2016-08-25 13:10:23 +05:30
Imesh Chandrasiri
4bebb77d5f
Merge branch 'theme-migration' of https://github.com/thusithak/carbon-device-mgt into theme-migration
2016-08-25 12:34:12 +05:30
thusithakalugamage
1a2c6ec8eb
moving wso2 theme to emm - layout
2016-08-25 12:33:48 +05:30
Imesh Chandrasiri
8a17ec9e48
Changing the login button to new theme
2016-08-25 12:30:56 +05:30
charitha
9246cdcf30
Return empty array when results not found with since parameter
2016-08-25 12:28:55 +05:30
Chatura Dilan Perera
763993263c
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-08-25 11:53:57 +05:30
Chatura Dilan Perera
16e6e12436
Fixed issue in Activity API returning one activity
2016-08-25 11:53:29 +05:30
thusithakalugamage
1f7b618d5a
moving wso2 theme to emm - layout
2016-08-25 11:48:53 +05:30
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
2016-08-24 19:18:35 +05:30
mharindu
d7e8cc30dd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
2016-08-24 14:56:06 +05:30
harshanl
f3aefcca77
Fixed EMM-1450
2016-08-23 17:57:08 +05:30
hasuniea
e723761344
fixing code conflicts
2016-08-19 16:21:20 +05:30
Chatura Dilan Perera
8b17cbb339
Fix conflicts
2016-08-19 15:00:57 +05:30
hasuniea
b3582f9d47
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-19 13:40:21 +05:30
dilanua
7bc927fbd0
Removing obsolete constants from constants.js - UI
2016-08-19 11:52:24 +05:30
dilanua
fbd51e31c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-19 10:50:31 +05:30
dilanua
13e2381293
Updating OAuth Utils - UI
2016-08-19 10:50:12 +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
0ba6edf36d
Updating utility.js and removing unused config files - UI
2016-08-18 18:41:07 +05:30
dilanua
e32c9c0bdb
Updating init.js module - UI
2016-08-18 18:27:24 +05:30
dilanua
f61b929bfd
Updating data-tables API - UI
2016-08-18 18:11:31 +05:30
dilanua
78b5cf9fb3
Updating user APIs - UI
2016-08-18 16:27:07 +05:30
dilanua
4eaa3be491
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-18 16:24:22 +05:30
dilanua
83498b1039
Updating operation APIs
2016-08-18 16:23:57 +05:30
kamidu
8eeabcee2c
Fix for Jira issue EMM-1418
2016-08-18 15:21:52 +05:30
hasuniea
1ba598a93e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-18 15:12:50 +05:30
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
2016-08-18 14:30:53 +05:30
charitha
3d19d9ed2e
Add MySQLOperationDAOImpl for row locking.
2016-08-18 14:26:53 +05:30
hasuniea
6db619317c
fixing app-install issue
2016-08-17 15:29:51 +05:30
harshanl
2cb8f0b313
Fixed EMM-1392
2016-08-16 18:02:30 +05:30
harshanl
d81733a4d6
Removed unused class
2016-08-16 18:01:49 +05:30
kamidu
4506db3647
Fix notification view issue
2016-08-16 14:53:44 +05:30
kamidu
77a8fed7de
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-16 10:39:10 +05:30
hasuniea
5c57b664ad
fixing getAllActivity H2 issue
2016-08-16 09:57:32 +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
harshanl
d628699e8b
Fixed repeating task operations.
2016-08-15 20:58:04 +05:30
mharindu
af286b8aaf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-15 20:31:00 +05:30
mharindu
7346313d27
Modified scope management service
2016-08-15 20:30:45 +05:30
harshanl
2bf6f562df
Fixed repeating task operations.
2016-08-15 20:17:20 +05:30
kamidu
28760d2bee
Enable advanced search for devices
2016-08-15 18:05:10 +05:30
dilanua
b37687cb58
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-15 17:56:19 +05:30
dilanua
8cb26b3264
Fixing no api resource found issue: changing user credentials
2016-08-15 17:55:46 +05:30
ayyoob
a7c201363c
logged exception trace
2016-08-15 15:20:37 +05:30
ayyoob
442c2b86da
fixed formatting issues
2016-08-15 15:19:18 +05:30
ayyoob
892d5cee20
avoided lazy inialization
2016-08-15 15:13:39 +05:30
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
2016-08-15 13:59:30 +05:30
harshanl
671ba46fae
Removed unnecessary properties from EnrollmentInfo object
2016-08-15 13:44:10 +05:30
harshanl
d401741d9b
Fixed EMM-1492
2016-08-15 13:43:54 +05:30
Ace
e5a4c0f795
Adding role add/update/delete related changes
2016-08-15 11:37:57 +05:30
ayyoob
e45ba68a90
changing the context of device-types api
2016-08-13 10:54:32 +05:30
ayyoob
3b56668af0
merged with upstream
2016-08-13 10:47:18 +05:30
ayyoob
c04edef151
Added Certificate Configuration
2016-08-13 10:38:09 +05:30
dilanua
fcff1f0854
Fixing user menu reg exp issue
2016-08-12 20:00:46 +05:30
dilanua
106051a0a5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 17:57:49 +05:30
dilanua
e07991174d
Adding user password change UI
2016-08-12 17:57:28 +05:30
kamidu
83cbd56b03
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 17:41:33 +05:30
kamidu
0be419d6cc
Fix ui issues in device view section
2016-08-12 17:41:27 +05:30
dilanua
f71106d011
Fixing issues on Password Reset UI
2016-08-12 15:01:51 +05:30
dilanua
0836b2c99e
Fixing user create page QR-generation issues
2016-08-12 14:46:17 +05:30
kamidu
42b6882cc1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 14:32:12 +05:30
dilanua
73b4abc46b
Updating user remove UI
2016-08-12 14:24:38 +05:30
dilanua
4acfde1511
Adding user edit UI and fixes
2016-08-12 14:08:46 +05:30
kamidu
3219ac2101
Fixing the notification listing ui
2016-08-12 14:04:16 +05:30
dilanua
312f9d3f26
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 13:50:00 +05:30
dilanua
280c5e496d
Adding user edit UI and fixes
2016-08-12 13:49:38 +05:30
Ace
d8c6720857
Removing previous query
2016-08-12 13:44:26 +05:30
Ace
74b7af7be7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 13:40:57 +05:30
Ace
aa01c7a52e
Adding query improvements to activities retrieval query
2016-08-12 13:40:49 +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
ayyoob
217f541991
added certificate units
2016-08-12 12:27:14 +05:30
dilanua
b9efedfdbd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 11:27:01 +05:30
dilanua
632202899a
Fixing issues in bulk user invitations
2016-08-12 11:25:43 +05:30
harshanl
c448d915d8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 11:09:10 +05:30
ayyoob
058f9e4cfa
merged with origin
2016-08-12 10:52:56 +05:30
ayyoob
6f5d6abea3
updated device type label to defaul device type name
2016-08-11 23:41:52 +05:30
kamidu
9fde8c0442
Resolving conflicts
2016-08-11 19:08:12 +05:30
kamidu
120fe530ac
Fix the device view related issues
2016-08-11 19:05:03 +05:30
dilanua
d7eed8bc1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-11 18:43:16 +05:30
dilanua
0945c8f547
Adding user create UI
2016-08-11 18:42:53 +05:30
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-11 17:27:10 +05:30
hasuniea
ed5e954194
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-11 16:06:43 +05:30
hasuniea
349c3bdb63
fixing App Version not updating in portal after being initially set
2016-08-11 15:56:03 +05:30
dilanua
390d929e70
Adding policy priority UI
2016-08-11 15:49:45 +05:30
dilanua
352643a421
Changing deactivate-policy api method to PUT
2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae
Removed device search using roleName parameter.
2016-08-11 14:03:09 +05:30
Ace
e1c4305e73
Adding fixes to Activities retrival query
2016-08-11 13:00:14 +05:30
mharindu
f5609cc8ff
Adding carbon 4.4.7 migration changes
2016-08-11 12:19:05 +05:30
Ace
71709a800f
Adding group by function when retrieving operations
2016-08-11 11:13:04 +05:30
dilanua
4549452634
Updating getAllPolicies UI function with icon key
2016-08-11 11:04:34 +05:30
prabathabey
4c3211b079
Fixing issues in acitivity retrieval
2016-08-10 19:40:51 +05:30
dilanua
6e2249419d
Updating policy edit base UI
2016-08-10 18:50:20 +05:30
dilanua
0521f1a9dd
Updating policy view Base UI
2016-08-10 18:33:28 +05:30
harshanl
8fa311e119
Removed unnecessary properties from EnrollmentInfo object
2016-08-10 18:25:35 +05:30
prabathabey
90889824e3
Further improving the performance of activity info retrieval
2016-08-10 17:52:22 +05:30
prabathabey
c161d7b659
Adding indexes to improve performance of entity retrieval and fixing a sytax error in the SQL query used to retrieve activities
2016-08-10 15:01:11 +05:30
prabathabey
213836541f
Fixing missing columns returned in the query that returns the list of acitivities
2016-08-10 14:54:31 +05:30
prabathabey
3abe837de3
Improving retrieval of activities
2016-08-10 14:30:13 +05:30
prabathabey
fc5021a0d5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-10 14:24:33 +05:30
prabathabey
c7730adbcb
Improving the retrieval of activities
2016-08-10 14:24:21 +05:30
harshanl
eb801696bf
Fixed EMM-1492
2016-08-10 12:55:58 +05:30
harshanl
f82ce82648
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-10 11:14:53 +05:30
harshanl
08ff70bb3c
Refactored CertMgt component
2016-08-10 11:14:46 +05:30
Rasika Perera
c01db9c773
Replaced emm specific unit implementation with old generalized cdmf unit
2016-08-10 08:40:48 +05:30
Rasika Perera
bb526513e8
Removed enrollment url calculation
2016-08-10 08:33:28 +05:30
mharindu
55acb7e7d3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-09 19:08:24 +05:30
mharindu
bd41e4f4fb
Implemented scope based authorization in device-mgt UI module
2016-08-09 19:08:07 +05:30
madhawap
d0d101297f
changes to removeCertificate endpoint, fix for the jira EMM-1490
2016-08-09 11:27:04 +05:30
madhawap
f12d2a5d69
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-09 11:17:01 +05:30
madhawap
324e7fd4c6
changes to removeCertificate endpoint, fix for the jira EMM-1490
2016-08-09 11:16:37 +05:30
Ace
aa7d3385ce
Adding missed role-listing changes
2016-08-09 08:10:51 +05:30
Ace
c693a11d7c
Fixing user,device,role listing pages
2016-08-09 07:56:56 +05:30
mharindu
5bdb4630af
Fixed conflicts and merged
2016-08-08 19:38:49 +05:30
mharindu
734aaa8c9e
Fixed null pointer exception
2016-08-08 19:24:57 +05:30
mharindu
886e2e08f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-08 18:49:40 +05:30
hasuniea
48543862c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-08 18:28:49 +05:30
dilanua
952905c60d
Adding Policy Edit UI
2016-08-08 18:26:50 +05:30
mharindu
2e79dd290e
Modified scopes
2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678
adding security fixes
2016-08-08 18:05:12 +05:30
dilanua
fa0891d9a2
Adding Policy View UI
2016-08-08 14:23:11 +05:30
mharindu
acf6d7ecd7
Fixed conflicts and merged
2016-08-08 10:42:30 +05:30
dilanua
13126fe398
Adding policy create UI
2016-08-07 20:25:23 +05:30
dilanua
87cdfa209e
Updating policy management
2016-08-06 17:13:58 +05:30
harshanl
f1c1c67656
Removed unused policy.mgt module from device core bundle
2016-08-05 11:34:11 +05:30
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
2016-08-04 20:40:40 +05:30
harshanl
35ea88b9de
Fixed EMM-1476.
2016-08-04 20:39:31 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e
refactored general configuration
2016-08-03 17:23:16 +05:30
Prabath Abeysekara
cc90bef42b
Merge pull request #318 from Securepoint/master
...
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
eb5216091e
Fixed conflicts and merged
2016-08-03 12:36:56 +05:30
madhawap
5bd879545b
fix for the iOS device operations blocker
2016-08-02 19:45:39 +05:30
madhawap
2e71c21378
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 19:04:54 +05:30
madhawap
d315e739e4
fix for the iOS device operations blocker
2016-08-02 19:04:28 +05:30
kamidu
23fe8b1fdb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 18:51:55 +05:30
kamidu
160d8c2feb
Fix the policy create wizard ui issues
2016-08-02 18:51:31 +05:30
dilanua
2ec9f68135
Removing the deprecation of operation.js as it seems to have one dependancy to plugins
2016-08-02 18:47:14 +05:30
Rasika Perera
b8bf855378
Calculating enrollment url when generalConfig.host config exists
2016-08-02 15:48:04 +05:30
inoshperera
2e8df6a16a
Merge pull request #322 from charithag/master
...
Fix issues in sql statements
2016-08-02 14:33:30 +05:30
charitha
efcd5272d2
Fix issues in sql statements
2016-08-02 14:31:12 +05:30
harshanl
01e2408ece
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-02 13:48:49 +05:30
mharindu
34f1d9ee38
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-02 11:03:29 +05:30
kamidu
9510554f67
Fix the notification view internal server error issue
2016-08-02 00:05:23 +05:30
dilanua
c7f4bba8bf
Deprecating operation.js module from UI
2016-08-01 22:45:30 +05:30
dilanua
e125871de0
Adding business-controllers to UI Modules
2016-08-01 22:42:53 +05:30
harshanl
06f72c014e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-01 20:29:51 +05:30
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
2016-08-01 20:29:21 +05:30
dilanua
ec7f8ccd1f
disabling testing info logs at token-protected-service-invokers.js
2016-08-01 20:28:39 +05:30
dilanua
89cebcdb9e
Updating UI oauth module with suppressed warnings for verified, but unresolved variables and functions
2016-08-01 19:28:05 +05:30
dilanua
39b14c9bc5
Adding conf-reader to UI modules
2016-08-01 19:06:04 +05:30
dilanua
bbff93adcc
Updating token-handler-utils with suppressed warnings for java packg imports
2016-08-01 18:50:47 +05:30
mharindu
ccdcea0109
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-08-01 12:27:25 +05:30
dilanua
303f16e747
Deprecating obsolete UI functions - device.js
2016-07-31 11:15:40 +05:30
dilanua
bc4192280c
Updating OAuth UI Module
2016-07-30 20:38:32 +05:30
dilanua
020f35cb4e
Updating OAuth UI Module
2016-07-30 19:47:34 +05:30
dilanua
7017f6e32b
Updating OAuth module dependants
2016-07-30 13:52:44 +05:30
dilanua
032b5d129a
Adding OAUTH module to UI
2016-07-29 16:48:20 +05:30
dilanua
b86be8375c
Refactoring OAuth utilities at UI Layer
2016-07-29 15:41:43 +05:30
dilanua
70074e2f3e
Refactoring OAuth utilities at UI Layer
2016-07-29 15:37:27 +05:30
dilanua
76385a1c9b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-29 15:15:21 +05:30
dilanua
a4c5aa5951
Refactoring OAuth utilities at UI Layer
2016-07-29 15:15:02 +05:30
Milan Perera
59b862dfc7
Merge pull request #321 from ayyoob/com
...
few fixes in JWT Client
2016-07-29 15:00:52 +05:30
dilanua
f7509f698d
Removing obsolete UI modules
2016-07-29 14:51:37 +05:30
dilanua
2efdc30177
Refactoring OAuth utilities at UI Layer
2016-07-29 14:44:16 +05:30
mharindu
84090fb16c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-29 12:39:05 +05:30
ayyoob
c71e5ead00
few fixes in JWT Client
2016-07-29 12:05:23 +05:30
ayyoob
b57db836d3
removed error message
2016-07-28 16:16:52 +05:30
Milan Perera
c49dc435e1
Merge pull request #319 from ayyoob/transport
...
Updated grant type implementation
2016-07-28 14:14:03 +05:30
dilanua
4b39a877ad
Updating oauth token handlers
2016-07-28 13:49:27 +05:30
ayyoob
d5e756c205
Updated Grant Type Implementation
2016-07-27 14:43:44 +05:30
dilanua
1172e759ca
Deprecating serverAdress.js
2016-07-27 06:50:06 +05:30
prabathabey
5ed3174a28
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 23:37:48 +05:30
prabathabey
5adfab9f8a
Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API
2016-07-26 23:37:42 +05:30
Ace
07b12fe4ea
Bug fixes
2016-07-26 22:03:14 +05:30
Ace
0d94a293a4
Adding notification and fixing QR code
2016-07-26 20:57:38 +05:30
prabathabey
c63818b78f
Avoiding multiple device data getting retrieved upon the same id
2016-07-26 19:31:44 +05:30
prabathabey
e27905792f
Code cleanup
2016-07-26 19:14:43 +05:30
prabathabey
5bc7cf7c30
Simplifying operation management related implementations
2016-07-26 18:32:00 +05:30
dilanua
8550bcb145
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-26 17:36:14 +05:30
dilanua
d2ec81b12b
Refactoring oauth token handling functions and dependants
2016-07-26 17:35:50 +05:30
Ace
1ed0481ec3
Changing nav-bar base-unit implementation
2016-07-26 16:59:57 +05:30
mharindu
6e742ee6ac
Added scope beans
2016-07-26 16:40:04 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
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
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
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
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
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
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
Dulitha Wijewantha
03f323d6e2
Fixed a bug where getBoolean wasn't used
2016-07-18 12:29:58 +05:30
Ace
ca8859c80a
Fixing broken build due to new javax.xml imports
2016-07-18 09:09:29 +05:30
Timo Briddigkeit
ed07774552
Fixed literal string comparison.
...
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");
A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
mharindu
80f737822e
Fixed enrollment device mapping issue
2016-07-15 19:45:04 +05:30
Prabath Abeysekara
fbb09a7f58
Merge pull request #316 from xenobyte/master
...
Fixed predictable pseudorandom number generator
2016-07-15 13:17:23 +05:30
Timo Briddigkeit
0ac4752b2b
Fixed null pointer dereference
2016-07-15 09:47:08 +02:00
Timo Briddigkeit
0ea2c458e7
instanceof will return false for null references, the null check is not needed.
2016-07-15 09:39:50 +02:00
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
2016-07-15 09:26:27 +02:00
Ace
15ae91d1c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-15 11:59:42 +05:30
Ace
ca10ad53bb
Adding emm apis as common modules
2016-07-15 11:59:15 +05:30
prabathabey
40b43a8b97
DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it
2016-07-14 01:24:00 +05:30
Timo Briddigkeit
b674304087
Made constants real constant using final
2016-07-13 15:57:12 +02:00
Timo Briddigkeit
ee5b077e6a
Fixed various XML External Entity (XXE) attack vulnerabilities
2016-07-13 15:02:11 +02:00
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
2016-07-13 14:35:55 +02:00
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
2016-07-12 10:24:05 +05:30
mharindu
789086a667
Changed context paths
2016-07-12 01:31:35 +05:30
mharindu
0f904e21d8
Fixed conflicts and merged
2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08
[maven-release-plugin] prepare for next development iteration
2016-07-08 19:11:40 +05:30
Chatura Dilan
ffedcac543
[maven-release-plugin] prepare release v1.1.1
2016-07-08 19:09:55 +05:30
mharindu
79a6da82f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 18:39:10 +05:30
mharindu
c7eef634ac
Added send-invitation endpoint
2016-07-08 18:38:00 +05:30
dilanua
c61ef1c98e
Fixing issues of GET /compliance-data API
2016-07-08 18:01:10 +05:30
Ace
58666bc4b0
Adding device name url param for device search
2016-07-08 14:57:43 +05:30
madhawap
c3cbc5b4fb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-08 14:29:53 +05:30
madhawap
0b1e4ad86b
Updated permissions.xml according to new end-points
2016-07-08 14:29:29 +05:30
Ace
d58fb57f4e
Enabling device search for multiple params
2016-07-08 10:09:46 +05:30
madhawap
e52fed0b2d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 19:51:57 +05:30
madhawap
34354c032e
Added end-point to get devices enrolled under a specific user
2016-07-07 19:46:22 +05:30
prabathabey
68fbfaf346
Merge branch 'certmgt-postgresql'
2016-07-07 14:10:48 +05:30
prabathabey
ce2a801934
Fixing https://wso2.org/jira/browse/EMM-1448 which fixes issues while persisting certificates when PostgreSQL is used as the underlying certificate management repository database
2016-07-07 14:10:03 +05:30
prabathabey
6edfad5fb7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-07 13:10:30 +05:30
prabathabey
9aa54f2ead
Improving policy management functionalities to use deviceType in place of deviceTypeId for persisting policy information
2016-07-07 13:10:19 +05:30
Dilan U. Ariyaratne
73551590b9
Merge pull request #313 from madhawap/master
...
Added end point to get Compliance Data Of a Device
2016-07-07 11:16:09 +05:30
madhawap
09e2d2ecaf
Removing the internal status code added to the compliance data wrapper
2016-07-07 11:14:43 +05:30
madhawap
68b7d304a0
Added end point to get Compliance Data Of a Device
2016-07-06 18:40:49 +05:30
prabathabey
0125310440
Prepending the url template configured for updating notifications with a '/'
2016-07-05 15:39:50 +05:30
prabathabey
78057b2992
Adding an API to return the list of device types registered in the underlying device management platform
2016-07-05 15:09:11 +05:30
mharindu
d3982c9797
Modified API definitions
2016-07-04 19:26:15 +05:30
mharindu
cc5f677165
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-04 18:01:55 +05:30
mharindu
aa6085ac8c
Added scopes to APIs
2016-07-04 18:01:42 +05:30
hasuniea
282ac72249
adding SCEPManagerService to scep manager compenent
2016-07-04 17:58:14 +05:30
hasuniea
bbbbb28795
removing unused packages
2016-07-04 16:51:36 +05:30
hasuniea
911d5b5257
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-04 16:46:23 +05:30
hasuniea
bf58c0bec3
add package changes to appAuthenticatorFrameworkServiceComponent.java
2016-07-04 16:45:36 +05:30
mharindu
ff82accb48
added scopes to notification API
2016-07-04 14:11:51 +05:30
mharindu
60659ce15b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-04 14:09:44 +05:30
mharindu
fe28bc25f1
Refactored scopes
2016-07-04 14:06:30 +05:30
madhawap
c17dda082d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-07-04 13:38:55 +05:30
madhawap
2136ebbeee
changes to 'updateNotificationStatus' swagger annotations
2016-07-04 13:38:32 +05:30
hasuniea
646e8b68d8
remove unwanted package
2016-07-04 12:40:48 +05:30
hasuniea
54498f41cd
modifying scep utils
2016-07-04 12:24:28 +05:30
mharindu
ac75ff1d71
Fixed conflict and merged
2016-07-03 15:09:05 +05:30
mharindu
49623a4693
Implemented scope based authorization
2016-07-03 15:03:47 +05:30
Chatura Dilan
2befefc967
Added OS build date
2016-07-01 15:45:59 +05:30
madhawap
b55a164457
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:38:04 +05:30
madhawap
dbf938416b
added 'updateNotificationStatus' endpoint and minor formattings to swagger annotations
2016-06-30 20:24:01 +05:30
prabathabey
49ce42b797
Code cleanup
2016-06-30 18:19:11 +05:30
prabathabey
be7e63c390
merging rest-api-improvements branch to master
2016-06-30 16:40:15 +05:30
Chatura Dilan
23f5ca2ca5
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-06-30 15:12:01 +05:30
prabathabey
ed5d611c35
Code cleanup
2016-06-29 18:05:09 +05:30
prabathabey
f33ac36bfa
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-29 17:49:48 +05:30
prabathabey
37852051ff
Improving Device and Policy Management APIs and cleaning up code of Role and User Management APIs
2016-06-29 17:49:34 +05:30
Chatura Dilan
24b462f4f4
Added is-active field to the Application
2016-06-29 17:41:45 +05:30
mharindu
59028f9f09
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-06-28 17:23:47 +05:30
mharindu
5de4993319
Fixed URL tampering issue
2016-06-28 17:23:39 +05:30
Ace
cf887a2e93
Merging emm module changes to devicemgt iot app
2016-06-28 17:00:02 +05:30
Chatura Dilan
f100853031
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2016-06-28 16:59:14 +05:30
dilanua
d34f29ab46
Fixing device types not retrieving issue
2016-06-28 16:50:53 +05:30
Chatura Dilan
bb6d2f2012
Fixed user search
2016-06-28 16:47:16 +05:30
madhawap
d9b35c29cd
swagger annotation fix to policy 'apply-changes' end point
2016-06-28 15:04:04 +05:30
madhawap
88feb5a852
Add Pagination to Notification end points
2016-06-28 13:15:06 +05:30
prabathabey
624e7df688
Improving HTTP status code handling and the resource implementations
2016-06-27 16:28:49 +05:30
prabathabey
a23f44e682
Improving AcitivityManagement API implementation with proper error handling, etc
2016-06-27 15:04:15 +05:30
prabathabey
ad6b95ff62
Code cleanup
2016-06-27 14:45:43 +05:30
prabathabey
a46bd9194b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-27 14:20:55 +05:30
prabathabey
4236744d39
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
2016-06-27 14:20:38 +05:30
Dilan U. Ariyaratne
a278b788d6
Merge pull request #308 from madhawap/rest-api-improvements
...
added priorities end-point to PolicyManagement
2016-06-27 11:45:17 +05:30
madhawap
b50e007897
added /priorities end-point to PolicyManagement
2016-06-27 11:22:42 +05:30
madhawap
9c215c4ac9
added /priorities end-point to PolicyManagement
2016-06-27 10:51:09 +05:30
Ruwan
6ce7f8c65a
Merge pull request #307 from ayyoob/transport
...
Few changes added after testing with the cluster
2016-06-27 09:39:17 +05:30
ayyoob
ba6e202442
Few changes added after testing with the cluster
2016-06-27 00:12:46 +05:30
inoshperera
50009c7ac5
adding apply policy end point
2016-06-24 16:13:50 +05:30
inoshperera
16edca2aea
fixing ios enrollment issue by fetching the identity certificate from the header.
2016-06-24 13:57:48 +05:30
madhawap
ee11bde8b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-24 12:21:53 +05:30
madhawap
235d690f1e
Implemented 'offset' and 'limit' parameters to the 'operation' api
2016-06-24 12:19:32 +05:30
prabathabey
0c54753b34
Cleaning up UserManagementService API implementation
2016-06-22 15:31:55 +05:30
prabathabey
f1eca17991
Code cleanup
2016-06-22 14:57:12 +05:30
prabathabey
9a7286a84b
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
2016-06-22 14:52:59 +05:30
prabathabey
3813856be8
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
2016-06-22 14:52:19 +05:30
prabathabey
aeb4ad3295
Merging rest-api-improvements branch to master
2016-06-21 15:52:35 +05:30
geethkokila
c07914eb36
Adding the activity count for the activty paginantion
2016-06-21 12:56:57 +05:30
geethkokila
a67f432993
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-20 15:41:59 +05:30
geethkokila
236eb90ce2
Fixing the limit and offset for activity
2016-06-20 15:41:53 +05:30
madhawap
f2ab923df5
fix related to http status code in 'getDevices' endpoint
2016-06-20 12:17:59 +05:30
ayyoob
ebebca8573
Added support for push notification for xmpp, mqtt and few changes to the after testing
2016-06-20 02:33:59 +05:30
ayyoob
0c2de7965f
Added device scope validation
2016-06-20 02:33:17 +05:30
madhawap
ea56d4ced3
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-17 17:37:23 +05:30
madhawap
015ca0575e
added 'updatedTimeStamp' to the Activity get response
2016-06-17 17:36:50 +05:30
ayyoob
1373e995fb
added support to load device type configuration in base ui
2016-06-17 17:21:39 +05:30
dilanua
1513c6cf8a
Adding isActive property to PolicyWrapper
2016-06-17 12:05:35 +05:30
madhawap
7cdb7dcee1
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-17 10:14:21 +05:30
dilanua
0eed97e84c
Adding API for getting device types
2016-06-15 14:21:31 +05:30
madhawap
b3f95d19c1
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-15 12:05:44 +05:30
inoshperera
96eb71314b
Merge pull request #297 from madhawap/rest-api-improvements
...
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-14 18:49:01 +05:30
madhawap
d7b860b955
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-14 18:09:16 +05:30
madhawap
59119f9167
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-14 18:08:43 +05:30
ayyoob
7b2c04152f
changed the UI calls from tomcat to apimgt gateway
2016-06-14 15:49:34 +05:30
Ace
7b62d2769e
Changing response code returned when adding user
2016-06-14 15:28:59 +05:30
madhawap
3d416da6fe
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
2016-06-14 12:03:14 +05:30
geethkokila
626142a59b
Fixing the isssue in retrieving the device info
2016-06-14 10:47:07 +05:30
Ace
016414c076
Bug fixes for role search
2016-06-13 15:43:21 +05:30
geethkokila
d6501cbf8c
Fixing the device search issues
2016-06-13 10:15:26 +05:30
hasuniea
629a0103d9
renaming scep web app
2016-06-10 09:39:39 +05:30
hasuniea
81aae9716d
fixing certmgt issue
2016-06-09 14:16:02 +05:30
hasuniea
ec3d032bc5
fixinf code issues
2016-06-09 10:07:01 +05:30
hasuniea
6471055c3f
add refactored stuff
2016-06-09 10:00:35 +05:30
ayyoob
b94eed267c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
2016-06-08 22:41:04 +05:30
ayyoob
52e84273d1
added profile check before publishing apis
2016-06-08 22:38:49 +05:30
Shabirmean
adec5cc303
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-06-08 12:01:32 +05:30
Sahan Kariyawasam
35f43a60e7
Added Dashboard server url property
2016-06-07 19:18:03 +05:30
geethkokila
1fabb0eee3
Fixing the database syncing issue
2016-06-07 12:55:15 +05:30
Shabirmean
a55dc9bce8
Adding necessary imports for the Certificate generation from CSR
2016-06-07 09:29:54 +05:30
Shabirmean
4380f7e242
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-06-06 19:13:56 +05:30
mharindu
de72cc21c6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-06-06 15:52:57 +05:30
mharindu
3858920d72
Changed HTTPS Url
2016-06-06 15:52:22 +05:30
ayyoob
bb051deebc
added https url for jaggery app deployment server
2016-06-06 13:55:05 +05:30
ayyoob
c5a997b1bf
added missing imports
2016-06-06 10:42:31 +05:30
mharindu
a80ca2d696
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-06-06 09:10:07 +05:30
GPrathap
efb71d472a
changing sso default state
2016-06-05 23:21:39 +05:30
GPrathap
e23044d59d
fixing jira:IOTS-195
2016-06-05 23:15:54 +05:30
mharindu
f7c653b61c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-04 11:33:37 +05:30
mharindu
9eb2f5df86
Fixed foriegn key violation issue when getting pending operations
2016-06-04 11:33:22 +05:30
madhawap
f80603a365
Fixes to if-modified-since in activity provider
2016-06-03 22:19:40 +05:30
Ace
4609888ad1
Fixes to ifmodified-since in activity provider
2016-06-03 21:03:29 +05:30
ayyoob
23ee3e25e7
updated the timestamp
2016-06-03 19:38:24 +05:30
geethkokila
42ce71da2c
Fixing the spelling mistake
2016-06-03 18:06:33 +05:30
geethkokila
6aea69ae44
Fixing the duplicate issue
2016-06-03 11:40:00 +05:30
geethkokila
efa74030b4
Fixing response duplicate issue
2016-06-03 10:25:22 +05:30
prabathabey
8819c6e36b
Adding support for 'If-Modified-Since' header and 'since' query filter
2016-06-03 04:35:22 +05:30
inoshperera
d71f0c6e6d
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-03 01:46:03 +05:30
inoshperera
037acbe5bb
fixing platform configuration appearing twice issue.
2016-06-03 01:43:21 +05:30
prabathabey
3c21583db6
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-02 23:45:04 +05:30
prabathabey
1a29a9f58f
Further fixing retrieving application list with device info
2016-06-02 23:44:46 +05:30
geethkokila
ae887d6842
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-02 23:10:18 +05:30
geethkokila
a04300b3b6
Fixing the activity Id issue
2016-06-02 23:09:55 +05:30
prabathabey
d3ce96585f
Fixing issues in returning application list in the device response
2016-06-02 22:45:44 +05:30
geethkokila
cc6883d955
Changing the if to a while loop, fixing the activity id issue
2016-06-02 22:26:19 +05:30
prabathabey
67c9ee0e70
Fixing commit conflict
2016-06-02 20:52:26 +05:30
prabathabey
b24250f3f2
Returning device info within the device bean itself
2016-06-02 20:49:23 +05:30
hasuniea
dc72fd1553
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-02 19:01:01 +05:30
hasuniea
e2cebcd430
removed If-Modified-Since header param
2016-06-02 19:00:41 +05:30
inoshperera
ee948abc9d
fixing conflicts and improving swagger annotations and validations
2016-06-02 18:44:26 +05:30
Shabirmean
cbd42d2026
Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR
2016-06-02 17:13:09 +05:30
inoshperera
5620e38681
adding proper error messages for APIs
2016-06-02 11:04:33 +05:30
prabathabey
92cf44380e
Adding validations to certificate deletion operation
2016-06-02 00:48:44 +05:30
prabathabey
fe22bfc125
Renaming 'recieved' to 'received'
2016-06-02 00:33:14 +05:30
prabathabey
d32cd96a74
Fixing merge conflicts
2016-06-02 00:28:47 +05:30
prabathabey
9ebf705323
Re-enabling retrieval of device info
2016-06-02 00:22:46 +05:30
prabathabey
e002ffb54a
Re-enabling retrieval of device info
2016-06-02 00:20:14 +05:30
dilanua
dada719486
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-01 15:59:14 +05:30
dilanua
0bd2a46690
Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
2016-06-01 15:58:45 +05:30
ayyoob
52c59c8e53
added permission updates on certificates
2016-06-01 12:39:38 +05:30
ayyoob
aa6298b5e7
updated device management admin api permission
2016-06-01 12:28:10 +05:30
ayyoob
d926bdaa34
removed unused permission from permission.xml
2016-06-01 12:20:18 +05:30
dilanua
07a4a65c7c
Fixing permission issues with GET /devices/*/*/features API
2016-06-01 11:14:17 +05:30
dilanua
25e45dc9f1
Fixing issues in GET /operations and /admin/devices APIs
2016-06-01 10:44:08 +05:30
mharindu
7a029743ba
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-01 02:18:53 +05:30
mharindu
81aa298740
Fixed RoleManagementService API issues
2016-06-01 02:18:15 +05:30
prabathabey
3cb9b5bae2
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-01 01:30:17 +05:30
prabathabey
61beca5048
Fixing getDevice method to support status, ownership, etc as query param filters
2016-06-01 01:30:02 +05:30
ayyoob
9f1de717c5
updated permissions in the permission.xml
2016-06-01 01:23:13 +05:30
mharindu
7aa37ff4d5
Fixed issues in RoleManagementService
2016-06-01 00:31:48 +05:30
mharindu
63ea40eb27
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-06-01 00:10:36 +05:30
mharindu
ce557266ec
Fixed issues in RoleManagementService
2016-06-01 00:10:30 +05:30
ayyoob
d9c15b62e7
few changes after testing user management api
2016-05-31 23:26:51 +05:30
Prabath Abeysekara
14322d4ba5
Merge pull request #283 from ayyoob/rest-api-improvements
...
fixed api issues in policy
2016-05-31 19:16:25 +05:30
ayyoob
5b8b15f69b
fixed api issues in policy
2016-05-31 19:12:58 +05:30
prabathabey
c9a2dc4399
Improving user management API implementation
2016-05-31 19:05:37 +05:30
prabathabey
627d99e913
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 18:36:13 +05:30
prabathabey
00a16ea2bc
Improving Role management API implementation
2016-05-31 18:36:00 +05:30
dilanua
4a74ea8100
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 18:34:07 +05:30
dilanua
374d509881
Updating DeviceManagementAdminServiceImpl
2016-05-31 18:34:00 +05:30
prabathabey
3e21c6d50d
Improving ceritificate management webapp impl
2016-05-31 17:49:26 +05:30
Ace
ddfd678b2a
Adding user management API bug fixes and improvements
2016-05-31 17:26:20 +05:30
Ace
d13368d144
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 17:17:20 +05:30
Ace
bfe215deac
Adding changes and bug fixes to UserMgtService
2016-05-31 17:13:11 +05:30
Milan Perera
289fef040b
Merge pull request #282 from ayyoob/rest-api-improvements
...
Rest api improvements in password reset
2016-05-31 17:13:11 +05:30
ayyoob
d63e5e876b
added password validation error msg
2016-05-31 17:09:34 +05:30
prabathabey
9c75252209
Updating permission.xml of certificate management admin service webapp with updated resource paths
2016-05-31 16:46:43 +05:30
prabathabey
d65174d026
making the certificate management war adhere the REST API guidelines
2016-05-31 16:27:35 +05:30
mharindu
cfe24229fc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-31 16:19:03 +05:30
prabathabey
f5aa2c5eb1
Improving swagger annotations added to certificate management service
2016-05-31 16:17:05 +05:30
prabathabey
1d4d0b7ae2
Improving certificate management webapp implementation
2016-05-31 16:13:45 +05:30
ayyoob
74a96015a7
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 13:57:54 +05:30
ayyoob
cf1e808cbd
refactored after testing UserAdminManangmentService
2016-05-31 13:57:38 +05:30
hasuniea
dfc673b08f
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 13:13:32 +05:30
hasuniea
1443c7757e
fixing code issues
2016-05-31 13:13:01 +05:30
prabathabey
9f48145614
Improving device admin service impl
2016-05-31 13:12:57 +05:30
prabathabey
697c727801
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-31 13:00:26 +05:30
prabathabey
fc3d6cccbf
Fixing Issues in notification management APIs
2016-05-31 12:49:51 +05:30
hasuniea
57d445237a
add certificateMgtService
2016-05-31 12:48:26 +05:30
charitha
92a732cd41
Moved redundant texts to constants
2016-05-31 11:30:36 +05:30
geethkokila
3defcfe20d
Fixing the applicationMgtAdminService for returing activity
2016-05-31 11:25:11 +05:30
charitha
e2c03adec4
FIx for https://wso2.org/jira/browse/IOTS-169
2016-05-31 11:14:37 +05:30
prabathabey
fbf213f77c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-30 17:47:14 +05:30
prabathabey
20fd2ec768
Improving application installation/uninstallation handling
2016-05-30 17:46:37 +05:30
hasuniea
9c3c08b4ca
fix UnAuthorizedDeviceAccessException.java
2016-05-30 17:15:21 +05:30
prabathabey
af58e5ec88
Code cleanup
2016-05-30 16:42:10 +05:30
prabathabey
5ed982beb4
Adding more improvements to the JAX-RS APIs of CDM-F
2016-05-30 16:40:57 +05:30
prabathabey
fd7a137b07
Improving jax-rs APIS of CDM-F
2016-05-30 13:39:52 +05:30
hasuniea
20343d9349
fixed swagger message issue
2016-05-30 13:03:21 +05:30
prabathabey
726a700528
Improving error handling in checking for monitoring frquency
2016-05-30 11:45:02 +05:30
prabathabey
6e5148a374
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
2016-05-30 08:21:59 +05:30
mharindu
71eb657e52
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-28 21:05:09 +05:30
prabathabey
54f9d02ebb
Code cleanup
2016-05-28 11:10:22 +05:30
prabathabey
77d4c167af
code cleanup
2016-05-28 08:31:20 +05:30
geethkokila
b7da99a621
Adding activity apis to get the updated once after a given time
2016-05-28 08:25:27 +05:30
prabathabey
2925f52cd8
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-28 08:12:19 +05:30
prabathabey
6d50ba14b1
Code cleanup
2016-05-28 08:11:51 +05:30
inoshperera
db3dc0517b
adding activity status related details.
2016-05-28 07:48:45 +05:30
prabathabey
e1dfecb518
Changing the value of If-Modified-Since header as a string
2016-05-28 06:41:26 +05:30
prabathabey
76ec7bdc28
Improving swagger metada
2016-05-28 06:03:47 +05:30
prabathabey
425c0e7498
Improving swagger annotations of CDM-F core APIs further
2016-05-28 04:52:00 +05:30
geethkokila
ed0da9e1d0
Fixing the device informations to get the applications
2016-05-28 03:12:10 +05:30
prabathabey
95458ce9b0
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-28 02:04:31 +05:30
prabathabey
d92fb53dc9
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
2016-05-28 02:04:02 +05:30
geethkokila
ecc8b5e6f2
Fixing the api issues
2016-05-28 02:02:43 +05:30
geethkokila
0221782533
Adding new apis for getting the device location when list of device identifiers are supplied
2016-05-28 01:57:36 +05:30
geethkokila
62c84319d8
Fixing the device search for application list
2016-05-28 01:15:52 +05:30
prabathabey
88cab5abf5
Fixing commit conflicts
2016-05-28 01:01:47 +05:30
prabathabey
37aa05f79c
Committing improved swagger annotated cdm-f APIs
2016-05-28 00:55:25 +05:30
dilanua
f4f47cbfdd
Changing view names to fix oracle naming issues in dashboard analytics feature
2016-05-28 00:41:21 +05:30
geethkokila
6328d35797
Changing the device info object by adding the application list
2016-05-28 00:19:04 +05:30
Madhawa Perera
4b128a6ebd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-27 22:15:53 +05:30
Madhawa Perera
d805245ffc
added username field to the device certificate db and related changes
2016-05-27 22:15:21 +05:30
Hasunie
981db24ca8
Merge pull request #279 from hasuniea/master
...
add certificate feature
2016-05-27 19:48:49 +05:30
inoshperera
3c73217e96
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
2016-05-27 19:15:46 +05:30
hasuniea
271170c26e
refactored cert feature
2016-05-27 18:42:24 +05:30
inoshperera
1ffbb2183a
adding permissions for DM services
2016-05-27 14:20:10 +05:30
ayyoob
e03be5183d
updated JWT Authenticator implementation to support tenancy
2016-05-27 14:01:54 +05:30
prabathabey
0b9c64594c
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-27 12:29:01 +05:30
prabathabey
32cb32b706
modifying the name of the device management admin api war
2016-05-27 12:28:48 +05:30
inoshperera
4623fa2269
swagger annotations added to APIs
2016-05-27 11:55:58 +05:30
prabathabey
30f6fc53b5
Merging the latest changes introduced in master
2016-05-27 11:44:58 +05:30
prabathabey
ebefd60533
Renaming TenantConfiguration as PlatformConfiguration
2016-05-27 11:22:54 +05:30
ayyoob
c9cd051a6b
subscribed to super tenant apis
2016-05-27 02:20:15 +05:30
ayyoob
e8b9f03748
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-27 01:27:32 +05:30
Milan Perera
4462c353b4
Merge pull request #277 from ayyoob/transport
...
Fixed https://wso2.org/jira/browse/IOTS-177
2016-05-26 21:21:06 +05:30
geethkokila
86e564713d
Adding the changes for getting activity ids which are changes after a certain time
2016-05-26 21:16:01 +05:30
geethkokila
01e3cc4987
Fixing the activity related issues
2016-05-26 18:44:12 +05:30
hasuniea
ad7fa09e32
add certificate service
2016-05-26 18:11:07 +05:30
prabathabey
6d33d7036b
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-26 18:02:12 +05:30
prabathabey
0f5cf86d04
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
2016-05-26 18:00:45 +05:30
ayyoob
5532db6dd4
Fixed https://wso2.org/jira/browse/IOTS-177
2016-05-26 17:10:37 +05:30
inoshperera
aeec472805
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
2016-05-26 12:53:20 +05:30
inoshperera
2959c05e1a
adding swagger annotations for device and activity APIs.
2016-05-26 12:52:49 +05:30
mharindu
52388ed33d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-26 12:44:36 +05:30
mharindu
106be76118
Fixed issues of API publishing to gateway
2016-05-26 12:41:20 +05:30
hasuniea
c281b6a6f0
SCEP csr sign feature
2016-05-25 18:14:28 +05:30
hasuniea
7281abf876
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-25 18:11:29 +05:30
prabathabey
7e8f38cf16
Fixing conflicts while merging the latest changes in master
2016-05-25 17:59:12 +05:30
prabathabey
e7bf0c7658
Resolving conflicts caused by merging with the updates in master
2016-05-25 17:45:37 +05:30
prabathabey
8b9cf0da85
Resolving conflicts caused by merging with the updates in master
2016-05-25 17:37:21 +05:30
prabathabey
29b3b965b0
Making all CDM-F REST APIs compatible with the REST API specifications
2016-05-25 16:26:29 +05:30
Milan Perera
67e5a5a23a
Merge pull request #275 from GPrathap/master
...
added a bundleDef :net.minidev:json-smart
2016-05-25 14:56:36 +05:30
GPrathap
78475963e3
added entry for websocket url
2016-05-25 14:38:46 +05:30
inoshperera
deb4195f7a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-25 13:54:42 +05:30
hasuniea
ad1a4cbd6a
fixed code conflicts
2016-05-25 13:51:46 +05:30
hasuniea
e2e517d7ca
SCEP endpoint
2016-05-25 13:44:42 +05:30
inoshperera
a40e44899a
syncing REST apis of core and product EMM
2016-05-25 12:38:24 +05:30
Ruwan
98f8ace1ff
Merge pull request #274 from rasika90/master
...
Adding licence headers for server-side handlebar templates
2016-05-25 11:45:12 +05:30
geethkokila
c64a6e0ec5
Changing apis to return activity when an operation is added
2016-05-25 11:42:44 +05:30
Rasika Perera
d7f4a39075
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-25 11:34:51 +05:30
Rasika Perera
b879927dc1
Adding licence headers for handlebar templates
2016-05-25 11:28:24 +05:30
geethkokila
afba711969
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-25 08:16:14 +05:30
dilanua
7530a98f6b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-24 18:27:06 +05:30
dilanua
339512e287
Updating comments in dashboard analytics feature
2016-05-24 18:26:47 +05:30
inoshperera
d7fe6d5e96
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-24 17:46:17 +05:30
Milan Perera
356c8f125e
Merge pull request #273 from ayyoob/transport
...
added webapp publisher missing bundle
2016-05-24 15:44:17 +05:30
ayyoob
feaf6b2b35
added webapp publisher missing bundle
2016-05-24 15:35:48 +05:30
dilanua
4663d78060
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-23 17:14:52 +05:30
dilanua
47e17e4a51
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
2016-05-23 17:14:29 +05:30
mharindu
50d35a90f8
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-23 16:51:38 +05:30
mharindu
66ccad65cf
Partial commit for APIM Gateway migration
2016-05-23 16:51:26 +05:30
inosh
1341884957
resolving conflicts
2016-05-23 14:14:05 +05:30
inosh
60b42715d6
syncing admin api from product emm
2016-05-23 14:11:25 +05:30
geethkokila
16b809b255
Fixing the conflicts
2016-05-23 11:21:48 +05:30
geethkokila
1697a7ce85
Doing a partial commit for syncing the code base
2016-05-23 11:19:37 +05:30
geethkokila
ba25ecc6ef
Doing a partial commit for syncing the code base
2016-05-23 11:19:22 +05:30
Prabath Abeysekara
830b3fc075
Merge pull request #272 from wso2/release-1.1.0
...
Release 1.1.0 and upgrading the versions
2016-05-23 10:08:13 +05:30
dilanua
8c4752ede3
Adding more comments to dashboard analytics data service interface
2016-05-22 16:54:07 +05:30
dilanua
975a3b915f
Properly layering beans and custom exceptions in dashboard analytics feature
2016-05-22 08:12:25 +05:30
dilanua
a7c7452e2e
Adding final updates to dashboard analytics feature
2016-05-20 17:10:37 +05:30
mharindu
3e291c5b13
[maven-release-plugin] prepare for next development iteration
2016-05-20 16:43:16 +05:30
mharindu
9549ac446b
[maven-release-plugin] prepare release v1.1.0
2016-05-20 16:43:02 +05:30
mharindu
65612f724f
Fixed compile issue
2016-05-20 16:02:56 +05:30
mharindu
8746c228f3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-20 15:53:06 +05:30
mharindu
2dbcf86f3d
Added retrying mechanism to webapp publisher
2016-05-20 15:52:50 +05:30
prabathabey
9ec80bfe18
Fixing build failures caused by changed introduced to Operation Management APIs
2016-05-20 12:43:47 +05:30
dilanua
b9a9fb3169
Adding class & method comments, constants to dashboard analytics feature
2016-05-19 12:37:12 +05:30
Ace
083e0f6eaa
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-19 08:22:54 +05:30
Ace
ecd386adf0
Fixing IOTS-160
2016-05-19 08:22:29 +05:30
ayyoob
e8a66a7a37
resolved build issue
2016-05-19 02:46:05 +05:30
mharindu
52b300c06a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-19 00:42:27 +05:30
mharindu
968cb00f35
Fixed conflicts and merged
2016-05-19 00:42:14 +05:30
sumedharubasinghe
ae93e0c9a7
Merge pull request #268 from ayyoob/transport
...
resolving create application issues
2016-05-19 00:40:20 +05:30
mharindu
83c2a1f0ee
Fixed issues in api publishing
2016-05-19 00:30:41 +05:30
ayyoob
8a38abbae6
resolving create application issues
2016-05-19 00:26:34 +05:30
prabathabey
5e03c5ed30
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-19 00:20:57 +05:30
prabathabey
a375252a94
Adding pluggable push notification framework
2016-05-19 00:20:45 +05:30
Ruwan
99c2446dc8
Merge pull request #267 from charithag/master
...
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
2016-05-19 00:14:33 +05:30
charitha
7eb111078a
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
2016-05-19 00:07:40 +05:30
sumedharubasinghe
067f0a8050
Merge pull request #266 from ayyoob/transport
...
added api application registration filter
2016-05-18 23:17:43 +05:30
mharindu
bca1b4b059
Fixed conflicts
2016-05-18 22:01:38 +05:30
mharindu
9f93570b29
Fixed issues in webapp-publisher
2016-05-18 22:00:16 +05:30
ayyoob
ba47af3186
added api application registration filter
2016-05-18 19:33:04 +05:30
dilanua
7051af8d80
Adding relevant contextual names for database view names in dashboard analytics feature
2016-05-18 18:48:43 +05:30
geethkokila
958288f8ec
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-18 14:57:01 +05:30
geethkokila
c7dd386c94
Adding new apis for device informations
2016-05-18 14:56:46 +05:30
dilanua
2886ead44b
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
2016-05-18 14:26:43 +05:30
mharindu
49cb4787c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-18 11:49:35 +05:30
mharindu
82b90522a0
Migrated to APIM 5.0.4
2016-05-18 11:49:20 +05:30
sumedharubasinghe
61ef87c658
Merge pull request #265 from rasika90/IOTS-114
...
Fixing IOTS-114: the user is unable to deselect a child node permissions
2016-05-18 11:26:18 +05:30
Rasika Perera
bc3f64a77a
Fixing IOTS-114: the user is unable to deselect a child node permissions
2016-05-18 11:24:38 +05:30
charitha
075b5a8901
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
2016-05-18 10:10:21 +05:30
sumedharubasinghe
6a69a3a895
Merge pull request #261 from charithag/master
...
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
2016-05-18 02:20:00 +05:30
sumedharubasinghe
2f6c1dfbdd
Merge pull request #263 from ayyoob/transport
...
few fixes in JWT client after testing with multi tenancy
2016-05-18 02:18:33 +05:30
ayyoob
c0240c5cbc
few fixes in JWT client after testing with multi tenancy
2016-05-18 02:09:12 +05:30
charitha
aadf87e5d9
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
2016-05-17 23:33:33 +05:30
Rasika Perera
be970bfc9d
Fixing IOTS-117 Domain needs to be marked as a mandatory field
2016-05-17 23:05:32 +05:30
mharindu
89026c2b7f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-17 20:33:23 +05:30
charitha
6dc0a9dd38
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
2016-05-17 18:40:39 +05:30
mharindu
894e11c1c4
Fixed the JWT verifier issue
2016-05-17 15:39:16 +05:30
mharindu
9ebf2ab6d9
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
2016-05-17 15:33:17 +05:30
charitha
ddc47cd862
Fix for https://wso2.org/jira/browse/IOTS-161
2016-05-17 14:25:28 +05:30
charitha
0ccaa9fe81
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
2016-05-17 13:57:47 +05:30
mharindu
5ccc480ddb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-17 12:25:57 +05:30
mharindu
efc9fc3265
Fixed conflicts
2016-05-17 08:58:54 +05:30
mharindu
16a8f61f79
Refactored jwt authenticator
2016-05-17 08:48:55 +05:30
dilanua
d5950afe7a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-17 05:55:05 +05:30
dilanua
c90f4471a8
Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
2016-05-17 05:54:40 +05:30
charitha
9480c71522
Fixed script error
2016-05-16 21:57:48 +05:30
charitha
e0fc7c4018
Fix for https://wso2.org/jira/browse/IOTS-110
2016-05-16 21:01:33 +05:30
ayyoob
cbdf5dd175
added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504
2016-05-16 20:41:30 +05:30
ayyoob
2ceff61811
refactors jet authenticator to pick tenant specific key store
2016-05-16 19:44:31 +05:30
charitha
81524ae32c
Fix for https://wso2.org/jira/browse/IOTS-156
2016-05-16 18:37:49 +05:30
mharindu
ace6c2dbfc
Fixed issues in JWT Authenticator
2016-05-16 18:13:00 +05:30
charitha
3d9ae8d1f6
Fix for https://wso2.org/jira/browse/IOTS-152
2016-05-16 17:50:58 +05:30
charitha
e7c5ef78d0
Removed unnecessary jaggery apis
2016-05-16 17:03:36 +05:30
mharindu
b77f5358e8
Removed external dependancies from webapp publisher component
2016-05-16 14:23:52 +05:30
mharindu
83ec18c38d
Removed external dependancies from webapp publisher component
2016-05-16 14:20:34 +05:30
mharindu
c68b92c7b4
Fixed conflicts
2016-05-16 14:12:28 +05:30
mharindu
9a4b904702
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
2016-05-16 11:55:35 +05:30
mharindu
659cdcc50c
Implemented extended scope validator and improved webapp publisher to support Synapse
2016-05-16 11:47:04 +05:30
mharindu
f2ac5c5cad
Implemented extended scope validator and improved webapp publisher to support Synapse
2016-05-16 11:46:30 +05:30
Ruwan
8f0840e3df
Merge pull request #254 from ayyoob/transport
...
updated authentication in api
2016-05-15 20:07:02 +05:30
ayyoob
168033b19d
updated authentication in api
2016-05-15 17:46:13 +05:30
charitha
685c52a453
Bug fixes
2016-05-15 13:13:30 +05:30
Ace
cbc505c459
changing profile name
2016-05-15 01:35:57 +05:30
Ace
4517a7f1aa
Making API publish destination configurable and other changes
2016-05-15 01:15:11 +05:30
Ace
6d9f2f92a4
Making API publish destination configurable
2016-05-15 01:12:45 +05:30
ayyoob
b3075cf1bc
removing application related roles
2016-05-14 00:10:39 +05:30
ayyoob
51d46213c2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
2016-05-13 15:03:11 +05:30
charitha
973e1ce40f
Fix issues in group api
2016-05-13 13:52:35 +05:30
charitha
0a838923cb
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/api/Group.java
2016-05-13 12:43:53 +05:30
Madhawa Perera
43648e4692
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-13 08:07:44 +05:30
Madhawa Perera
b5741b420c
Adding swagger annotations to beans
2016-05-13 08:07:28 +05:30
prabathabey
71180e686e
Improving swagger annotations
2016-05-13 07:39:09 +05:30
prabathabey
a0dbb25824
Fixing code conflicts and improving swagger annotations
2016-05-13 07:12:03 +05:30
Madhawa Perera
e75afb8020
Adding swagger annotations to beans
2016-05-13 07:07:55 +05:30
ayyoob
48912a05bb
merged with upstream
2016-05-13 05:23:19 +05:30
prabathabey
9e4b4d2205
Improving swagger annotations
2016-05-13 04:02:42 +05:30
ayyoob
bee9a106cc
removed method and type from feature
2016-05-13 02:53:08 +05:30
Madhawa Perera
94aacb1625
Adding swagger annotations to beans
2016-05-13 02:38:10 +05:30
Madhawa Perera
fca80273bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-13 01:39:43 +05:30
Madhawa Perera
5d1bf67630
Adding swagger annotations to beans
2016-05-13 01:31:33 +05:30
inosh-perera
b2383617e1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-13 01:30:22 +05:30
inosh-perera
0cf0ec6e77
adding swagger annotations to APIs
2016-05-13 01:30:17 +05:30
Madhawa Perera
6227e93d2f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-13 01:25:44 +05:30
Madhawa Perera
087adafeb7
Adding swagger annotations to beans
2016-05-13 01:25:29 +05:30
geethkokila
ccea046240
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-13 01:10:10 +05:30
geethkokila
4e4e660fa1
Adding the swagger documentation to the activity id resource
2016-05-13 01:09:56 +05:30
Madhawa Perera
26c10f84ec
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-13 00:34:54 +05:30
Madhawa Perera
66c12a8b1c
Adding swagger annotations to beans
2016-05-13 00:34:38 +05:30
geethkokila
3bec779e0b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-13 00:27:27 +05:30
geethkokila
362cf40d85
Fixing the operation activity id issues
2016-05-13 00:25:13 +05:30
inosh-perera
797c7a02d0
adding swagger annotation to beans
2016-05-13 00:24:59 +05:30
Madhawa
07c5362104
Adding swagger annotations to beans and some modifications to api interfaces
2016-05-12 23:11:23 +05:30
mharindu
ed1eb217ea
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-12 23:03:15 +05:30
inosh-perera
c945d63038
fixing issues in swagger dependancy
2016-05-12 23:01:21 +05:30
Madhawa
85f485df4c
Few changes to interfaces with swagger annotations
2016-05-12 22:19:17 +05:30
Madhawa
b6e7827920
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-12 22:12:35 +05:30
Madhawa
fffc7f3205
Adding swagger annotations to beans
2016-05-12 22:12:23 +05:30
Hasunie
17f3a10ec4
Merge pull request #243 from hasuniea/master
...
added annotation for ConfigurationEntry
2016-05-12 22:04:56 +05:30
ayyoob
ec7727e8bf
removed method and type from features
2016-05-12 22:01:48 +05:30
mharindu
fd39b31369
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-12 22:00:24 +05:30
mharindu
1f21144668
Renamed EMM permission to CDMF
2016-05-12 22:00:15 +05:30
hasuniea
e633d28013
added annotation for ConfigurationEntry
2016-05-12 22:00:09 +05:30
Madhawa
ae13f7f889
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Adding swagger annotations to beans
2016-05-12 21:58:34 +05:30
Madhawa
707da02c7e
Adding swagger annotations to beans
2016-05-12 21:58:23 +05:30
Kasun Delgolla
da1a60615c
Merge pull request #239 from charithag/master
...
Fixed https://wso2.org/jira/browse/IOTS-104
2016-05-12 21:49:13 +05:30
hasuniea
e4dfe63548
code conflicts
2016-05-12 21:15:53 +05:30
hasuniea
1267db52ce
added swagger annotations for TenantConfiguration
2016-05-12 21:11:51 +05:30
Milan Perera
fb9c824e40
Merge pull request #241 from ayyoob/transport
...
Few fixes after testing
2016-05-12 20:26:56 +05:30
inoshperera
97db3e42d6
Merge pull request #242 from madhawap/master
...
Added swagger annotations to the interfaces
2016-05-12 20:24:42 +05:30
inosh-perera
5597c752ac
Adding sawgger annotations to admin Jax-rs apis.
2016-05-12 20:17:20 +05:30
Madhawa
783d5e1746
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
added swagger annotation to the interfaces
2016-05-12 20:17:09 +05:30
Madhawa
b407797ab0
added swagger annotation to the interfaces
2016-05-12 20:16:52 +05:30
ayyoob
34f1f4dfe2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
2016-05-12 13:41:08 +05:30
inoshperera
cdb91924e2
Merge pull request #240 from madhawap/master
...
Interfaces for the existing api classes in order to add swagger definitions
2016-05-12 11:37:43 +05:30
Madhawa
36c3a057dc
created interfaces for the api classes in order add swagger definitions
2016-05-12 11:25:20 +05:30
inosh-perera
db5dafa9e9
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-12 10:38:07 +05:30
inosh-perera
67b210fe86
adding mutual ssl support in clustered setup
2016-05-12 10:37:58 +05:30
Madhawa
f5915cbf5d
created interfaces for the api classes in order add swagger definitions
2016-05-12 10:32:49 +05:30
Madhawa
46e0c4ea8b
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
...
Created interfaces for the api classes in order to add swagger definitions.
2016-05-12 09:52:33 +05:30
Madhawa
7b04d9f0b0
created interfaces for the api classes in order add swagger definitions
2016-05-12 09:51:43 +05:30
ayyoob
ac587c3353
fixes after testing
2016-05-12 02:42:29 +05:30
dilanua
bb3bcdfd2d
Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
2016-05-11 20:01:02 +05:30
charitha
18957b0110
Add required jagerry modules for the app
2016-05-11 19:30:55 +05:30
charitha
0c8f1ce770
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-11 16:54:06 +05:30
charitha
73222e347b
Fixed https://wso2.org/jira/browse/IOTS-104
2016-05-11 15:59:35 +05:30
hasuniea
a675c02350
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-11 15:23:39 +05:30
dilanua
14c07846b2
Adding mssql support to dashboard analytics feature
2016-05-11 14:21:13 +05:30
prabathabey
285c870d6a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-11 12:40:28 +05:30
prabathabey
bc894f2517
Adding Swagger-annotation dependency to carbon-device-mgt
2016-05-11 12:38:15 +05:30
hasuniea
c98a162174
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-11 11:36:12 +05:30
mharindu
b58e2b13c6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-11 10:50:46 +05:30
mharindu
5ad8d2938e
Fixed issues of publishing APIs to synapse gateway
2016-05-11 10:50:32 +05:30
Ruwan
93b1d618b6
Merge pull request #237 from charithag/master
...
Enable group analytics
2016-05-10 21:45:39 +05:30
charitha
576a7d83ad
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-10 21:33:46 +05:30
charitha
7ff993a7b7
Enable group analytics
2016-05-10 21:31:51 +05:30
dilanua
4cabe359a0
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
2016-05-10 18:53:41 +05:30
dilanua
0534cd0a7e
Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
2016-05-10 18:52:44 +05:30
dilanua
adec59e934
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
2016-05-10 15:26:20 +05:30
dilanua
2a9e2a47e8
Adding inter-mediate code improvements to dashboard analytics feature
2016-05-10 07:26:49 +05:30
dilanua
0ab4035b37
Adding H2, MySQL Support for dashboard analytics feature
2016-05-09 12:33:11 +05:30
hasuniea
ddc87d6726
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-09 11:12:57 +05:30
dilanua
a23e578537
Adding inter-mediate development code bits for dashboard analytics feature
2016-05-08 17:43:05 +05:30
dilanua
17e958d838
Adding inter-mediate development code bits for dashboard analytics feature
2016-05-08 17:42:01 +05:30
ayyoob
0b6acdc929
Added file seperator
2016-05-08 02:44:24 +05:30
hasuniea
245e90e6f6
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-06 12:54:05 +05:30
dilanua
7b43d28298
Adding temporary development code bits for dashboard analytics feature
2016-05-06 12:54:04 +05:30
dilanua
d568c6e8bd
Adding temporary development code bits for dashboard analytics feature
2016-05-05 16:12:15 +05:30
dilanua
945e188917
Adding temporary development code bits for dashboard analytics feature
2016-05-05 12:03:11 +05:30
dilanua
82ffcb012b
Adding temporary development code bits for dashboard analytics feature
2016-05-05 11:51:31 +05:30
dilanua
9786908b35
Adding temporary development code bits for dashboard analytics feature
2016-05-05 11:49:09 +05:30
hasuniea
686774068a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-05 10:26:01 +05:30
Rasika Perera
18edc21a04
Adding group permissions validation for operations
2016-05-04 04:14:09 +05:30
Rasika Perera
5c680b3f65
Fixing issue on group permission validating
2016-05-04 04:13:39 +05:30
sumedharubasinghe
d7064c9230
Merge pull request #233 from ayyoob/das-ext
...
removed unused code
2016-05-04 03:14:35 +05:30
Charitha Goonetilleke
ca62c2ef73
Fix grouped device listing
2016-05-04 02:47:45 +05:30
Charitha Goonetilleke
e01b62086f
Fix parameter mismatch
2016-05-04 01:47:50 +05:30
ayyoob
442f8c38fe
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
2016-05-04 01:20:18 +05:30
ayyoob
5f302fce63
removed unused code and resolved host issues
2016-05-04 01:19:56 +05:30
Charitha Goonetilleke
8c62d9d64c
Add authorization check for shared devices in groups
2016-05-04 00:07:48 +05:30
Charitha Goonetilleke
92784120bd
Add group sharing UI functionality
2016-05-03 23:28:26 +05:30
Charitha Goonetilleke
d15e52491a
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
2016-05-03 19:57:36 +05:30
Rasika Perera
33eed1f6cd
Adding permissions for roles updating
2016-05-03 19:52:52 +05:30
Rasika Perera
b6c33a0aec
Fixing group roles listing
2016-05-03 19:49:09 +05:30
Charitha Goonetilleke
b705352fb7
Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt
2016-05-03 19:32:05 +05:30
Charitha Goonetilleke
f74a5b7a59
Merge remote-tracking branch 'rasika/master'
2016-05-03 19:31:31 +05:30
Rasika Perera
938eda7c46
Adding group permissions checking
2016-05-03 19:29:12 +05:30
Rasika Perera
9cb24d8cec
Adding enum to hold default role to default permissions mapping
2016-05-03 19:18:58 +05:30
Rasika Perera
142ab10eea
Code refactoring
2016-05-03 19:18:07 +05:30
hasuniea
5f8a41eb12
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-03 16:02:15 +05:30
Rasika Perera
64a262d3e4
Fixing 404 on groups listing
2016-05-03 15:34:50 +05:30
Rasika Perera
4eb588ac60
Group Constants moved to common
2016-05-03 14:37:34 +05:30
geethkokila
d32e822055
Fixing the shutdown errors
2016-05-03 14:10:30 +05:30
Rasika Perera
38cdd94f3c
Adding group permission checking for Device Access Authorizations
2016-05-03 00:33:19 +05:30
dilanua
af973dacc6
Adding temporary development code bits for dashboard analytics feature
2016-05-02 18:45:23 +05:30
Rasika Perera
07c0aa1045
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-02 18:12:03 +05:30
dilanua
d9015b92a0
Adding temporary development code bits for dashboard analytics feature
2016-05-02 15:27:32 +05:30
dilanua
c828a5264b
Adding temporary development code bits for dashboard analytics feature
2016-05-02 15:15:45 +05:30
geethkokila
a0d260e6a3
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-05-02 14:36:52 +05:30
geethkokila
e2d67fc92c
Adding the changes for device search
2016-05-02 14:36:14 +05:30
Kasun Delgolla
d1def26602
Committing group listing back end pagination UI
2016-05-02 12:56:22 +05:30
dilanua
f2f153a2b4
Adding temporary development code bits for dashboard analytics feature
2016-05-01 09:51:09 +05:30
geethkokila
f200f37c80
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-30 19:37:38 +05:30
geethkokila
f2128762f0
Adding the changes for removing repeated operations from pending operations, if same operation is added twice, are making them repeated, Device will not recieve them
2016-04-30 19:37:23 +05:30
inosh-perera
486190f182
adding more error logs for client certificate not present scenario
2016-04-30 14:44:22 +05:30
geethkokila
c0dd2c423e
Fixing the build failure on java 8
2016-04-29 22:44:01 +05:30
geethkokila
3396a5066d
Adding changes for the updated time of device info and device location
2016-04-29 22:30:07 +05:30
hasuniea
59f1d04c44
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-29 19:30:33 +05:30
geethkokila
d4f2a95972
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-29 17:35:13 +05:30
charithag
fd531555a3
Fix bugs
2016-04-29 13:34:46 +05:30
charithag
a2cb6937c1
Fix device listing page title
2016-04-29 12:46:53 +05:30
charithag
68361f01ed
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-29 12:30:00 +05:30
geethkokila
aa3e7a9eda
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-29 11:03:18 +05:30
dilanua
b8972c9019
Adding temporary development code bits for dashboard analytics feature
2016-04-29 05:40:34 +05:30
geethkokila
3dd830c7d0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 19:53:56 +05:30
geethkokila
6f9851413e
Adding the changes for operation activity id
2016-04-28 19:53:42 +05:30
dilanua
330e1a1e19
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 18:11:44 +05:30
dilanua
46117b4e84
Adding temporary development code bits for dashboard analytics feature
2016-04-28 18:10:52 +05:30
hasuniea
441d2e171f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 17:50:30 +05:30
mharindu
548f71ca2e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 16:43:24 +05:30
mharindu
c824e63f1e
Refactored and fixed findbug issues in OAuth extension
2016-04-28 16:43:13 +05:30
mharindu
04fa0f4874
Implemented new password grant handler
2016-04-28 14:50:52 +05:30
mharindu
6db9b21623
Code cleanup in webapp publisher
2016-04-28 14:49:34 +05:30
dilanua
49513ba79b
Adding temporary development code bits for dashboard analytics feature
2016-04-28 14:26:22 +05:30
dilanua
b9be51d50d
Adding temporary development code bits for dashboard analytics feature
2016-04-28 12:18:43 +05:30
mharindu
6f8bb64e1c
Fixed merge conflicts
2016-04-28 11:59:03 +05:30
mharindu
ffc7542d4d
Modified authorization to support API gateway
2016-04-28 11:36:34 +05:30
hasuniea
61e7324f41
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 10:49:48 +05:30
charithag
25ea00f26f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-28 08:02:55 +05:30
charithag
b1683c1ccb
Add capability to assign device in to a group and bug fixes
2016-04-28 08:01:46 +05:30
dilanua
053d14b317
Adding temporary development code bits for dashboard analytics feature
2016-04-28 06:28:13 +05:30
Ace
a06327b731
refactoring and bug fixes
2016-04-27 20:43:13 +05:30
geethkokila
5a77e08fd5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 17:57:05 +05:30
charithag
6e84f0a5a3
Fix font issue
2016-04-27 16:37:05 +05:30
charithag
2a006684cc
Fix formatting
2016-04-27 16:07:14 +05:30
charithag
fb52c5845d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 15:41:41 +05:30
charithag
bcbde92143
Update new analytics components.
2016-04-27 15:40:49 +05:30
dilanua
36e5357cfd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 15:21:30 +05:30
Ace
985d07cbc7
Cleaning up code
2016-04-27 14:53:12 +05:30
dilanua
2a55c50ad1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 13:58:58 +05:30
dilanua
2b62eac4f5
Adding temporary development code bits for dashboard analytics feature
2016-04-27 13:58:53 +05:30
charithag
1e709bc394
Update new analytics components and remove obsoletes.
2016-04-27 13:43:37 +05:30
geethkokila
4029c86da4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-27 10:26:51 +05:30
geethkokila
2fb42518b6
Adding the changes for the device group with policy.
2016-04-27 10:26:47 +05:30
charithag
f6281c8ef0
Add jax-rs endpoints to modify and remove devices.
...
Update clientside js to work with secured apis
2016-04-26 20:50:39 +05:30
Charitha Goonetilleke
15a6e4b63b
Fix formatting issues
2016-04-26 19:54:19 +05:30
charithag
d8a9b642ff
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-26 18:57:25 +05:30
charithag
42d11b9d78
Add tenant aware dynamic units routing
2016-04-26 18:56:41 +05:30
prabathabey
52b81dd3eb
Fixing compilation failures
2016-04-26 17:38:16 +05:30
prabathabey
f5f177a858
Wrapping all device provisioning related info in ProvisioningConfig
2016-04-26 17:16:48 +05:30
prabathabey
779ed5eac2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-26 16:43:45 +05:30
prabathabey
9068a3d893
Fixing compilation failures caused due to API changes
2016-04-26 16:40:30 +05:30
Prabath Abeysekara
6ddd5db8cc
Merge pull request #221 from ayyoob/das-ext
...
Added device type specific graph loader
2016-04-26 16:35:43 +05:30
prabathabey
2133762792
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-26 15:59:34 +05:30
prabathabey
95d3b97c5f
Code cleanup
2016-04-26 15:59:22 +05:30
ayyoob
e0f47cba19
Added device type specific graph loader
2016-04-26 15:58:21 +05:30
charithag
6d5635465e
Add missing UI functionalities
2016-04-26 15:49:44 +05:30
Ruwan
f04705dda5
Merge pull request #213 from charithag/patch-1
...
Fix formatting
2016-04-26 11:45:29 +05:30
charithag
61b43ce5d8
Rename packages in device mgt jax-rs apis
2016-04-26 11:42:51 +05:30
Rasika Perera
22031c476c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-26 11:36:03 +05:30
charithag
646d87968c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-25 22:37:34 +05:30
charithag
dfb7e9a9c8
Fix permissions
2016-04-25 22:36:41 +05:30
prabathabey
aef892fece
Code cleanup
2016-04-25 21:08:14 +05:30
prabathabey
a10a693507
Fixing find bugs reported issues
2016-04-25 21:07:57 +05:30
prabathabey
f2ba20baeb
Code cleanup
2016-04-25 20:42:10 +05:30
prabathabey
47572d08f5
Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
2016-04-25 20:29:11 +05:30
Rasika Perera
480d6d5b7e
Remove redundant log messages
2016-04-25 19:41:04 +05:30
geethkokila
4cf37bb16c
Fixing the compilation error on the proprietory plugins.
2016-04-24 08:54:31 +05:30
dilanua
7027a3553a
Adding temporary development code bits for dashboard analytics feature
2016-04-24 08:24:43 +05:30
dilanua
2f2e8f391a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-23 22:52:25 +05:30
dilanua
c3bc22519a
Adding temporary development code bits for dashboard analytics feature
2016-04-23 22:51:58 +05:30
ayyoob
5e1ad22480
few changes on download api
2016-04-23 20:30:14 +05:30
ayyoob
1c0807a513
added userstore null check for permission scope validator
2016-04-23 00:07:12 +05:30
ayyoob
9f98f538de
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
2016-04-22 20:59:23 +05:30
ayyoob
b99d10e075
few changes invoker util to support file downloading
2016-04-22 20:57:22 +05:30
dilanua
274aa0ecd3
Adding temporary development code bits for cdmf-product dashboard feature
2016-04-22 10:48:42 +05:30
hasuniea
a196cb93bc
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-22 09:33:18 +05:30
dilanua
a888cf39c0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-21 13:32:58 +05:30
Ruwan
c6fbc8f1fe
Merge pull request #216 from GPrathap/master
...
fixed some bugs which caused while enabling SSO in IoT Server
2016-04-20 23:48:48 +05:30
GPrathap
84492d70ac
added constants for authentications types
2016-04-20 22:10:04 +05:30
GPrathap
55a95cca86
bug fixes
2016-04-20 22:08:30 +05:30
Rasika Perera
8e7052e012
adding JSON strigify on payload if contentType is json
2016-04-20 22:03:01 +05:30
Rasika Perera
69e38b3c98
adding JSON strigify on payload if contentType is json
2016-04-20 22:02:31 +05:30
Rasika Perera
6ec5b7a85a
Reading Http Method from Features
2016-04-20 13:42:25 +05:30
Rasika Perera
2d44ec234b
Now operations are auto generated and supports query params, path params and form params.
2016-04-20 13:38:36 +05:30
Rasika Perera
bb33b4ea12
Parameterizing Content-Type and Accept headers.
2016-04-20 13:37:42 +05:30
charithag
a5a1529853
Fix issues in device listing page and device details page
2016-04-19 14:54:37 +05:30
Charitha Goonetilleke
05858da548
Fix formatting
2016-04-18 18:31:15 +05:30
charithag
c0e4c6b461
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-18 17:59:59 +05:30
hasuniea
92fec891cf
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-18 17:48:14 +05:30
ayyoob
64bd0fc061
removed fix for web app publishing start up issue when synapse gateway is used
2016-04-18 17:16:51 +05:30
charithag
6d8c3e5315
Fix default permission issues
2016-04-18 16:44:03 +05:30
charithag
516155dae5
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
2016-04-18 16:39:35 +05:30
ayyoob
12db341d33
few changes on web app publisher after testing
2016-04-18 03:00:06 +05:30
ayyoob
d3418462d9
few changes in api manager application registration
2016-04-17 12:18:49 +05:30
ayyoob
9d4defaa01
check whether the subscriber exist before creating
2016-04-15 23:10:11 +05:30
ayyoob
afe965e787
adding code review changes on JWT and API App registration
2016-04-14 19:55:55 +05:30
dilanua
3daa42ca5d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-11 12:10:21 +05:30
hasuniea
30fff8fd1c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-11 09:41:52 +05:30
charithag
ab4b61401c
Fixing UI and implementation issues occurred after restructuring.
2016-04-08 16:19:15 +05:30
charithag
4a72c789f2
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-08 16:14:17 +05:30
charithag
0133cddc68
Fixing UI and implementation issues occurred after restructuring.
2016-04-08 16:12:37 +05:30
dilanua
c7af1a1e23
Adding temporary development code bits of dashboard analytics feature
2016-04-08 15:22:36 +05:30
dilanua
ce8d4b53a2
Adding temporary development code bits of dashboard analytics feature
2016-04-08 15:10:01 +05:30
Lakshman
993a387e7c
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-08 11:26:58 +05:30
hasuniea
0bbb1eacd1
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-08 11:02:21 +05:30
charithag
3dc23c5708
Fixing UI and implementation issues occurred after restructuring.
2016-04-07 20:41:10 +05:30
charithag
06a7fd2f1a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-04-07 11:56:14 +05:30
charithag
905f9ae4c1
Fixing UI issues occured after restructuring.
2016-04-07 11:55:48 +05:30
Kasun Delgolla
4e57e5bc85
Committing restructuring mdm-admin + UI merging style fixes
2016-04-07 10:42:56 +05:30
Lakshman
551aaf172b
formatting change
2016-04-06 19:32:41 +05:30
Lakshman
7174d000e0
override hash and equals function in Device to avoid duplicates in collections
2016-04-06 19:05:11 +05:30
hasuniea
abd018afd6
refactored imports in Certificate Generator
2016-04-04 14:24:40 +05:30
hasuniea
6ec710b250
merged code updates
2016-04-04 14:13:35 +05:30
Ruwan
a192bfa85c
Merge pull request #207 from rasika90/master
...
Adding uuf template app into cdmf-base-ui
2016-04-01 19:29:58 +05:30
Rasika Perera
3e34aeeff4
Fixing "Cannot write to cached file" issue
2016-04-01 18:00:22 +05:30
Rasika Perera
5911c873f3
Adding uuf template app
2016-04-01 15:06:32 +05:30
Kasun Delgolla
04de876265
Merge pull request #206 from charithag/master
...
Restructure group related UIs
2016-04-01 13:53:46 +05:30
charithag
99d004b6a6
Restructure group related UIs
2016-04-01 13:30:44 +05:30
Prabath Abeysekara
30e5666750
Merge pull request #205 from charithag/master
...
Refactor group management
2016-04-01 12:57:20 +05:30
geethkokila
d6923a1343
Fixing the issue in single condition
2016-04-01 00:25:09 +05:30
inosh-perera
9661502524
fixing issue with certificate delete
2016-03-31 20:08:20 +05:30
mharindu
afbfaf4c1d
Fixed for EMM-1305
2016-03-31 19:33:19 +05:30
mharindu
a3741bda7e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-31 19:32:10 +05:30
mharindu
a2a1e8115d
Fixed conflicts and merged
2016-03-31 18:45:52 +05:30
mharindu
72591eff44
Fixed modify enrollment bug
2016-03-31 18:44:55 +05:30
inosh-perera
f0fd86fcf7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-31 18:16:09 +05:30
inosh-perera
7cd1722829
making certificates searchable
2016-03-31 18:15:15 +05:30
geethkokila
7318502697
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-31 18:07:55 +05:30
geethkokila
e60a383f4d
Adding fixes to the device search
2016-03-31 18:07:05 +05:30
charithag
f6d224a623
Refactor group management
2016-03-31 17:50:29 +05:30
charithag
d22570dadb
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-31 16:57:21 +05:30
charithag
bf58342d81
Refactor group management
2016-03-31 16:27:53 +05:30
Prabath Abeysekara
f1081f7029
Merge pull request #204 from ayyoob/merge-latest
...
Merged device type multitenant implementation.
2016-03-31 16:27:35 +05:30
ayyoob
733884cba7
added web app tenant authorisation for tenant for non managed api scenario
2016-03-31 15:10:37 +05:30
ayyoob
3a3e9cc649
changed analytics components to released version
2016-03-31 05:55:03 +05:30
ayyoob
1b4a9227d8
merged web app publisher code and refactored jwt client extension to adhere to new artefact name
2016-03-31 04:24:30 +05:30
geethkokila
73a82f743f
Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes
2016-03-30 23:56:44 +05:30
ayyoob
83057acd9a
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
2016-03-30 23:42:47 +05:30
inosh-perera
41ba2f4f0a
adding database changes
2016-03-30 19:08:42 +05:30
geethkokila
fbc7c0807c
Skipping the validation of task operations
2016-03-30 14:10:17 +05:30
ayyoob
fc725fa767
removed analytics
2016-03-30 13:45:39 +05:30
ayyoob
81ae512f13
Merge pull request #6 from ayyoob/merge-devicetype
...
merge device type
2016-03-30 12:20:02 +05:30
ayyoob
026d4ef018
removed analytics
2016-03-30 12:17:46 +05:30
charithag
40f863fd57
Fix bundle imports for java 8
2016-03-30 10:00:56 +05:30
charithag
0a8e00fd1e
Merged with upstream and resolved conflicts.
2016-03-30 02:00:47 +05:30
charithag
3e4ccf6337
Add missing features and component from IoTS-1.0.0-M4
2016-03-30 01:44:04 +05:30
geethkokila
888971ae39
Fixing the oracl and postgres sql datasources and removing the start and end from the search context
2016-03-29 22:46:09 +05:30
charithag
2f0a3388a6
Implemented missing methods in group management.
2016-03-29 18:01:21 +05:30
geethkokila
aa63b5f592
Fixing the application memory usage and adding location based search
2016-03-29 17:48:36 +05:30
charithag
3fd141acdf
Add missing parts and test to group management.
2016-03-29 17:07:56 +05:30
charithag
d1ee1fd578
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-29 12:41:48 +05:30
charithag
fa2f61f48a
Add missing parts in group management
2016-03-29 12:41:38 +05:30
ayyoob
284a6645f0
import required packages
2016-03-29 12:07:58 +05:30
ayyoob
4554aadd82
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-29 11:42:14 +05:30
ayyoob
c45895685b
Added device type multi tenancy capability.
2016-03-29 11:40:58 +05:30
ayyoob
021378df3b
added org.wso2.carbon import package
2016-03-28 23:05:47 +05:30
ayyoob
e06565728e
removed duplicate imports and improper imports
2016-03-28 20:46:38 +05:30
charithag
062a843ca2
Fix for https://wso2.org/jira/browse/IOTS-99
2016-03-28 13:28:49 +05:30
prabathabey
ffbc0904a6
Fixing build failures caused by missing package imports
2016-03-27 21:51:45 +05:30
prabathabey
22e579ff15
Fixing build failures causde by missing references to certain packages
2016-03-27 21:17:05 +05:30
prabathabey
3a7ef33c16
Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup
2016-03-27 16:58:11 +05:30
prabathabey
284ca1b8e8
Removing obsolete source structures
2016-03-27 16:08:22 +05:30
prabathabey
12c4ba10af
Code cleanup
2016-03-27 16:04:15 +05:30
prabathabey
36161f6288
Merging extended device management functionalities
2016-03-27 16:02:40 +05:30
prabathabey
5e7985dae6
merging group-mgt implementation
2016-03-27 16:01:06 +05:30
prabathabey
b584131160
Fixing build failures in device.mgt.analytics.data.publisher bundle
2016-03-27 13:18:18 +05:30
prabathabey
85ecae22e0
Renaming backend-oauth-authenticator module to org.wso2.carbon.identity.authenticator.backend.oauth
2016-03-27 13:06:35 +05:30
prabathabey
3fa17c12a7
merging jwt client extension component
2016-03-27 13:02:35 +05:30
prabathabey
43926b64b4
Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher
2016-03-27 13:01:26 +05:30
prabathabey
1a43cf6a55
Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base
2016-03-27 03:06:39 +05:30
prabathabey
5dcd9dfe4a
Merging device analytics feature impl to master
2016-03-27 00:23:37 +05:30
prabathabey
e537e2d841
Adding device.mgt base ui framework
2016-03-25 14:46:19 +05:30
geethkokila
e9da24c9e8
Changing the snapshot versions from 1.0.4 to 1.1.0
2016-03-24 11:41:52 +05:30
geethkokila
3a3df04331
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-03-21 10:33:49 +05:30
geethkokila
41191d6df0
Adding the search feature to device mgt plugin
2016-03-21 10:33:35 +05:30
inosh-perera
ef117ffa74
adding mutual SLL authentication and certificate management DAOs
2016-03-17 14:14:59 +05:30
geethkokila
1826c9ee49
Doing a partial commit for pull
2016-03-14 12:02:36 +05:30
geethkokila
be890c2e9a
Doing a partial commit
2016-03-14 11:55:25 +05:30
geethkokila
7a809c1c01
Doing a partial commit
2016-03-14 11:48:43 +05:30
prabathabey
3726a57d96
Making email-sender a separate component and code cleanup
2016-03-13 00:51:54 +05:30
prabathabey
0b31042aa2
More improvements to the email sending functionality
2016-03-12 15:42:08 +05:30
prabathabey
535c74a962
Improving email sender functionality
2016-03-12 12:46:36 +05:30
hasuniea
0a1e11d192
fixed import issue
2016-02-24 07:46:53 +05:30
Kamidu Sachith
5fb94ebe0f
Code refractoring and Formatting
2016-02-12 20:56:30 +05:30
Prabath Abeysekara
a6905b52b1
Merge pull request #160 from hasuniea/master
...
Refactored certificateGenerator
2016-02-12 13:47:46 +05:30
hasuniea
4bafb72bb4
refcatored certificate Generator
2016-02-05 11:48:31 +05:30
Dileesha Rajapakse
8ac485d66d
Fixed Pagination issues in Device and Operation Oracle DAO classes
2016-02-02 17:53:47 +05:30
Dileesha Rajapakse
9204ed900d
Fixed Pagination issues in Oracle DAO classes
2016-02-02 16:37:26 +05:30
Kamidu Sachith
dda94437ee
code clean up and refactoring
2016-01-28 18:58:40 +05:30
Kamidu Sachith
370badf9d3
Preventing infromation leakage
2016-01-28 18:58:24 +05:30
geethkokila
e0e0a57c11
[maven-release-plugin] prepare for next development iteration
2016-01-05 18:15:38 +05:30
geethkokila
cebb88e712
[maven-release-plugin] prepare release v1.0.3
2016-01-05 18:15:28 +05:30
geethkokila
e66d291947
[maven-release-plugin] prepare for next development iteration
2015-12-30 14:19:05 +05:30
geethkokila
f416a73e75
[maven-release-plugin] prepare release v1.0.2
2015-12-30 14:18:57 +05:30
geethkokila
d0a2c5521c
Commenting this due to policy compliance warn will block the device
2015-12-24 11:09:32 +05:30
geethkokila
185a59fbd4
[maven-release-plugin] prepare for next development iteration
2015-12-23 22:39:29 +05:30
geethkokila
b3580d754b
[maven-release-plugin] prepare release v1.0.1
2015-12-23 22:39:20 +05:30
prabathabey
1fe9371558
Fixing https://wso2.org/jira/browse/EMM-1133
2015-12-23 21:41:10 +05:30
harshanl
402b843e5d
Updated task schedule service to fix EMM-1145, EMM-1100
2015-12-23 19:35:50 +05:30
prabathabey
cbee88c7d0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-23 18:14:42 +05:30
prabathabey
77c4c34858
Fixing https://wso2.org/jira/browse/EMM-1133
2015-12-23 18:13:39 +05:30
harshanl
8d4c09c20f
Fixed EMM-1139
2015-12-23 17:10:12 +05:30
prabathabey
e04a60104d
Improve logging in RemoteDCRClient
2015-12-23 16:55:35 +05:30
harshanl
9a7093a0f7
Fixed EMM-1146 issue
2015-12-23 15:29:45 +05:30
prabathabey
ed2fa14952
Fixing https://wso2.org/jira/browse/EMM-1135
2015-12-22 23:51:46 +05:30
prabathabey
7a27e88551
Changing the log levels configured in log4j.properties files used as part of test configurations
2015-12-22 22:43:26 +05:30
inosh-perera
6d7f024e8e
fixing java 8 build brake due to missing null check
2015-12-22 19:23:52 +05:30
geethkokila
4e9255fbc9
[maven-release-plugin] prepare for next development iteration
2015-12-22 08:28:42 +05:30
geethkokila
ceb60adb34
[maven-release-plugin] prepare release v1.0.0
2015-12-22 08:28:33 +05:30
harshanl
d1cb7a3df2
Merge branch 'hasuniea-master'
2015-12-22 07:40:55 +05:30
hasuniea
1b51ad0228
refactored csr request authentication
2015-12-22 06:58:48 +05:30
prabathabey
8578ff60ca
Fixing the issue where client type is not honoured in dynamic client registration service
2015-12-22 06:15:55 +05:30
Dilshan Edirisuriya
094423e0b9
Fixing EMM-1129
2015-12-21 23:11:29 +05:30
prabathabey
2b0e1eecab
Committing logic that stores BST within request metadata
2015-12-21 22:50:30 +05:30
prabathabey
7e65b837d1
Committing logic that stores BST within request metadata
2015-12-21 22:48:47 +05:30
harshanl
bb9e07b742
Fixed BSTValidator
2015-12-21 21:41:34 +05:30
prabathabey
ed8242fc66
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 20:22:14 +05:30
prabathabey
a7b447b7db
Adding BST authenticator
2015-12-21 20:21:51 +05:30
Kamidu Sachith
6b2c3289dd
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 17:39:08 +05:30
Kamidu Sachith
c6e2c01caa
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 16:45:52 +05:30
Kamidu Sachith
2d23eb86eb
Improve runtime performance
2015-12-21 16:38:42 +05:30
pasinduj
8628e5e523
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 15:03:46 +05:30
pasinduj
c7b53f7110
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 14:44:23 +05:30
harshanl
a61fe6171a
Refactored pagination code
2015-12-21 14:22:09 +05:30
prabathabey
67e1bfb012
Making attribute names schema compliant and code cleanup
2015-12-21 12:23:59 +05:30
prabathabey
0cdc139a0b
Adding updated webapp authenticator config
2015-12-21 11:57:50 +05:30
prabathabey
edf21ae5c8
Improving performance of token validation service invocation
2015-12-21 11:33:22 +05:30
prabathabey
11957f1e47
Pooling OAuth token validator stub initialization
2015-12-21 11:00:42 +05:30
pasinduj
08387e178d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-21 09:37:21 +05:30
prabathabey
b5b4e50b25
Revert "Improving performance of webapp authenticator valve implementation"
...
This reverts commit 36462e2e4e
2015-12-19 13:28:24 +05:30
prabathabey
337afa5da2
Revert "Further optimizing webapp authenticator valve implementation"
...
This reverts commit 262e53ddcc
2015-12-19 13:27:45 +05:30
prabathabey
262e53ddcc
Further optimizing webapp authenticator valve implementation
2015-12-19 13:09:31 +05:30
prabathabey
28a2e918e7
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-19 12:07:19 +05:30
prabathabey
36462e2e4e
Improving performance of webapp authenticator valve implementation
2015-12-19 12:07:08 +05:30
Dileesha Rajapakse
b25438097e
Fixed issues in EnrollmentDAOImpl
2015-12-18 23:26:01 +05:30
Harshan Liyanage
c600b2a3c9
Merge pull request #99 from Kamidu/master
...
Removing unwanted debug comments
2015-12-18 22:40:13 +05:30
harshanl
6441c201e5
Added search support for pagination
2015-12-18 22:17:07 +05:30
Kamidu Sachith
230dbd1331
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-18 20:38:30 +05:30
Kamidu Sachith
057a55a3ab
Removing unwanted debug comments
2015-12-18 20:38:14 +05:30
Kasun Delgolla
773d78df3f
Merge pull request #98 from Kamidu/master
...
Code clean up and formatting
2015-12-18 18:12:07 +05:30
prabathabey
8585abff8d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-18 18:00:55 +05:30
prabathabey
05020c960d
Upgrading Carbon kernel and identity versions
2015-12-18 17:59:42 +05:30
Kamidu Sachith
30768bba71
Code clean up and formatting
2015-12-18 17:54:50 +05:30
Kamidu Sachith
3fbc3ea40f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-18 15:26:45 +05:30
Kamidu Sachith
7b544f3545
Fix the disable failier of the authenticator
2015-12-18 15:26:26 +05:30
Dileesha Rajapakse
eb680da572
Fixed EMM-1103
2015-12-17 14:57:28 +05:30
harshanl
91ece82eca
Updated operation DAO to sort data in DESC order of timestamp.
2015-12-17 12:52:42 +05:30
pasinduj
3899e8779f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-17 11:50:21 +05:30
harshanl
d4b6ba5e36
Added pagination support for operation management apis.
2015-12-17 10:32:06 +05:30
pasinduj
ddefa19e0f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-17 09:41:19 +05:30
Kasun Delgolla
d5f87f4dc1
Committing policy compliance monitoring issue
2015-12-16 14:38:32 +05:30
pasinduj
9a50455a29
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-14 08:57:36 +05:30
harshanl
00cf61c44c
Fixed EMM-1069 and refactore DCR services
2015-12-11 20:04:22 +05:30
pasinduj
7be1de1b85
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-11 11:30:41 +05:30
harshanl
08ebd7f881
Added DCR proxy endpoint & refactored code.
2015-12-11 11:10:53 +05:30
geethkokila
93a295f8a7
Fixing the dynamic imports
2015-12-10 18:25:45 +05:30
harshanl
20a03c42fc
Merged with master
2015-12-10 16:52:35 +05:30
harshanl
89e6f0786d
Refactored dynamic-client module to use remote services.
2015-12-10 16:50:33 +05:30
pasinduj
a9a502ac74
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-10 09:15:17 +05:30
geethkokila
49ae3298f4
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
2015-12-09 20:06:28 +05:30
geethkokila
ba7acabb04
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-09 20:03:07 +05:30
geethkokila
865f5a500e
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
2015-12-09 20:02:58 +05:30
Kamidu Sachith
6f57200864
Hanlde dependancy in dynamic client registration by removing recursive dependancy
2015-12-09 14:40:33 +05:30
pasinduj
f49f13501f
modified dbscripts removing policy ID forigen key from one table
2015-12-08 15:35:01 +05:30
pasinduj
81911bace0
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-08 13:26:35 +05:30
pasinduj
a390df68ec
modified dbscripts to remove foriegn key reference
2015-12-08 11:42:04 +05:30
harshanl
92af749276
Fixed build break
2015-12-07 20:53:07 +05:30
harshanl
740124136b
Refactored backend oauth authenticator component and added logic to validate OAuth token from local & remote servers.
2015-12-07 20:25:47 +05:30
harshanl
5b9c44655d
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
2015-12-03 20:20:26 +05:30
harshanl
30e8dc885c
Fixed EMM-1034
2015-12-03 20:13:10 +05:30
pasinduj
9c7ebdafdb
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
2015-12-03 18:30:45 +05:30
inosh-perera
b5a6280c8d
refactoring comments
2015-12-03 11:28:12 +05:30
inosh-perera
d4403c6d87
adding new table to h2 script
2015-12-03 10:16:10 +05:30
inosh-perera
ff6e316406
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-12-02 07:55:58 +05:30
inosh-perera
3b1a3073f5
certificate persistance and ritrival from the database
2015-12-02 07:55:35 +05:30
harshanl
73906f7cda
Fixed EMM-1003
2015-11-30 22:20:33 +05:30
harshanl
d95a198ad6
Fixed EMM-1001
2015-11-30 19:56:47 +05:30
Kamidu Sachith
53064516d3
Fix for the Jira Issue EMM-989
2015-11-26 16:02:16 +05:30
Kamidu Sachith
8573a284e0
Enable Domain name in the invitation main
2015-11-26 11:39:11 +05:30
manoj
e1dc3d2ea3
add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation
2015-11-20 22:14:18 +05:30
manoj
99f82e4817
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-20 12:52:32 +05:30
harshanl
b4d17b888b
fixed secondary user-store related issues & multi-tenancy issues
2015-11-20 00:43:01 +05:30
geethkokila
c1eea6894d
Fixing the feature remove from the policy
2015-11-19 14:45:08 +05:30
manoj
a04658af14
App Manager integration
2015-11-19 10:21:59 +05:30
manoj
79c268cb41
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-19 10:18:01 +05:30
Dileesha Rajapakse
767ea70436
Refactored CommandOperation DAO class
2015-11-18 22:05:15 +05:30
Dileesha Rajapakse
8bd9295f81
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-17 19:28:40 +05:30
Dileesha Rajapakse
f3cfb79bac
Refactored Operation DAO classes
2015-11-17 19:28:32 +05:30
harshanl
f0471203e7
Added logic to skip device authorization for policy operations
2015-11-17 18:28:42 +05:30
Dileesha Rajapakse
6e95451f57
Refactored Operation DAO class
2015-11-17 17:26:55 +05:30
manoj
dbf8d13ced
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-17 16:15:24 +05:30
manoj
20db31c2a9
Add app manager features
2015-11-17 16:14:51 +05:30
Dileesha Rajapakse
825017a492
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-17 09:58:43 +05:30
Dileesha Rajapakse
4379232c25
Refactored Enrollment DAO class
2015-11-16 22:01:21 +05:30
harshanl
2fa99ac475
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 19:57:59 +05:30
harshanl
a3e20367f2
Fixed issue in Policy Task when DeviceAuthorization enabled.
2015-11-16 19:51:59 +05:30
geethkokila
271c4f76cb
Fixnig the null pointer isssue
2015-11-16 18:08:21 +05:30
geethkokila
700b308b45
Fixing the null pointer and removnig innactive devices being monitored
2015-11-16 17:44:30 +05:30
geethkokila
1989abf881
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 17:41:37 +05:30
geethkokila
fed4f72d4b
Fixing the null pointer
2015-11-16 17:41:07 +05:30
harshanl
1252d4c160
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 17:21:33 +05:30
geethkokila
0f146e83fa
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
2015-11-16 17:17:15 +05:30
geethkokila
813f9072d8
Fixing the database issue which causes the deviceids slelect did not work
2015-11-16 17:15:16 +05:30
Dileesha Rajapakse
f8a2117911
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 16:52:43 +05:30
Dileesha Rajapakse
6446be100d
Refactored Policy Management DAO classes
2015-11-16 16:49:35 +05:30
Dileesha Rajapakse
91d9db1ffa
Refactored ApplicationMapping and ProfileOperation DAO classes
2015-11-16 14:15:54 +05:30
Dilshan Edirisuriya
7023537fcd
Setting owner in authentication info
2015-11-16 13:49:02 +05:30
Dileesha Rajapakse
27254cc922
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 11:45:29 +05:30
harshanl
cb02c9da80
Fixed issues in DeviceAuthorization
2015-11-16 11:43:52 +05:30
Dileesha Rajapakse
6f0276ab2f
Modified Application Mapping DAO classes
2015-11-16 11:39:52 +05:30
Dileesha Rajapakse
7b2cfd69f5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-16 09:49:37 +05:30
harshanl
b9ca6705ae
Merged changes
2015-11-13 21:57:05 +05:30
harshanl
e14f09b8a8
Added requireDeviceAuthorization support
2015-11-13 21:33:33 +05:30
manoj
fdc4ad8e18
Set user level autherization is support by plugin or not
2015-11-13 21:29:47 +05:30
manoj
22c2da7fcb
Set user level autherization is support by plugin or not
2015-11-13 21:22:38 +05:30
manoj
dc2e41e083
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
2015-11-13 19:02:55 +05:30
manoj
adc3b652bf
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
2015-11-13 18:57:45 +05:30
Dileesha Rajapakse
786eb93bca
Refactored Operation DAO classes
2015-11-13 14:15:05 +05:30
Dileesha Rajapakse
123ea228ad
Refactored Enrolment DAO class
2015-11-12 10:30:45 +05:30
Dileesha Rajapakse
72ffe4e4a4
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-12 09:04:56 +05:30
harshanl
5af6f314d0
Fixed EMM-939
2015-11-11 20:58:47 +05:30
Dileesha Rajapakse
1975821446
Refactored Device and Application DAO classes
2015-11-11 18:47:02 +05:30
Geeth
5fd9e87dc8
Merge pull request #44 from Kamidu/master
...
change the formatter
2015-11-10 20:35:58 +05:30
Kamidu Sachith
8953a61cc4
Enable Owneship type editing in policy
2015-11-10 20:17:59 +05:30
harshanl
5d107b0d56
Merged changes
2015-11-10 18:46:26 +05:30
harshanl
93e641893c
Merged changes
2015-11-10 18:31:02 +05:30
harshanl
026a7c187a
Fixed EMM-945, EMM-910, EMM-911, EMM-870
2015-11-10 18:17:34 +05:30
inosh-perera
4faa740c9d
Fixing JIRA EMM-947 - only the registered device types are returned to UI
2015-11-10 17:36:30 +05:30
Kamidu Sachith
d7c942f395
Enable ownership editing on the policy
2015-11-10 14:51:10 +05:30
Kamidu Sachith
4590de6a76
chenge the formatter
2015-11-04 15:12:23 +05:30
harshanl
c826be9b3e
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-03 18:59:26 +05:30
harshanl
74a3b0e346
Fixed EMM-910
2015-11-03 18:58:52 +05:30
geethkokila
30c53b7d14
Fixing the EMM-900, Ading the LB host name and port to the email url
2015-11-03 16:24:49 +05:30
harshanl
2b9239d208
Optimized the authenticator framework
2015-11-03 14:29:38 +05:30
harshanl
fa92aecf58
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-11-03 11:34:32 +05:30
harshanl
520c07693d
Added support for non-secured endpoints within a security enabled webapp
2015-11-02 20:45:43 +05:30
geethkokila
feab85796f
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
2015-11-02 19:44:52 +05:30
geethkokila
2479be9f5a
Fixing the email client issue
2015-11-02 19:37:21 +05:30
harshanl
6ebfbc4136
Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master
2015-10-30 18:34:16 +05:30
harshanl
c9ffedbac5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-10-30 18:29:53 +05:30
harshanl
8f982722fb
Added oauth response messages
2015-10-30 18:29:32 +05:30
geethkokila
20122b3f1e
Fixing the roles and users adding issue
2015-10-30 17:48:30 +05:30
Kasun Delgolla
c00b1ee713
Committing fix for JIRA- EMM-860
2015-10-29 20:46:48 +05:30
Kasun Delgolla
6f2d1ad065
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-29 20:45:29 +05:30
harshanl
7cdd262b91
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2015-10-29 17:53:18 +05:30
harshanl
7c0996270f
Fixed EMM-887
2015-10-29 17:53:09 +05:30
Kasun Delgolla
f519b7c029
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-29 15:46:41 +05:30
prabathabey
90240e7d3f
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
2015-10-29 14:11:24 +05:30
Kasun Delgolla
9fa7c16e54
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-29 10:41:34 +05:30
hasuniea
3de4718ab5
refactored certificate generator
2015-10-29 10:04:13 +05:30
harshanl
8a1dba166a
Updated FeatureMgr spec
2015-10-28 22:09:01 +05:30
Dilshan Edirisuriya
5c2b7c9624
Removing commons codec version
2015-10-28 20:06:10 +05:30
Dilshan Edirisuriya
bbc1132100
Commenting previous lines
2015-10-28 19:24:05 +05:30
Kasun Delgolla
efa90b244f
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-28 19:05:31 +05:30
Dilshan Edirisuriya
0b800b8615
Bug fixes
2015-10-28 18:49:47 +05:30
Kasun Delgolla
acdfc475be
Merge branch 'master' of github.com:wso2/carbon-device-mgt
2015-10-28 10:17:23 +05:30
