Commit Graph

4264 Commits

Author SHA1 Message Date
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
geethkokila
275f413652 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0 2017-02-03 16:20:11 +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 Sachith Punchihewa
5f8f4a82d1 Merge pull request #583 from Kamidu/master
cloud ui and enable location without das
2017-02-03 15:56:26 +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
charitha
c224fe7cab Fix https://wso2.org/jira/browse/IOTS-436 2017-02-02 19:28:07 +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
charitha
72ccc9d076 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-02 15:54:09 +05:30
charitha
79018f9a4c Fix https://wso2.org/jira/browse/IOTS-436 2017-02-02 15:52:41 +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
charitha
49465ee0c7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-02-02 14:56:16 +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
7cf6e6db7f Merge pull request #581 from milanperera/cloud
Merging changes of master to cloud branch
2017-02-01 15:10:40 +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
539e2ecfe5 Merge pull request #580 from milanperera/cloud
Fixed issues in scope validation feature
2017-01-31 16:39:11 +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
Hasunie
b8d9ec782a Merge pull request #578 from lakshani/rest-connector-3.1.0
removed unwanted new lines
2017-01-30 15:54:49 +05:30
lakshani
3b32635cf9 removed unwanted new lines 2017-01-30 15:48:15 +05:30
Chatura Dilan
56e4dfd743 Merge pull request #576 from lakshani/rest-connector-3.1.0
Added role query param to getdevices restapis
2017-01-30 10:34:44 +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
Rasika Perera
d1c34706f2 Merge pull request #575 from GPrathap/master
fixing permission issue when viewing device analytics dashboard
2017-01-29 19:33:02 +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
de47812d6d Merge pull request #573 from milanperera/cloud
Fixed multi tenancy issues related to android device type and implemented a scope validation delegator
2017-01-26 15:04:01 +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