madhawap
|
d9b35c29cd
|
swagger annotation fix to policy 'apply-changes' end point
|
2016-06-28 15:04:04 +05:30 |
|
madhawap
|
88feb5a852
|
Add Pagination to Notification end points
|
2016-06-28 13:15:06 +05:30 |
|
prabathabey
|
624e7df688
|
Improving HTTP status code handling and the resource implementations
|
2016-06-27 16:28:49 +05:30 |
|
prabathabey
|
a23f44e682
|
Improving AcitivityManagement API implementation with proper error handling, etc
|
2016-06-27 15:04:15 +05:30 |
|
prabathabey
|
ad6b95ff62
|
Code cleanup
|
2016-06-27 14:45:43 +05:30 |
|
prabathabey
|
a46bd9194b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-27 14:20:55 +05:30 |
|
prabathabey
|
4236744d39
|
Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
|
2016-06-27 14:20:38 +05:30 |
|
Dilan U. Ariyaratne
|
a278b788d6
|
Merge pull request #308 from madhawap/rest-api-improvements
added priorities end-point to PolicyManagement
|
2016-06-27 11:45:17 +05:30 |
|
madhawap
|
b50e007897
|
added /priorities end-point to PolicyManagement
|
2016-06-27 11:22:42 +05:30 |
|
madhawap
|
9c215c4ac9
|
added /priorities end-point to PolicyManagement
|
2016-06-27 10:51:09 +05:30 |
|
Ruwan
|
6ce7f8c65a
|
Merge pull request #307 from ayyoob/transport
Few changes added after testing with the cluster
|
2016-06-27 09:39:17 +05:30 |
|
ayyoob
|
ba6e202442
|
Few changes added after testing with the cluster
|
2016-06-27 00:12:46 +05:30 |
|
inoshperera
|
50009c7ac5
|
adding apply policy end point
|
2016-06-24 16:13:50 +05:30 |
|
madhawap
|
ee11bde8b0
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-24 12:21:53 +05:30 |
|
madhawap
|
235d690f1e
|
Implemented 'offset' and 'limit' parameters to the 'operation' api
|
2016-06-24 12:19:32 +05:30 |
|
prabathabey
|
0c54753b34
|
Cleaning up UserManagementService API implementation
|
2016-06-22 15:31:55 +05:30 |
|
prabathabey
|
f1eca17991
|
Code cleanup
|
2016-06-22 14:57:12 +05:30 |
|
prabathabey
|
9a7286a84b
|
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
|
2016-06-22 14:52:59 +05:30 |
|
prabathabey
|
3813856be8
|
Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
|
2016-06-22 14:52:19 +05:30 |
|
prabathabey
|
aeb4ad3295
|
Merging rest-api-improvements branch to master
|
2016-06-21 15:52:35 +05:30 |
|
geethkokila
|
c07914eb36
|
Adding the activity count for the activty paginantion
|
2016-06-21 12:56:57 +05:30 |
|
geethkokila
|
a67f432993
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-20 15:41:59 +05:30 |
|
geethkokila
|
236eb90ce2
|
Fixing the limit and offset for activity
|
2016-06-20 15:41:53 +05:30 |
|
madhawap
|
f2ab923df5
|
fix related to http status code in 'getDevices' endpoint
|
2016-06-20 12:17:59 +05:30 |
|
ayyoob
|
ebebca8573
|
Added support for push notification for xmpp, mqtt and few changes to the after testing
|
2016-06-20 02:33:59 +05:30 |
|
madhawap
|
ea56d4ced3
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-17 17:37:23 +05:30 |
|
madhawap
|
015ca0575e
|
added 'updatedTimeStamp' to the Activity get response
|
2016-06-17 17:36:50 +05:30 |
|
ayyoob
|
1373e995fb
|
added support to load device type configuration in base ui
|
2016-06-17 17:21:39 +05:30 |
|
dilanua
|
1513c6cf8a
|
Adding isActive property to PolicyWrapper
|
2016-06-17 12:05:35 +05:30 |
|
madhawap
|
7cdb7dcee1
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-17 10:14:21 +05:30 |
|
dilanua
|
0eed97e84c
|
Adding API for getting device types
|
2016-06-15 14:21:31 +05:30 |
|
madhawap
|
b3f95d19c1
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-15 12:05:44 +05:30 |
|
inoshperera
|
96eb71314b
|
Merge pull request #297 from madhawap/rest-api-improvements
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 18:49:01 +05:30 |
|
madhawap
|
d7b860b955
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-14 18:09:16 +05:30 |
|
madhawap
|
59119f9167
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 18:08:43 +05:30 |
|
ayyoob
|
7b2c04152f
|
changed the UI calls from tomcat to apimgt gateway
|
2016-06-14 15:49:34 +05:30 |
|
Ace
|
7b62d2769e
|
Changing response code returned when adding user
|
2016-06-14 15:28:59 +05:30 |
|
madhawap
|
3d416da6fe
|
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
|
2016-06-14 12:03:14 +05:30 |
|
geethkokila
|
626142a59b
|
Fixing the isssue in retrieving the device info
|
2016-06-14 10:47:07 +05:30 |
|
Ace
|
016414c076
|
Bug fixes for role search
|
2016-06-13 15:43:21 +05:30 |
|
geethkokila
|
d6501cbf8c
|
Fixing the device search issues
|
2016-06-13 10:15:26 +05:30 |
|
Sahan Kariyawasam
|
35f43a60e7
|
Added Dashboard server url property
|
2016-06-07 19:18:03 +05:30 |
|
mharindu
|
de72cc21c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-06-06 15:52:57 +05:30 |
|
mharindu
|
3858920d72
|
Changed HTTPS Url
|
2016-06-06 15:52:22 +05:30 |
|
ayyoob
|
bb051deebc
|
added https url for jaggery app deployment server
|
2016-06-06 13:55:05 +05:30 |
|
mharindu
|
a80ca2d696
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-06-06 09:10:07 +05:30 |
|
GPrathap
|
efb71d472a
|
changing sso default state
|
2016-06-05 23:21:39 +05:30 |
|
GPrathap
|
e23044d59d
|
fixing jira:IOTS-195
|
2016-06-05 23:15:54 +05:30 |
|
mharindu
|
f7c653b61c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-04 11:33:37 +05:30 |
|
mharindu
|
9eb2f5df86
|
Fixed foriegn key violation issue when getting pending operations
|
2016-06-04 11:33:22 +05:30 |
|
madhawap
|
f80603a365
|
Fixes to if-modified-since in activity provider
|
2016-06-03 22:19:40 +05:30 |
|
Ace
|
4609888ad1
|
Fixes to ifmodified-since in activity provider
|
2016-06-03 21:03:29 +05:30 |
|
ayyoob
|
23ee3e25e7
|
updated the timestamp
|
2016-06-03 19:38:24 +05:30 |
|
geethkokila
|
42ce71da2c
|
Fixing the spelling mistake
|
2016-06-03 18:06:33 +05:30 |
|
geethkokila
|
6aea69ae44
|
Fixing the duplicate issue
|
2016-06-03 11:40:00 +05:30 |
|
geethkokila
|
efa74030b4
|
Fixing response duplicate issue
|
2016-06-03 10:25:22 +05:30 |
|
prabathabey
|
8819c6e36b
|
Adding support for 'If-Modified-Since' header and 'since' query filter
|
2016-06-03 04:35:22 +05:30 |
|
inoshperera
|
d71f0c6e6d
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-03 01:46:03 +05:30 |
|
inoshperera
|
037acbe5bb
|
fixing platform configuration appearing twice issue.
|
2016-06-03 01:43:21 +05:30 |
|
prabathabey
|
3c21583db6
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-02 23:45:04 +05:30 |
|
prabathabey
|
1a29a9f58f
|
Further fixing retrieving application list with device info
|
2016-06-02 23:44:46 +05:30 |
|
geethkokila
|
ae887d6842
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-02 23:10:18 +05:30 |
|
geethkokila
|
a04300b3b6
|
Fixing the activity Id issue
|
2016-06-02 23:09:55 +05:30 |
|
prabathabey
|
d3ce96585f
|
Fixing issues in returning application list in the device response
|
2016-06-02 22:45:44 +05:30 |
|
geethkokila
|
cc6883d955
|
Changing the if to a while loop, fixing the activity id issue
|
2016-06-02 22:26:19 +05:30 |
|
prabathabey
|
67c9ee0e70
|
Fixing commit conflict
|
2016-06-02 20:52:26 +05:30 |
|
prabathabey
|
b24250f3f2
|
Returning device info within the device bean itself
|
2016-06-02 20:49:23 +05:30 |
|
hasuniea
|
dc72fd1553
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-02 19:01:01 +05:30 |
|
hasuniea
|
e2cebcd430
|
removed If-Modified-Since header param
|
2016-06-02 19:00:41 +05:30 |
|
inoshperera
|
ee948abc9d
|
fixing conflicts and improving swagger annotations and validations
|
2016-06-02 18:44:26 +05:30 |
|
inoshperera
|
5620e38681
|
adding proper error messages for APIs
|
2016-06-02 11:04:33 +05:30 |
|
prabathabey
|
fe22bfc125
|
Renaming 'recieved' to 'received'
|
2016-06-02 00:33:14 +05:30 |
|
prabathabey
|
d32cd96a74
|
Fixing merge conflicts
|
2016-06-02 00:28:47 +05:30 |
|
prabathabey
|
9ebf705323
|
Re-enabling retrieval of device info
|
2016-06-02 00:22:46 +05:30 |
|
prabathabey
|
e002ffb54a
|
Re-enabling retrieval of device info
|
2016-06-02 00:20:14 +05:30 |
|
dilanua
|
dada719486
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-01 15:59:14 +05:30 |
|
dilanua
|
0bd2a46690
|
Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
|
2016-06-01 15:58:45 +05:30 |
|
ayyoob
|
aa6298b5e7
|
updated device management admin api permission
|
2016-06-01 12:28:10 +05:30 |
|
ayyoob
|
d926bdaa34
|
removed unused permission from permission.xml
|
2016-06-01 12:20:18 +05:30 |
|
dilanua
|
07a4a65c7c
|
Fixing permission issues with GET /devices/*/*/features API
|
2016-06-01 11:14:17 +05:30 |
|
dilanua
|
25e45dc9f1
|
Fixing issues in GET /operations and /admin/devices APIs
|
2016-06-01 10:44:08 +05:30 |
|
mharindu
|
7a029743ba
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-01 02:18:53 +05:30 |
|
mharindu
|
81aa298740
|
Fixed RoleManagementService API issues
|
2016-06-01 02:18:15 +05:30 |
|
prabathabey
|
3cb9b5bae2
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-01 01:30:17 +05:30 |
|
prabathabey
|
61beca5048
|
Fixing getDevice method to support status, ownership, etc as query param filters
|
2016-06-01 01:30:02 +05:30 |
|
ayyoob
|
9f1de717c5
|
updated permissions in the permission.xml
|
2016-06-01 01:23:13 +05:30 |
|
mharindu
|
7aa37ff4d5
|
Fixed issues in RoleManagementService
|
2016-06-01 00:31:48 +05:30 |
|
mharindu
|
63ea40eb27
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-06-01 00:10:36 +05:30 |
|
mharindu
|
ce557266ec
|
Fixed issues in RoleManagementService
|
2016-06-01 00:10:30 +05:30 |
|
ayyoob
|
d9c15b62e7
|
few changes after testing user management api
|
2016-05-31 23:26:51 +05:30 |
|
Prabath Abeysekara
|
14322d4ba5
|
Merge pull request #283 from ayyoob/rest-api-improvements
fixed api issues in policy
|
2016-05-31 19:16:25 +05:30 |
|
ayyoob
|
5b8b15f69b
|
fixed api issues in policy
|
2016-05-31 19:12:58 +05:30 |
|
prabathabey
|
c9a2dc4399
|
Improving user management API implementation
|
2016-05-31 19:05:37 +05:30 |
|
prabathabey
|
627d99e913
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 18:36:13 +05:30 |
|
prabathabey
|
00a16ea2bc
|
Improving Role management API implementation
|
2016-05-31 18:36:00 +05:30 |
|
dilanua
|
4a74ea8100
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 18:34:07 +05:30 |
|
dilanua
|
374d509881
|
Updating DeviceManagementAdminServiceImpl
|
2016-05-31 18:34:00 +05:30 |
|
prabathabey
|
3e21c6d50d
|
Improving ceritificate management webapp impl
|
2016-05-31 17:49:26 +05:30 |
|
Ace
|
ddfd678b2a
|
Adding user management API bug fixes and improvements
|
2016-05-31 17:26:20 +05:30 |
|
Ace
|
d13368d144
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 17:17:20 +05:30 |
|
Ace
|
bfe215deac
|
Adding changes and bug fixes to UserMgtService
|
2016-05-31 17:13:11 +05:30 |
|
Milan Perera
|
289fef040b
|
Merge pull request #282 from ayyoob/rest-api-improvements
Rest api improvements in password reset
|
2016-05-31 17:13:11 +05:30 |
|
ayyoob
|
d63e5e876b
|
added password validation error msg
|
2016-05-31 17:09:34 +05:30 |
|
mharindu
|
cfe24229fc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-31 16:19:03 +05:30 |
|
prabathabey
|
1d4d0b7ae2
|
Improving certificate management webapp implementation
|
2016-05-31 16:13:45 +05:30 |
|
ayyoob
|
74a96015a7
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 13:57:54 +05:30 |
|
ayyoob
|
cf1e808cbd
|
refactored after testing UserAdminManangmentService
|
2016-05-31 13:57:38 +05:30 |
|
hasuniea
|
dfc673b08f
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 13:13:32 +05:30 |
|
hasuniea
|
1443c7757e
|
fixing code issues
|
2016-05-31 13:13:01 +05:30 |
|
prabathabey
|
9f48145614
|
Improving device admin service impl
|
2016-05-31 13:12:57 +05:30 |
|
prabathabey
|
697c727801
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-31 13:00:26 +05:30 |
|
prabathabey
|
fc3d6cccbf
|
Fixing Issues in notification management APIs
|
2016-05-31 12:49:51 +05:30 |
|
hasuniea
|
57d445237a
|
add certificateMgtService
|
2016-05-31 12:48:26 +05:30 |
|
charitha
|
92a732cd41
|
Moved redundant texts to constants
|
2016-05-31 11:30:36 +05:30 |
|
geethkokila
|
3defcfe20d
|
Fixing the applicationMgtAdminService for returing activity
|
2016-05-31 11:25:11 +05:30 |
|
charitha
|
e2c03adec4
|
FIx for https://wso2.org/jira/browse/IOTS-169
|
2016-05-31 11:14:37 +05:30 |
|
prabathabey
|
fbf213f77c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-30 17:47:14 +05:30 |
|
prabathabey
|
20fd2ec768
|
Improving application installation/uninstallation handling
|
2016-05-30 17:46:37 +05:30 |
|
hasuniea
|
9c3c08b4ca
|
fix UnAuthorizedDeviceAccessException.java
|
2016-05-30 17:15:21 +05:30 |
|
prabathabey
|
af58e5ec88
|
Code cleanup
|
2016-05-30 16:42:10 +05:30 |
|
prabathabey
|
5ed982beb4
|
Adding more improvements to the JAX-RS APIs of CDM-F
|
2016-05-30 16:40:57 +05:30 |
|
prabathabey
|
fd7a137b07
|
Improving jax-rs APIS of CDM-F
|
2016-05-30 13:39:52 +05:30 |
|
hasuniea
|
20343d9349
|
fixed swagger message issue
|
2016-05-30 13:03:21 +05:30 |
|
prabathabey
|
726a700528
|
Improving error handling in checking for monitoring frquency
|
2016-05-30 11:45:02 +05:30 |
|
prabathabey
|
6e5148a374
|
Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
|
2016-05-30 08:21:59 +05:30 |
|
mharindu
|
71eb657e52
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-28 21:05:09 +05:30 |
|
prabathabey
|
54f9d02ebb
|
Code cleanup
|
2016-05-28 11:10:22 +05:30 |
|
prabathabey
|
77d4c167af
|
code cleanup
|
2016-05-28 08:31:20 +05:30 |
|
geethkokila
|
b7da99a621
|
Adding activity apis to get the updated once after a given time
|
2016-05-28 08:25:27 +05:30 |
|
prabathabey
|
2925f52cd8
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-28 08:12:19 +05:30 |
|
prabathabey
|
6d50ba14b1
|
Code cleanup
|
2016-05-28 08:11:51 +05:30 |
|
inoshperera
|
db3dc0517b
|
adding activity status related details.
|
2016-05-28 07:48:45 +05:30 |
|
prabathabey
|
e1dfecb518
|
Changing the value of If-Modified-Since header as a string
|
2016-05-28 06:41:26 +05:30 |
|
prabathabey
|
76ec7bdc28
|
Improving swagger metada
|
2016-05-28 06:03:47 +05:30 |
|
prabathabey
|
425c0e7498
|
Improving swagger annotations of CDM-F core APIs further
|
2016-05-28 04:52:00 +05:30 |
|
geethkokila
|
ed0da9e1d0
|
Fixing the device informations to get the applications
|
2016-05-28 03:12:10 +05:30 |
|
prabathabey
|
95458ce9b0
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-28 02:04:31 +05:30 |
|
prabathabey
|
d92fb53dc9
|
Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
|
2016-05-28 02:04:02 +05:30 |
|
geethkokila
|
ecc8b5e6f2
|
Fixing the api issues
|
2016-05-28 02:02:43 +05:30 |
|
geethkokila
|
0221782533
|
Adding new apis for getting the device location when list of device identifiers are supplied
|
2016-05-28 01:57:36 +05:30 |
|
geethkokila
|
62c84319d8
|
Fixing the device search for application list
|
2016-05-28 01:15:52 +05:30 |
|
prabathabey
|
88cab5abf5
|
Fixing commit conflicts
|
2016-05-28 01:01:47 +05:30 |
|
prabathabey
|
37aa05f79c
|
Committing improved swagger annotated cdm-f APIs
|
2016-05-28 00:55:25 +05:30 |
|
dilanua
|
f4f47cbfdd
|
Changing view names to fix oracle naming issues in dashboard analytics feature
|
2016-05-28 00:41:21 +05:30 |
|
geethkokila
|
6328d35797
|
Changing the device info object by adding the application list
|
2016-05-28 00:19:04 +05:30 |
|
inoshperera
|
3c73217e96
|
fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
|
2016-05-27 19:15:46 +05:30 |
|
inoshperera
|
1ffbb2183a
|
adding permissions for DM services
|
2016-05-27 14:20:10 +05:30 |
|
prabathabey
|
0b9c64594c
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-27 12:29:01 +05:30 |
|
prabathabey
|
32cb32b706
|
modifying the name of the device management admin api war
|
2016-05-27 12:28:48 +05:30 |
|
inoshperera
|
4623fa2269
|
swagger annotations added to APIs
|
2016-05-27 11:55:58 +05:30 |
|
prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
2016-05-27 11:44:58 +05:30 |
|
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
2016-05-27 11:22:54 +05:30 |
|
ayyoob
|
e8b9f03748
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-27 01:27:32 +05:30 |
|
Milan Perera
|
4462c353b4
|
Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
|
2016-05-26 21:21:06 +05:30 |
|
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
2016-05-26 21:16:01 +05:30 |
|
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
2016-05-26 18:44:12 +05:30 |
|
prabathabey
|
6d33d7036b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-26 18:02:12 +05:30 |
|
prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
2016-05-26 18:00:45 +05:30 |
|
ayyoob
|
5532db6dd4
|
Fixed https://wso2.org/jira/browse/IOTS-177
|
2016-05-26 17:10:37 +05:30 |
|
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
2016-05-26 12:53:20 +05:30 |
|
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
2016-05-26 12:52:49 +05:30 |
|
mharindu
|
52388ed33d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-26 12:44:36 +05:30 |
|
mharindu
|
106be76118
|
Fixed issues of API publishing to gateway
|
2016-05-26 12:41:20 +05:30 |
|
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
2016-05-25 17:59:12 +05:30 |
|
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
2016-05-25 17:45:37 +05:30 |
|
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
2016-05-25 17:37:21 +05:30 |
|
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
2016-05-25 16:26:29 +05:30 |
|
Milan Perera
|
67e5a5a23a
|
Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
|
2016-05-25 14:56:36 +05:30 |
|
GPrathap
|
78475963e3
|
added entry for websocket url
|
2016-05-25 14:38:46 +05:30 |
|
inoshperera
|
deb4195f7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 13:54:42 +05:30 |
|
inoshperera
|
a40e44899a
|
syncing REST apis of core and product EMM
|
2016-05-25 12:38:24 +05:30 |
|
Ruwan
|
98f8ace1ff
|
Merge pull request #274 from rasika90/master
Adding licence headers for server-side handlebar templates
|
2016-05-25 11:45:12 +05:30 |
|
geethkokila
|
c64a6e0ec5
|
Changing apis to return activity when an operation is added
|
2016-05-25 11:42:44 +05:30 |
|
Rasika Perera
|
d7f4a39075
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 11:34:51 +05:30 |
|
Rasika Perera
|
b879927dc1
|
Adding licence headers for handlebar templates
|
2016-05-25 11:28:24 +05:30 |
|
geethkokila
|
afba711969
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-25 08:16:14 +05:30 |
|
dilanua
|
339512e287
|
Updating comments in dashboard analytics feature
|
2016-05-24 18:26:47 +05:30 |
|
inoshperera
|
d7fe6d5e96
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-24 17:46:17 +05:30 |
|
dilanua
|
4663d78060
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 17:14:52 +05:30 |
|
dilanua
|
47e17e4a51
|
Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
|
2016-05-23 17:14:29 +05:30 |
|
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-23 16:51:38 +05:30 |
|
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
2016-05-23 16:51:26 +05:30 |
|
inosh
|
1341884957
|
resolving conflicts
|
2016-05-23 14:14:05 +05:30 |
|
inosh
|
60b42715d6
|
syncing admin api from product emm
|
2016-05-23 14:11:25 +05:30 |
|
geethkokila
|
16b809b255
|
Fixing the conflicts
|
2016-05-23 11:21:48 +05:30 |
|
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:37 +05:30 |
|
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
2016-05-23 11:19:22 +05:30 |
|
Prabath Abeysekara
|
830b3fc075
|
Merge pull request #272 from wso2/release-1.1.0
Release 1.1.0 and upgrading the versions
|
2016-05-23 10:08:13 +05:30 |
|
dilanua
|
8c4752ede3
|
Adding more comments to dashboard analytics data service interface
|
2016-05-22 16:54:07 +05:30 |
|
dilanua
|
975a3b915f
|
Properly layering beans and custom exceptions in dashboard analytics feature
|
2016-05-22 08:12:25 +05:30 |
|
dilanua
|
a7c7452e2e
|
Adding final updates to dashboard analytics feature
|
2016-05-20 17:10:37 +05:30 |
|
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 16:43:16 +05:30 |
|
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
2016-05-20 16:43:02 +05:30 |
|
mharindu
|
65612f724f
|
Fixed compile issue
|
2016-05-20 16:02:56 +05:30 |
|
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
2016-05-20 12:43:47 +05:30 |
|
dilanua
|
b9a9fb3169
|
Adding class & method comments, constants to dashboard analytics feature
|
2016-05-19 12:37:12 +05:30 |
|
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
2016-05-19 08:22:29 +05:30 |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
2016-05-19 00:42:14 +05:30 |
|
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
2016-05-19 00:30:41 +05:30 |
|
prabathabey
|
5e03c5ed30
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-19 00:20:57 +05:30 |
|
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
2016-05-19 00:20:45 +05:30 |
|
sumedharubasinghe
|
067f0a8050
|
Merge pull request #266 from ayyoob/transport
added api application registration filter
|
2016-05-18 23:17:43 +05:30 |
|
mharindu
|
bca1b4b059
|
Fixed conflicts
|
2016-05-18 22:01:38 +05:30 |
|
mharindu
|
9f93570b29
|
Fixed issues in webapp-publisher
|
2016-05-18 22:00:16 +05:30 |
|
ayyoob
|
ba47af3186
|
added api application registration filter
|
2016-05-18 19:33:04 +05:30 |
|
dilanua
|
7051af8d80
|
Adding relevant contextual names for database view names in dashboard analytics feature
|
2016-05-18 18:48:43 +05:30 |
|
geethkokila
|
958288f8ec
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-18 14:57:01 +05:30 |
|
geethkokila
|
c7dd386c94
|
Adding new apis for device informations
|
2016-05-18 14:56:46 +05:30 |
|
dilanua
|
2886ead44b
|
Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
|
2016-05-18 14:26:43 +05:30 |
|
mharindu
|
49cb4787c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-18 11:49:35 +05:30 |
|
mharindu
|
82b90522a0
|
Migrated to APIM 5.0.4
|
2016-05-18 11:49:20 +05:30 |
|
sumedharubasinghe
|
61ef87c658
|
Merge pull request #265 from rasika90/IOTS-114
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
2016-05-18 11:26:18 +05:30 |
|
Rasika Perera
|
bc3f64a77a
|
Fixing IOTS-114: the user is unable to deselect a child node permissions
|
2016-05-18 11:24:38 +05:30 |
|
charitha
|
075b5a8901
|
Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
|
2016-05-18 10:10:21 +05:30 |
|
sumedharubasinghe
|
6a69a3a895
|
Merge pull request #261 from charithag/master
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
2016-05-18 02:20:00 +05:30 |
|
sumedharubasinghe
|
2f6c1dfbdd
|
Merge pull request #263 from ayyoob/transport
few fixes in JWT client after testing with multi tenancy
|
2016-05-18 02:18:33 +05:30 |
|
ayyoob
|
c0240c5cbc
|
few fixes in JWT client after testing with multi tenancy
|
2016-05-18 02:09:12 +05:30 |
|
charitha
|
aadf87e5d9
|
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
2016-05-17 23:33:33 +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 |
|
mharindu
|
89026c2b7f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-17 20:33:23 +05:30 |
|
charitha
|
6dc0a9dd38
|
Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
|
2016-05-17 18:40:39 +05:30 |
|
mharindu
|
9ebf2ab6d9
|
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
|
2016-05-17 15:33:17 +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 |
|
mharindu
|
5ccc480ddb
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-17 12:25:57 +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 |
|
charitha
|
9480c71522
|
Fixed script error
|
2016-05-16 21:57:48 +05:30 |
|
charitha
|
e0fc7c4018
|
Fix for https://wso2.org/jira/browse/IOTS-110
|
2016-05-16 21:01:33 +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 |
|
charitha
|
e7c5ef78d0
|
Removed unnecessary jaggery apis
|
2016-05-16 17:03:36 +05:30 |
|
mharindu
|
b77f5358e8
|
Removed external dependancies from webapp publisher component
|
2016-05-16 14:23:52 +05:30 |
|
mharindu
|
83ec18c38d
|
Removed external dependancies from webapp publisher component
|
2016-05-16 14:20:34 +05:30 |
|
mharindu
|
c68b92c7b4
|
Fixed conflicts
|
2016-05-16 14:12:28 +05:30 |
|
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-16 11:55:35 +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 |
|
inoshperera
|
50b5661a74
|
Merge pull request #245 from madhawap/master
Added swagger annotations to beans
|
2016-05-13 01:57:46 +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 |
|
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
|
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 |
|
Madhawa
|
36c3a057dc
|
created interfaces for the api classes in order add swagger definitions
|
2016-05-12 11:25:20 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
geethkokila
|
3396a5066d
|
Adding changes for the updated time of device info and device location
|
2016-04-29 22:30:07 +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 |
|
mharindu
|
548f71ca2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-28 16:43:24 +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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
mharindu
|
afbfaf4c1d
|
Fixed for EMM-1305
|
2016-03-31 19:33:19 +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 |
|
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
|
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 |
|
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
|
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
|
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
|
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
|
41191d6df0
|
Adding the search feature to device mgt plugin
|
2016-03-21 10:33:35 +05:30 |
|
geethkokila
|
1826c9ee49
|
Doing a partial commit for pull
|
2016-03-14 12:02:36 +05:30 |
|
geethkokila
|
be890c2e9a
|
Doing a partial commit
|
2016-03-14 11:55:25 +05:30 |
|
geethkokila
|
7a809c1c01
|
Doing a partial commit
|
2016-03-14 11:48:43 +05:30 |
|
prabathabey
|
3726a57d96
|
Making email-sender a separate component and code cleanup
|
2016-03-13 00:51:54 +05:30 |
|
prabathabey
|
0b31042aa2
|
More improvements to the email sending functionality
|
2016-03-12 15:42:08 +05:30 |
|
prabathabey
|
535c74a962
|
Improving email sender functionality
|
2016-03-12 12:46:36 +05:30 |
|
Dileesha Rajapakse
|
8ac485d66d
|
Fixed Pagination issues in Device and Operation Oracle DAO classes
|
2016-02-02 17:53:47 +05:30 |
|
Dileesha Rajapakse
|
9204ed900d
|
Fixed Pagination issues in Oracle DAO classes
|
2016-02-02 16:37:26 +05:30 |
|
Kamidu Sachith
|
370badf9d3
|
Preventing infromation leakage
|
2016-01-28 18:58:24 +05:30 |
|
geethkokila
|
e0e0a57c11
|
[maven-release-plugin] prepare for next development iteration
|
2016-01-05 18:15:38 +05:30 |
|
geethkokila
|
cebb88e712
|
[maven-release-plugin] prepare release v1.0.3
|
2016-01-05 18:15:28 +05:30 |
|
geethkokila
|
e66d291947
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-30 14:19:05 +05:30 |
|
geethkokila
|
f416a73e75
|
[maven-release-plugin] prepare release v1.0.2
|
2015-12-30 14:18:57 +05:30 |
|
geethkokila
|
185a59fbd4
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-23 22:39:29 +05:30 |
|
geethkokila
|
b3580d754b
|
[maven-release-plugin] prepare release v1.0.1
|
2015-12-23 22:39:20 +05:30 |
|
prabathabey
|
1fe9371558
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
2015-12-23 21:41:10 +05:30 |
|
prabathabey
|
cbee88c7d0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-23 18:14:42 +05:30 |
|
prabathabey
|
77c4c34858
|
Fixing https://wso2.org/jira/browse/EMM-1133
|
2015-12-23 18:13:39 +05:30 |
|
harshanl
|
8d4c09c20f
|
Fixed EMM-1139
|
2015-12-23 17:10:12 +05:30 |
|
harshanl
|
9a7093a0f7
|
Fixed EMM-1146 issue
|
2015-12-23 15:29:45 +05:30 |
|
prabathabey
|
7a27e88551
|
Changing the log levels configured in log4j.properties files used as part of test configurations
|
2015-12-22 22:43:26 +05:30 |
|
geethkokila
|
4e9255fbc9
|
[maven-release-plugin] prepare for next development iteration
|
2015-12-22 08:28:42 +05:30 |
|
geethkokila
|
ceb60adb34
|
[maven-release-plugin] prepare release v1.0.0
|
2015-12-22 08:28:33 +05:30 |
|
Kamidu Sachith
|
c6e2c01caa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 16:45:52 +05:30 |
|
Kamidu Sachith
|
2d23eb86eb
|
Improve runtime performance
|
2015-12-21 16:38:42 +05:30 |
|
harshanl
|
a61fe6171a
|
Refactored pagination code
|
2015-12-21 14:22:09 +05:30 |
|
Dileesha Rajapakse
|
b25438097e
|
Fixed issues in EnrollmentDAOImpl
|
2015-12-18 23:26:01 +05:30 |
|
harshanl
|
6441c201e5
|
Added search support for pagination
|
2015-12-18 22:17:07 +05:30 |
|
Dileesha Rajapakse
|
eb680da572
|
Fixed EMM-1103
|
2015-12-17 14:57:28 +05:30 |
|
harshanl
|
91ece82eca
|
Updated operation DAO to sort data in DESC order of timestamp.
|
2015-12-17 12:52:42 +05:30 |
|
harshanl
|
d4b6ba5e36
|
Added pagination support for operation management apis.
|
2015-12-17 10:32:06 +05:30 |
|
harshanl
|
30e8dc885c
|
Fixed EMM-1034
|
2015-12-03 20:13:10 +05:30 |
|
harshanl
|
73906f7cda
|
Fixed EMM-1003
|
2015-11-30 22:20:33 +05:30 |
|
harshanl
|
d95a198ad6
|
Fixed EMM-1001
|
2015-11-30 19:56:47 +05:30 |
|
Kamidu Sachith
|
53064516d3
|
Fix for the Jira Issue EMM-989
|
2015-11-26 16:02:16 +05:30 |
|
Kamidu Sachith
|
8573a284e0
|
Enable Domain name in the invitation main
|
2015-11-26 11:39:11 +05:30 |
|
manoj
|
e1dc3d2ea3
|
add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation
|
2015-11-20 22:14:18 +05:30 |
|
manoj
|
99f82e4817
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-20 12:52:32 +05:30 |
|
harshanl
|
b4d17b888b
|
fixed secondary user-store related issues & multi-tenancy issues
|
2015-11-20 00:43:01 +05:30 |
|
manoj
|
a04658af14
|
App Manager integration
|
2015-11-19 10:21:59 +05:30 |
|
manoj
|
79c268cb41
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-19 10:18:01 +05:30 |
|
Dileesha Rajapakse
|
767ea70436
|
Refactored CommandOperation DAO class
|
2015-11-18 22:05:15 +05:30 |
|
Dileesha Rajapakse
|
8bd9295f81
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 19:28:40 +05:30 |
|
Dileesha Rajapakse
|
f3cfb79bac
|
Refactored Operation DAO classes
|
2015-11-17 19:28:32 +05:30 |
|
harshanl
|
f0471203e7
|
Added logic to skip device authorization for policy operations
|
2015-11-17 18:28:42 +05:30 |
|
Dileesha Rajapakse
|
6e95451f57
|
Refactored Operation DAO class
|
2015-11-17 17:26:55 +05:30 |
|
manoj
|
dbf8d13ced
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 16:15:24 +05:30 |
|
manoj
|
20db31c2a9
|
Add app manager features
|
2015-11-17 16:14:51 +05:30 |
|
Dileesha Rajapakse
|
825017a492
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-17 09:58:43 +05:30 |
|
Dileesha Rajapakse
|
4379232c25
|
Refactored Enrollment DAO class
|
2015-11-16 22:01:21 +05:30 |
|
harshanl
|
a3e20367f2
|
Fixed issue in Policy Task when DeviceAuthorization enabled.
|
2015-11-16 19:51:59 +05:30 |
|
Dileesha Rajapakse
|
6446be100d
|
Refactored Policy Management DAO classes
|
2015-11-16 16:49:35 +05:30 |
|
Dileesha Rajapakse
|
91d9db1ffa
|
Refactored ApplicationMapping and ProfileOperation DAO classes
|
2015-11-16 14:15:54 +05:30 |
|
Dileesha Rajapakse
|
27254cc922
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 11:45:29 +05:30 |
|
harshanl
|
cb02c9da80
|
Fixed issues in DeviceAuthorization
|
2015-11-16 11:43:52 +05:30 |
|
Dileesha Rajapakse
|
6f0276ab2f
|
Modified Application Mapping DAO classes
|
2015-11-16 11:39:52 +05:30 |
|
Dileesha Rajapakse
|
7b2cfd69f5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 09:49:37 +05:30 |
|
harshanl
|
b9ca6705ae
|
Merged changes
|
2015-11-13 21:57:05 +05:30 |
|
harshanl
|
e14f09b8a8
|
Added requireDeviceAuthorization support
|
2015-11-13 21:33:33 +05:30 |
|
manoj
|
fdc4ad8e18
|
Set user level autherization is support by plugin or not
|
2015-11-13 21:29:47 +05:30 |
|
manoj
|
22c2da7fcb
|
Set user level autherization is support by plugin or not
|
2015-11-13 21:22:38 +05:30 |
|
manoj
|
dc2e41e083
|
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
|
2015-11-13 19:02:55 +05:30 |
|
manoj
|
adc3b652bf
|
Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
|
2015-11-13 18:57:45 +05:30 |
|
Dileesha Rajapakse
|
786eb93bca
|
Refactored Operation DAO classes
|
2015-11-13 14:15:05 +05:30 |
|
Dileesha Rajapakse
|
123ea228ad
|
Refactored Enrolment DAO class
|
2015-11-12 10:30:45 +05:30 |
|
Dileesha Rajapakse
|
1975821446
|
Refactored Device and Application DAO classes
|
2015-11-11 18:47:02 +05:30 |
|
harshanl
|
5d107b0d56
|
Merged changes
|
2015-11-10 18:46:26 +05:30 |
|
harshanl
|
93e641893c
|
Merged changes
|
2015-11-10 18:31:02 +05:30 |
|
harshanl
|
026a7c187a
|
Fixed EMM-945, EMM-910, EMM-911, EMM-870
|
2015-11-10 18:17:34 +05:30 |
|
inosh-perera
|
4faa740c9d
|
Fixing JIRA EMM-947 - only the registered device types are returned to UI
|
2015-11-10 17:36:30 +05:30 |
|
harshanl
|
c826be9b3e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-03 18:59:26 +05:30 |
|
harshanl
|
74a3b0e346
|
Fixed EMM-910
|
2015-11-03 18:58:52 +05:30 |
|
geethkokila
|
30c53b7d14
|
Fixing the EMM-900, Ading the LB host name and port to the email url
|
2015-11-03 16:24:49 +05:30 |
|
geethkokila
|
2479be9f5a
|
Fixing the email client issue
|
2015-11-02 19:37:21 +05:30 |
|
Kasun Delgolla
|
c00b1ee713
|
Committing fix for JIRA- EMM-860
|
2015-10-29 20:46:48 +05:30 |
|
prabathabey
|
90240e7d3f
|
Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
|
2015-10-29 14:11:24 +05:30 |
|
harshanl
|
8a1dba166a
|
Updated FeatureMgr spec
|
2015-10-28 22:09:01 +05:30 |
|
harshanl
|
340a690995
|
Added sql script
|
2015-10-20 10:11:42 +05:30 |
|
harshanl
|
1d4bba9807
|
License issue fixed
|
2015-10-20 08:12:02 +05:30 |
|
harshanl
|
09fbf9e8a1
|
Fixed DAO issues
|
2015-10-19 22:45:39 +05:30 |
|
harshanl
|
89e930d530
|
Fixed isssues in pagination
|
2015-10-18 21:56:13 +05:30 |
|
harshanl
|
25d7459974
|
Pagination changes
|
2015-10-18 20:50:39 +05:30 |
|
harshanl
|
155606a326
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:54:35 +05:30 |
|
prabathabey
|
a0ebec9f3d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:18:26 +05:30 |
|
prabathabey
|
c74e27102f
|
Fixing issues in adding license configs
|
2015-10-18 18:16:52 +05:30 |
|
harshanl
|
81b6770c08
|
Fixed oauth issue with tenants
|
2015-10-18 01:44:28 +05:30 |
|
harshanl
|
6c196d5317
|
Added pagination support
|
2015-10-16 23:40:13 +05:30 |
|
harshanl
|
9a68aa92bc
|
Removed the use of web-app context in permission.xml of webapps
|
2015-10-14 22:33:36 +05:30 |
|
harshanl
|
d4eab9f86e
|
Code refactored.
|
2015-10-12 19:48:35 +05:30 |
|
harshanl
|
429b738dba
|
Fixed issues in permission tree'
|
2015-10-06 22:41:59 +05:30 |
|
harshanl
|
77f5f466d6
|
Added scope validator and refactored code
|
2015-10-06 11:44:40 +05:30 |
|
harshanl
|
648d8ec209
|
Added OAuth scope validator & fixed DataHolders
|
2015-10-05 11:28:47 +05:30 |
|
harshanl
|
234cd47931
|
Added identity-extensions
|
2015-10-02 18:00:05 +05:30 |
|
milanperera
|
e408d50037
|
Refactored permission module
|
2015-10-02 17:07:57 +05:30 |
|
milanperera
|
a0187b905b
|
Removed unneccessary imports and code segments
|
2015-10-02 16:57:42 +05:30 |
|
milanperera
|
a84edd7a99
|
Added seperate permission tree class
|
2015-10-02 16:40:52 +05:30 |
|
milanperera
|
02ad7fb8e1
|
Refactored authorization module
|
2015-10-02 16:40:13 +05:30 |
|
milanperera
|
ed937467cd
|
Refactored permission authorizer module
|
2015-10-01 17:35:08 +05:30 |
|
milanperera
|
68befaae01
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-01 12:14:28 +05:30 |
|
milanperera
|
1034eb85c6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-28 16:55:50 +05:30 |
|
mharindu
|
0a321e279a
|
Added null check to getLicense
|
2015-09-24 14:37:52 +05:30 |
|
Dilshan Edirisuriya
|
9ce1c2002a
|
Null check in DAO
|
2015-09-22 14:09:59 +05:30 |
|
milanperera
|
126c2ec371
|
Implemented permission authorizing module
|
2015-09-17 11:09:31 +05:30 |
|
milanperera
|
47ac0b1146
|
Fixed conflicts and merged local changes
|
2015-09-15 10:22:53 +05:30 |
|
Dilshan Edirisuriya
|
ac5a7f4ab1
|
Null check in JWT authenticator and fixing tenant id issue in device DAO
|
2015-09-14 17:12:07 +05:30 |
|
milanperera
|
37854a2cef
|
Partial Commit
|
2015-09-14 15:51:23 +05:30 |
|
Dilshan Edirisuriya
|
5f2ec88300
|
Changes in certificate managment
|
2015-09-14 15:28:28 +05:30 |
|
Dilshan Edirisuriya
|
3907c0fba2
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-14 15:23:18 +05:30 |
|
Dilshan Edirisuriya
|
4a03c7abf7
|
certificate authentication changes
|
2015-09-14 15:23:11 +05:30 |
|
harshanl
|
b8720917e1
|
Added Dynamic-client-registration module
|
2015-09-11 20:53:19 +05:30 |
|
milanperera
|
517039cccb
|
Partial commit
|
2015-09-10 11:20:29 +05:30 |
|
mharindu
|
2331b61bdc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-08 11:16:41 +05:30 |
|
harshanl
|
bf0e95fa6c
|
Fixed notification service issues
|
2015-09-07 18:14:20 +05:30 |
|
harshanl
|
330f059a09
|
Added App-Mgt config testcases
|
2015-09-05 01:26:52 +05:30 |
|
mharindu
|
3421663724
|
Fixed conflics and merged
|
2015-09-04 11:15:59 +05:30 |
|
geethkokila
|
4500aacd38
|
Adding the scep support for getting the device tenant id
|
2015-09-03 23:38:27 +05:30 |
|
mharindu
|
0e7ff3c0c8
|
Merged
|
2015-09-03 20:40:49 +05:30 |
|
hasuniea
|
581c4f013b
|
refactored changes
|
2015-09-03 20:19:28 +05:30 |
|
mharindu
|
069c7e7c5f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-03 12:03:41 +05:30 |
|
harshanl
|
bbec523a47
|
Added notification mechanism
|
2015-09-03 00:19:58 +05:30 |
|
mharindu
|
cbf10a8b59
|
Refactored addOperation method
|
2015-09-02 17:35:41 +05:30 |
|
hasuniea
|
7642112a9f
|
code clean up
|
2015-09-02 17:27:28 +05:30 |
|
mharindu
|
0c43338f5d
|
Added runtime exception to DCA
|
2015-09-02 16:16:18 +05:30 |
|
mharindu
|
1903b375f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 15:34:11 +05:30 |
|
geethkokila
|
5ee8c0f065
|
Fixing the cache manager issues
|
2015-09-02 14:47:36 +05:30 |
|
hasuniea
|
9d5f2af7e9
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-02 14:26:15 +05:30 |
|
mharindu
|
725894ed2c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 18:20:09 +05:30 |
|
geethkokila
|
f2b8f978f5
|
Fixing the operations connection close problems
|
2015-09-01 18:15:02 +05:30 |
|
mharindu
|
cd853c9ee8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-09-01 17:20:12 +05:30 |
|
geethkokila
|
b14461a5af
|
Fixing the datasource issue in the device magt core
|
2015-09-01 17:16:51 +05:30 |
|
mharindu
|
ad5335c9f5
|
Fixed local conflicts and merged
|
2015-09-01 15:29:24 +05:30 |
|
mharindu
|
6385c13012
|
Fixed issues in DeviceDAO
|
2015-09-01 15:25:16 +05:30 |
|
prabathabey
|
2b6bf203e2
|
Resolving conflicts observed in policy management implementation
|
2015-09-01 15:06:41 +05:30 |
|
mharindu
|
fd29deb372
|
Fixed conflicts of local repo and merged
|
2015-09-01 12:57:13 +05:30 |
|
prabathabey
|
892b9681f5
|
Fixing transaction handling issues
|
2015-09-01 12:51:18 +05:30 |
|
geethkokila
|
458618191d
|
Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
|
2015-08-31 19:31:13 +05:30 |
|
geethkokila
|
c673395ce6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-31 17:13:42 +05:30 |
|
harshanl
|
20873e7786
|
Added null checks
|
2015-08-31 14:37:44 +05:30 |
|
geethkokila
|
c6d993e532
|
Fixing bugs and adding the ability to read from cdm-config.xml file for monitoring task
|
2015-08-30 21:45:56 +05:30 |
|
Your Name
|
b906d43cc8
|
Committing tenant configuration manager service
|
2015-08-29 22:14:07 +05:30 |
|
geethkokila
|
bcb2c1ddb1
|
Commiting the monitoring changes and test case changes
|
2015-08-29 17:39:07 +05:30 |
|
geethkokila
|
44b496d350
|
Partially commiting due to update
|
2015-08-28 12:33:10 +05:30 |
|
hasuniea
|
7a54838996
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-28 12:22:07 +05:30 |
|
mharindu
|
69cf3f8939
|
Cleaned code and added comments
|
2015-08-27 17:15:37 +05:30 |
|
mharindu
|
abc16557dc
|
Removed unnecessary new lines in DeviceDAOImpl
|
2015-08-27 10:45:10 +05:30 |
|
mharindu
|
460fda1bb9
|
Removed unnecessary new lines in DeviceDAOImpl
|
2015-08-27 10:43:52 +05:30 |
|
harshanl
|
aeed8b92a1
|
Enabled adding custom permissions to permission-tree through webapps
|
2015-08-26 18:20:37 +05:30 |
|
mharindu
|
8c748b3dfd
|
Removed unnecessary comments
|
2015-08-26 17:45:21 +05:30 |
|
hasuniea
|
9f6dd55223
|
fixed issue in modify enrollment
|
2015-08-26 14:05:21 +05:30 |
|
harshanl
|
1850a76462
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-25 09:47:11 +05:30 |
|
prabathabey
|
3582973f84
|
Code cleanup
|
2015-08-24 11:04:47 +05:30 |
|
prabathabey
|
d4c5d9023e
|
Adding necessary instructions for transaction handling
|
2015-08-24 11:04:28 +05:30 |
|
prabathabey
|
de2c378214
|
Code cleanup
|
2015-08-24 10:15:50 +05:30 |
|
harshanl
|
423c8e2727
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-24 10:05:24 +05:30 |
|
prabathabey
|
ce0cc1699f
|
Fixing more transaction handling related issues
|
2015-08-23 20:19:20 +05:30 |
|
prabathabey
|
cdbdc86f42
|
Fixing transactional anomalies and code cleanup
|
2015-08-22 03:56:44 +05:30 |
|
harshanl
|
076d60ec83
|
PermissionManager changes
|
2015-08-22 03:01:20 +05:30 |
|
prabathabey
|
d7e363cef7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-22 01:51:56 +05:30 |
|
prabathabey
|
00807e8295
|
Fixing transaction anomalies and code clean up
|
2015-08-22 01:51:42 +05:30 |
|
Prabath Abeysekara
|
a5c9886c63
|
Merge pull request #25 from milanperera/master
Fixed "204 Content Not Found" issue in LicenseManager
|
2015-08-22 00:51:12 +05:30 |
|
mharindu
|
f36c82b059
|
Refactored LicenseManager
|
2015-08-22 00:47:17 +05:30 |
|
mharindu
|
4709107719
|
Refactored LicenseManager
|
2015-08-22 00:31:18 +05:30 |
|
mharindu
|
8949992148
|
Fixed 204 issue in LicenseManager
|
2015-08-22 00:12:24 +05:30 |
|
Dilshan Edirisuriya
|
3c444f6102
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Conflicts:
components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/MonitoringManagerImpl.java
|
2015-08-21 14:53:36 +05:30 |
|
dilanua
|
4e5a38998d
|
Updating DAO Layer
|
2015-08-07 22:09:51 +05:30 |
|
dilanua
|
df81bef812
|
Fixing issue in SQL Result retrieval on getOperationsByDeviceAndStatus
|
2015-08-07 18:13:42 +05:30 |
|
geethkokila
|
149b743a2e
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-07 12:27:43 +05:30 |
|
harshanl
|
58c45c92be
|
Fixed tenant configuration persisting issue
|
2015-08-06 18:11:40 +05:30 |
|
geethkokila
|
c039adf4ea
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-08-03 18:21:10 +05:30 |
|
prabathabey
|
c41f6c3002
|
Code cleanup
|
2015-08-03 17:22:46 +05:30 |
|
geethkokila
|
3fa65ae98c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-30 23:32:12 +05:30 |
|
milanperera
|
e30956b619
|
Fixed an issue in SQL query of getPendingOperations(CommandOp)
|
2015-07-30 18:34:56 +05:30 |
|
milanperera
|
508082808c
|
Fixed a bug in commons.licence
|
2015-07-30 17:10:12 +05:30 |
|
prabathabey
|
84bc22f9f3
|
Setting default values for fields validFrom and validTo
|
2015-07-30 16:56:45 +05:30 |
|
prabathabey
|
536e13b0a7
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-30 15:17:03 +05:30 |
|
prabathabey
|
53302070e6
|
Code cleanup, adding file system based license manager, fixing some design issue in CommandOperationDAOImpl
|
2015-07-30 15:16:12 +05:30 |
|
geethkokila
|
cb489c0174
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-29 19:52:59 +05:30 |
|
Dilshan Edirisuriya
|
37763b7e40
|
Importing org.wso2.carbon.device.mgt.common
|
2015-07-29 11:43:45 +05:30 |
|
geethkokila
|
b8462b02ac
|
Fixing the conflicts
|
2015-07-29 07:30:14 +05:30 |
|
prabathabey
|
c134cc7e25
|
Fixing license manager initialization related issues and code cleanup
|
2015-07-28 20:38:02 +05:30 |
|
prabathabey
|
ca38cc9f51
|
Removing URL printer start-up handler from device.mgt.core
|
2015-07-28 18:09:49 +05:30 |
|
prabathabey
|
c471017c40
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-28 17:25:54 +05:30 |
|
prabathabey
|
134b4ae53c
|
Code cleanup
|
2015-07-28 17:25:41 +05:30 |
|
Dilshan Edirisuriya
|
e7f02365a8
|
Importing axis2.transport.mail
|
2015-07-28 16:42:20 +05:30 |
|
prabathabey
|
54cd6b80f4
|
Fixing merge conflicts
|
2015-07-28 15:21:06 +05:30 |
|
prabathabey
|
955c119006
|
Adding policy delegation
|
2015-07-28 15:19:34 +05:30 |
|
geethkokila
|
dc205aa081
|
Fixing the conflicts
|
2015-07-27 20:32:12 +05:30 |
|
geethkokila
|
6d687364c6
|
Fixing the monitoring tasks
|
2015-07-27 12:27:12 +05:30 |
|
milanperera
|
256880089e
|
Merged
|
2015-07-27 11:16:03 +05:30 |
|
prabathabey
|
1716c2c7f6
|
Making apimgt extensions module a separate component/feature pair
|
2015-07-25 12:41:18 +05:30 |
|
prabathabey
|
1a6526fc77
|
Removing API publisher lifecycle listener implementation out of device.mgt.core and making it a separate module
|
2015-07-24 19:22:14 +05:30 |
|
milanperera
|
5b2e0c8989
|
Merged
|
2015-07-24 12:32:26 +05:30 |
|
prabathabey
|
a68ca0cfd6
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-24 12:08:12 +05:30 |
|
prabathabey
|
8394b63e0c
|
Making license manager a util exposed as part of org.wso2.carbon.device.mgt.extensions
|
2015-07-24 12:07:57 +05:30 |
|
milanperera
|
7ec10d670c
|
Fixed bugs in device disenrolment
|
2015-07-23 17:32:05 +05:30 |
|
milanperera
|
5a8975d7ac
|
Partial Commit
|
2015-07-23 16:55:54 +05:30 |
|
milanperera
|
35ce4be1a1
|
Partial Commit
|
2015-07-23 15:55:32 +05:30 |
|
Prabath Abeysekara
|
3512e3e60a
|
Merge pull request #20 from milanperera/master
Refactored SQL queries
|
2015-07-23 14:50:57 +05:30 |
|
milanperera
|
6f56e27f1d
|
Refactored SQL queries
|
2015-07-23 14:46:22 +05:30 |
|
prabathabey
|
6c857fdc4d
|
Removing user-api-publisher-config.xml and making JAX-RS services get auto-published as APIs depending on parameters configured in web.xml of each corresponding web applications
|
2015-07-23 14:35:02 +05:30 |
|
geethkokila
|
bd75f70a24
|
Fixing the merge conflicts
|
2015-07-23 10:17:04 +05:30 |
|
geethkokila
|
6270dff93c
|
Fixing priviledege carbon context issue in device-mgt component
|
2015-07-23 10:14:24 +05:30 |
|
prabathabey
|
d9459b09ba
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-23 10:02:02 +05:30 |
|
prabathabey
|
fac53e4814
|
Upgrading tomcat version usd in carbon-devicemgt
|
2015-07-23 10:01:56 +05:30 |
|
prabathabey
|
9e5e3cf73d
|
Enforcing proxy port to be used when configured
|
2015-07-23 09:57:50 +05:30 |
|
prabathabey
|
e4fd0607e8
|
Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code
|
2015-07-22 23:43:12 +05:30 |
|
prabathabey
|
15d56e29c3
|
temporarily commenting out test cases till tenancy-test bits are properly added
|
2015-07-22 23:41:05 +05:30 |
|
geethkokila
|
9dc5a1e2e5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-22 17:24:50 +05:30 |
|
geethkokila
|
aee2402d0d
|
Fixing the get tenant id issue, added the priviledge carbon context at the test running by setting up the carbon-home
|
2015-07-22 17:24:33 +05:30 |
|
harshanl
|
c2ef90d399
|
added class comments
|
2015-07-22 15:47:25 +05:30 |
|
harshanl
|
50640c9dfd
|
Added tenant configuration persistance
|
2015-07-22 15:36:16 +05:30 |
|
prabathabey
|
7d089d8b09
|
Removing IDE warnings
|
2015-07-21 19:13:16 +05:30 |
|
prabathabey
|
a461e887d1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-07-21 19:12:34 +05:30 |
|
prabathabey
|
87e632866b
|
Fixing connection leaks spotted in operation management implementation
|
2015-07-21 19:12:22 +05:30 |
|
harshanl
|
57299063b3
|
Added policy configuration to the cdm-config
|
2015-07-20 11:16:15 +05:30 |
|
manoj
|
4049d1a2b4
|
Remove properties from config operations
|
2015-07-20 09:39:38 +05:30 |
|