Commit Graph

1937 Commits

Author SHA1 Message Date
Rasika Perera
bc3f64a77a Fixing IOTS-114: the user is unable to deselect a child node permissions 2016-05-18 11:24:38 +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
Ruwan
3d870786ae Merge pull request #260 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
2016-05-17 18:57:32 +05:30
charitha
6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario 2016-05-17 18:40:39 +05:30
Ruwan
da4016499e Merge pull request #259 from charithag/master
Fix for IOTS-50, IOTS-112 & IOTS-161
2016-05-17 14:26:46 +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
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
Ruwan
270aaad575 Merge pull request #258 from charithag/master
Fixed script error
2016-05-16 22:01:30 +05:30
charitha
63fa672bb3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-16 21:58:05 +05:30
charitha
9480c71522 Fixed script error 2016-05-16 21:57:48 +05:30
sumedharubasinghe
4266532638 Merge pull request #257 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110
2016-05-16 21:37:58 +05:30
charitha
25cff47335 Moved email templates to emm base plugin as they are related to emm 2016-05-16 21:11:31 +05:30
charitha
e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110 2016-05-16 21:01:33 +05:30
Ruwan
5d822bb88a Merge pull request #256 from charithag/master
Bug fixes
2016-05-16 18:45:10 +05:30
charitha
81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156 2016-05-16 18:37:49 +05:30
charitha
3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:50:58 +05:30
Ruwan
9e5e8e49b6 Merge pull request #255 from charithag/master
Removed unnecessary jaggery apis
2016-05-16 17:13:03 +05:30
charitha
e7c5ef78d0 Removed unnecessary jaggery apis 2016-05-16 17:03:36 +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
sumedharubasinghe
ee29c5e9a8 Merge pull request #253 from charithag/master
Bug fixes
2016-05-15 13:15:35 +05:30
charitha
685c52a453 Bug fixes 2016-05-15 13:13:30 +05:30
Ruwan
080fd5ac97 Merge pull request #252 from ruwany/master
changing profile name
2016-05-15 01:36:45 +05:30
Ace
cbc505c459 changing profile name 2016-05-15 01:35:57 +05:30
Ruwan
e46ca67aa3 Merge pull request #251 from ruwany/master
Making device Type API deployment location configurable
2016-05-15 01:19:53 +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
Milan Perera
3bef5155e0 Merge pull request #250 from ayyoob/transport
removed method and type from feature definition
2016-05-14 11:36:35 +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
sumedharubasinghe
448178f88f Merge pull request #249 from charithag/master
Add required jagerry modules for the app
2016-05-13 14:25:44 +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
inoshperera
2512826c63 Merge pull request #248 from madhawap/master
Added swagger annotations to beans
2016-05-13 08:09:54 +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
inoshperera
bdc4fb5073 Merge pull request #247 from madhawap/master
Added swagger annotations to beans
2016-05-13 07:10:25 +05:30
Madhawa Perera
c531577535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
2016-05-13 07:08:11 +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
inoshperera
29093586e7 Merge pull request #246 from madhawap/master
Added swagger annotations to beans
2016-05-13 02:48:14 +05:30
Madhawa Perera
a76f8dfb8d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Added swagger annotations to beans
2016-05-13 02:38:22 +05:30
Madhawa Perera
94aacb1625 Adding swagger annotations to beans 2016-05-13 02:38:10 +05:30
inoshperera
50b5661a74 Merge pull request #245 from madhawap/master
Added swagger annotations to beans
2016-05-13 01:57:46 +05:30