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 |
|