Commit Graph

3078 Commits

Author SHA1 Message Date
Rasika Perera
d92c52b89b Adding cloud error pages for jaggery.conf 2017-02-14 19:49:41 +05:30
Rasika Perera
8931478a55 Moving error into common logic page. If in cloud mode; change "default": "uuf.page.error" into "default": "cdmf.page.error" in config.json 2017-02-14 19:38:11 +05:30
kamidu
aba4ceaf76 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-14 19:28:22 +05:30
kamidu
587f847934 ui improvements to device cloud 2017-02-14 19:28:09 +05:30
Milan Perera
28606f1729 Merge pull request #598 from ayyoob/210releasepatch
210releasepatch
2017-02-14 15:52:05 +05:30
Imesh Chandrasiri
c26d7fd15d Changed device loading icon for device loading page 2017-02-14 15:15:38 +05:30
Imesh Chandrasiri
dcb29b7792 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-14 14:48:48 +05:30
Imesh Chandrasiri
5a7fa99e0a Fix data table icon padding issue 2017-02-14 14:48:38 +05:30
Rasika Perera
fbae181f07 Fixing footer getting cluttered on /devicemgt/devices/search page 2017-02-14 14:46:17 +05:30
Imesh Chandrasiri
b579870672 Data table icon cursor added 2017-02-14 13:21:59 +05:30
Imesh Chandrasiri
23edb1de7a Model Popup title space issue fix 2017-02-14 10:23:58 +05:30
Imesh Chandrasiri
8bbb612de6 Fixing cloud header height issue and theme color 2017-02-13 16:06:28 +05:30
geethkokila
f3f7635d3b Fixing the task to get the only the device enrolled tenants 2017-02-13 12:34:09 +05:30
kamidu
8a07639d6b Fix responsive issue in clud header 2017-02-10 03:25:01 +05:30
kamidu
6e19ec31e3 fix url issues in the config.json 2017-02-10 02:47:25 +05:30
kamidu
b946eeae74 fix url issues in the config.json 2017-02-09 23:24:15 +05:30
kamidu
f772b35769 enable cloud related configurations to the devicemgt application 2017-02-09 20:15:49 +05:30
kamidu
4eaf2b41c8 enable cloud related configurations to the devicemgt application 2017-02-09 20:02:28 +05:30
ayyoob
dac7d3c1ee made device management to be default tag 2017-02-09 09:59:06 +05:30
ayyoob
67ae4c7c68 fixed api subscription issue 2017-02-09 09:11:22 +05:30
ayyoob
6c96d228ae added subscription fix 2017-02-09 03:02:56 +05:30
ayyoob
018b230b5a Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-08 13:12:30 +05:30
ayyoob
87910bc92b transferred mutual authenticator to jwt authenticator 2017-02-08 13:10:36 +05:30
kamidu
ddef86e226 stylish issues 2017-02-07 20:38:10 +05:30
kamidu
9cba33a6dc Modification to the header panel 2017-02-07 15:28:19 +05:30
kamidu
fd3ff5496c cloud relatd ui fixes 2017-02-06 17:23:28 +05:30
Kamidu Sachith Punchihewa
00b1f982c6 Update user-menu.hbs 2017-02-06 12:01:27 +05:30
ayyoob
ed7b67dd24 made it accept tenant domain as parameter 2017-02-06 03:47:27 +05:30
ayyoob
b7566f4e4a added artifact deployment support through UI 2017-02-05 17:51:48 +05:30
ayyoob
0999bb70a0 exposed artefact deployment through api
Merged Jasintha’s code
2017-02-05 17:51:15 +05:30
ayyoob
274d3e9aeb used jwt grant type instead of saml 2017-02-04 20:51:56 +05:30
Kamidu Sachith Punchihewa
559fe98cc9 Merge pull request #585 from wso2/master
Cloud ui fixes and the new master fixes
2017-02-03 17:24:49 +05:30
WSO2 Builder
54a278a1bc [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare for next development iteration 2017-02-03 16:08:26 +05:30
WSO2 Builder
3bc46c4d2d [WSO2 Release] [Jenkins #2086] [Release 2.0.15] prepare release v2.0.15 2017-02-03 16:08:12 +05:30
kamidu
befa75af9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-03 12:44:09 +05:30
kamidu
6af09cdd31 Remove the defaut black color for icons 2017-02-03 12:44:01 +05:30
WSO2 Builder
1bc8f5c28d [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare for next development iteration 2017-02-02 15:56:43 +05:30
WSO2 Builder
1483503790 [WSO2 Release] [Jenkins #2083] [Release 2.0.14] prepare release v2.0.14 2017-02-02 15:56:36 +05:30
Hasunie
54d0d7a5ee Merge pull request #582 from charithag/master-update-swagger-docs
Update swagger docs
2017-02-02 14:59:06 +05:30
kamidu
41fd402619 DIABLE CLOUD UI IN THE MASTER 2017-02-02 13:13:39 +05:30
kamidu
43b0d1f1ce Enable appstore and app publisher 2017-02-02 13:07:41 +05:30
Milan Perera
701d6e4522 Updated the snapshot version of intergration client 2017-02-01 12:55:56 +05:30
Milan Perera
a5f41ef734 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud 2017-02-01 12:14:59 +05:30
ayyoob
1387d326ca merged with origin 2017-02-01 00:08:14 +05:30
ayyoob
4ec7762a5c made it use the default saml grant type 2017-01-31 23:06:19 +05:30
Milan Perera
41353f8014 Fixed issues in scope validation feature 2017-01-31 16:37:33 +05:30
kamidu
4b396cf321 enable location without das 2017-01-31 13:41:49 +05:30
ayyoob
38f61adf94 few changes after testing multi tenancy 2017-01-30 22:14:26 +05:30
charitha
8e01a98ded Removed unused Dashboard API 2017-01-30 20:41:31 +05:30
charitha
423879bee7 Updated swagger docs 2017-01-30 20:41:05 +05:30
charitha
3cf797fba6 Removed hardcoded device types in swagger docs 2017-01-30 17:25:27 +05:30
WSO2 Builder
5dc55bb5b5 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare for next development iteration 2017-01-30 16:05:41 +05:30
WSO2 Builder
c7fe9c3a20 [WSO2 Release] [Jenkins #2076] [Release 2.0.13] prepare release v2.0.13 2017-01-30 16:05:29 +05:30
lakshani
3b32635cf9 removed unwanted new lines 2017-01-30 15:48:15 +05:30
lakshani
bbcdf7aeda removed unwanted new line 2017-01-30 07:54:43 +05:30
lakshani
26f2e2d2ae added role query param to getdevices restapis 2017-01-30 07:50:10 +05:30
WSO2 Builder
c17bead1fc [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare for next development iteration 2017-01-29 19:46:03 +05:30
WSO2 Builder
14100d3cc8 [WSO2 Release] [Jenkins #2069] [Release 2.0.12] prepare release v2.0.12 2017-01-29 19:45:51 +05:30
GPrathap
9cdcb58103 uncommenting required fields 2017-01-29 17:02:38 +05:30
GPrathap
e7e8cb62b6 fixing permission issue when viewing device analytics dashboard 2017-01-29 16:51:59 +05:30
GPrathap
47e6f6d292 adding username as parameter 2017-01-29 16:51:37 +05:30
Milan Perera
2b4a3cde61 Fixed conflicts and merged 2017-01-26 14:59:05 +05:30
Milan Perera
7ba1dc989a Implemented a scope delegation validator 2017-01-26 14:51:30 +05:30
Milan Perera
21d8d14b7e Fixed multy tenancy issues related to android device type 2017-01-26 14:50:12 +05:30
ayyoob
30119ff263 fixed data holder issue 2017-01-26 12:38:26 +05:30
geethkokila
713ddbf416 Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-01-26 12:08:10 +05:30
geethkokila
2988357eb9 Changing the task to run for all the tenants 2017-01-26 12:07:29 +05:30
ayyoob
0c4a78f3e9 fixed api Id issue for subscription 2017-01-26 00:02:17 +05:30
ayyoob
3c45f9af11 fixed api Id issue for subscription 2017-01-25 22:15:03 +05:30
ayyoob
159e067fed changed integration client version 2017-01-25 14:03:38 +05:30
ayyoob
b42505c1fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into release-2.0.y 2017-01-25 14:01:03 +05:30
ayyoob
1a7a215441 added missing license headers 2017-01-25 14:00:31 +05:30
ayyoob
1370b87618 fixed apim application issue 2017-01-25 09:24:23 +05:30
WSO2 Builder
cd7e0feaa6 [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare for next development iteration 2017-01-24 23:22:44 +05:30
WSO2 Builder
abb150d9bd [WSO2 Release] [Jenkins #2062] [Release 2.0.11] prepare release v2.0.11 2017-01-24 23:22:33 +05:30
ayyoob
7348ae2f2a resolved merge issues 2017-01-24 19:49:40 +05:30
ayyoob
3423ef025d merged with upstream 2017-01-24 19:39:49 +05:30
ayyoob
e74b4e23c4 removed apim dependency from cdmf 2017-01-24 19:32:59 +05:30
Milan Perera
e29aa58e19 Removed tenant domain from Basic Authenticator 2017-01-24 14:22:12 +05:30
WSO2 Builder
002fb8719b [maven-release-plugin] prepare for next development iteration 2017-01-23 20:24:47 +00:00
WSO2 Builder
04f32902fd [maven-release-plugin] prepare release v2.0.10 2017-01-23 20:21:44 +00:00
Rasika Perera
704680d68d Fixing null pointer when roles are not specified on creating new user 2017-01-24 01:54:37 +05:30
Rasika Perera
9a0ba9137b Fixed permissions issue on grouping 2017-01-23 16:24:20 +05:30
Rasika Perera
d723e22a8c Fixed roleUpdate issue 2017-01-23 14:35:03 +05:30
WSO2 Builder
5c207897ad [maven-release-plugin] prepare for next development iteration 2017-01-20 12:44:14 +00:00
WSO2 Builder
233d14edbd [maven-release-plugin] prepare release v2.0.9 2017-01-20 12:41:33 +00:00
Rasika Perera
8e6855a203 Adding DEFAULT_DEVICE_USER on adding user 2017-01-20 18:01:56 +05:30
Rasika Perera
5ce413012e Adding DEFAULT_DEVICE_USER and DEFAULT_DEVICE_ADMIN 2017-01-20 18:01:55 +05:30
Rasika Perera
5aa8776bfe Fixing iot.analytics.host%:%iot.analytics.https.host => iot.analytics.host%:%iot.analytics.https.port 2017-01-20 15:50:35 +05:30
Rasika Perera
42816101bb Merge pull request #566 from wso2/release-2.0.8
Release 2.0.8
2017-01-20 15:42:12 +05:30
Imesh Chandrasiri
3983780f7f Fix for multiple advance search element 2017-01-20 15:09:00 +05:30
Imesh Chandrasiri
a5d1f70c93 git status 2017-01-20 15:08:27 +05:30
Imesh Chandrasiri
ef80d62307 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-20 11:50:46 +05:30
Imesh Chandrasiri
9f262c1afb Message container markup fix for advance search 2017-01-20 11:50:39 +05:30
WSO2 Builder
eedecf00ed [maven-release-plugin] prepare for next development iteration 2017-01-19 23:23:04 +00:00
WSO2 Builder
ef57fc463b [maven-release-plugin] prepare release v2.0.8 2017-01-19 23:20:20 +00:00
Ayyoob Hamza
96f0c633d9 Merge pull request #563 from madhawap/release-2.0.x
parameterizing sso config
2017-01-20 01:05:19 +05:30
madhawap
348b349a37 parameterizing sso config 2017-01-20 00:27:36 +05:30
Rasika Perera
212cc52eb2 Merge pull request #562 from Kamidu/release-2.0.x
improvements for location view
2017-01-19 22:45:38 +05:30
kamidu
eb17093747 Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x 2017-01-19 22:37:19 +05:30