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