pasinduj
|
7be1de1b85
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-11 11:30:41 +05:30 |
|
harshanl
|
08ebd7f881
|
Added DCR proxy endpoint & refactored code.
|
2015-12-11 11:10:53 +05:30 |
|
geethkokila
|
93a295f8a7
|
Fixing the dynamic imports
|
2015-12-10 18:25:45 +05:30 |
|
harshanl
|
20a03c42fc
|
Merged with master
|
2015-12-10 16:52:35 +05:30 |
|
harshanl
|
89e6f0786d
|
Refactored dynamic-client module to use remote services.
|
2015-12-10 16:50:33 +05:30 |
|
pasinduj
|
a9a502ac74
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-10 09:15:17 +05:30 |
|
geethkokila
|
49ae3298f4
|
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
|
2015-12-09 20:06:28 +05:30 |
|
geethkokila
|
ba7acabb04
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-09 20:03:07 +05:30 |
|
geethkokila
|
865f5a500e
|
Fixing the build failure due to neethi bundle being plugged in to web app lib folder
|
2015-12-09 20:02:58 +05:30 |
|
Kamidu Sachith
|
6f57200864
|
Hanlde dependancy in dynamic client registration by removing recursive dependancy
|
2015-12-09 14:40:33 +05:30 |
|
pasinduj
|
f49f13501f
|
modified dbscripts removing policy ID forigen key from one table
|
2015-12-08 15:35:01 +05:30 |
|
pasinduj
|
81911bace0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-08 13:26:35 +05:30 |
|
pasinduj
|
a390df68ec
|
modified dbscripts to remove foriegn key reference
|
2015-12-08 11:42:04 +05:30 |
|
harshanl
|
92af749276
|
Fixed build break
|
2015-12-07 20:53:07 +05:30 |
|
harshanl
|
740124136b
|
Refactored backend oauth authenticator component and added logic to validate OAuth token from local & remote servers.
|
2015-12-07 20:25:47 +05:30 |
|
harshanl
|
5b9c44655d
|
Merge branch 'master' of https://github.com/pasindujw/carbon-device-mgt into pasindujw-master
|
2015-12-03 20:20:26 +05:30 |
|
harshanl
|
30e8dc885c
|
Fixed EMM-1034
|
2015-12-03 20:13:10 +05:30 |
|
pasinduj
|
9c7ebdafdb
|
modified PolicyDAOImpl to fix PolicyRemove error occured by a database Foriegn Key Reference
|
2015-12-03 18:30:45 +05:30 |
|
inosh-perera
|
b5a6280c8d
|
refactoring comments
|
2015-12-03 11:28:12 +05:30 |
|
inosh-perera
|
d4403c6d87
|
adding new table to h2 script
|
2015-12-03 10:16:10 +05:30 |
|
inosh-perera
|
ff6e316406
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-02 07:55:58 +05:30 |
|
inosh-perera
|
3b1a3073f5
|
certificate persistance and ritrival from the database
|
2015-12-02 07:55:35 +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 |
|
geethkokila
|
c1eea6894d
|
Fixing the feature remove from the policy
|
2015-11-19 14:45:08 +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
|
2fa99ac475
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 19:57:59 +05:30 |
|
harshanl
|
a3e20367f2
|
Fixed issue in Policy Task when DeviceAuthorization enabled.
|
2015-11-16 19:51:59 +05:30 |
|
geethkokila
|
271c4f76cb
|
Fixnig the null pointer isssue
|
2015-11-16 18:08:21 +05:30 |
|
geethkokila
|
700b308b45
|
Fixing the null pointer and removnig innactive devices being monitored
|
2015-11-16 17:44:30 +05:30 |
|
geethkokila
|
1989abf881
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:41:37 +05:30 |
|
geethkokila
|
fed4f72d4b
|
Fixing the null pointer
|
2015-11-16 17:41:07 +05:30 |
|
harshanl
|
1252d4c160
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 17:21:33 +05:30 |
|
geethkokila
|
0f146e83fa
|
Fixing the issue which cause policy not bieng applied to device which were enrolled before the adding the policy to the system
|
2015-11-16 17:17:15 +05:30 |
|
geethkokila
|
813f9072d8
|
Fixing the database issue which causes the deviceids slelect did not work
|
2015-11-16 17:15:16 +05:30 |
|
Dileesha Rajapakse
|
f8a2117911
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-16 16:52:43 +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 |
|
Dilshan Edirisuriya
|
7023537fcd
|
Setting owner in authentication info
|
2015-11-16 13:49:02 +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
|
72ffe4e4a4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-12 09:04:56 +05:30 |
|
harshanl
|
5af6f314d0
|
Fixed EMM-939
|
2015-11-11 20:58:47 +05:30 |
|
Dileesha Rajapakse
|
1975821446
|
Refactored Device and Application DAO classes
|
2015-11-11 18:47:02 +05:30 |
|
Geeth
|
5fd9e87dc8
|
Merge pull request #44 from Kamidu/master
change the formatter
|
2015-11-10 20:35:58 +05:30 |
|
Kamidu Sachith
|
8953a61cc4
|
Enable Owneship type editing in policy
|
2015-11-10 20:17:59 +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 |
|
Kamidu Sachith
|
d7c942f395
|
Enable ownership editing on the policy
|
2015-11-10 14:51:10 +05:30 |
|
Kamidu Sachith
|
4590de6a76
|
chenge the formatter
|
2015-11-04 15:12:23 +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 |
|
harshanl
|
2b9239d208
|
Optimized the authenticator framework
|
2015-11-03 14:29:38 +05:30 |
|
harshanl
|
fa92aecf58
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-11-03 11:34:32 +05:30 |
|
harshanl
|
520c07693d
|
Added support for non-secured endpoints within a security enabled webapp
|
2015-11-02 20:45:43 +05:30 |
|
geethkokila
|
feab85796f
|
Fixing the EMM-896 which restrict deleting the policy once applied due to a contraint violation
|
2015-11-02 19:44:52 +05:30 |
|
geethkokila
|
2479be9f5a
|
Fixing the email client issue
|
2015-11-02 19:37:21 +05:30 |
|
harshanl
|
6ebfbc4136
|
Merge branch 'master' of https://github.com/hasuniea/carbon-device-mgt into hasuniea-master
|
2015-10-30 18:34:16 +05:30 |
|
harshanl
|
c9ffedbac5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-30 18:29:53 +05:30 |
|
harshanl
|
8f982722fb
|
Added oauth response messages
|
2015-10-30 18:29:32 +05:30 |
|
geethkokila
|
20122b3f1e
|
Fixing the roles and users adding issue
|
2015-10-30 17:48:30 +05:30 |
|
Kasun Delgolla
|
c00b1ee713
|
Committing fix for JIRA- EMM-860
|
2015-10-29 20:46:48 +05:30 |
|
Kasun Delgolla
|
6f2d1ad065
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 20:45:29 +05:30 |
|
harshanl
|
7cdd262b91
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-29 17:53:18 +05:30 |
|
harshanl
|
7c0996270f
|
Fixed EMM-887
|
2015-10-29 17:53:09 +05:30 |
|
Kasun Delgolla
|
f519b7c029
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 15:46:41 +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 |
|
Kasun Delgolla
|
9fa7c16e54
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-29 10:41:34 +05:30 |
|
hasuniea
|
3de4718ab5
|
refactored certificate generator
|
2015-10-29 10:04:13 +05:30 |
|
harshanl
|
8a1dba166a
|
Updated FeatureMgr spec
|
2015-10-28 22:09:01 +05:30 |
|
Dilshan Edirisuriya
|
5c2b7c9624
|
Removing commons codec version
|
2015-10-28 20:06:10 +05:30 |
|
Dilshan Edirisuriya
|
bbc1132100
|
Commenting previous lines
|
2015-10-28 19:24:05 +05:30 |
|
Kasun Delgolla
|
efa90b244f
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-28 19:05:31 +05:30 |
|
Dilshan Edirisuriya
|
0b800b8615
|
Bug fixes
|
2015-10-28 18:49:47 +05:30 |
|
Kasun Delgolla
|
acdfc475be
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-28 10:17:23 +05:30 |
|
hasuniea
|
8f595818dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-23 14:51:10 +05:30 |
|
hasuniea
|
e1a24abfa3
|
refactored certificate service
|
2015-10-23 14:46:56 +05:30 |
|
geethkokila
|
168a011376
|
Fixing the issue of identity snapshot change
|
2015-10-22 16:27:40 +05:30 |
|
Kasun Delgolla
|
f830a14a8b
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-22 11:09:44 +05:30 |
|
harshanl
|
b3e0f804b0
|
Added comments.
|
2015-10-21 17:19:49 +05:30 |
|
harshanl
|
52fab37c61
|
Fixed issue in permission validator
|
2015-10-21 15:43:26 +05:30 |
|
harshanl
|
e1c9f1c602
|
Added url param support to permission tree.
|
2015-10-21 12:55:44 +05:30 |
|
Kasun Delgolla
|
3385bfacd2
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-21 11:17:10 +05:30 |
|
hasuniea
|
efd029083b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-21 10:55:01 +05:30 |
|
hasuniea
|
2c2216e48d
|
implement certificateManagement service
|
2015-10-21 10:38:09 +05:30 |
|
harshanl
|
340a690995
|
Added sql script
|
2015-10-20 10:11:42 +05:30 |
|
Kasun Delgolla
|
8d52735e6a
|
Adding app list + info to monitoring operation
|
2015-10-20 09:51:43 +05:30 |
|
hasuniea
|
3a6e9f09fa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-20 09:15:36 +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
|
04eba0f313
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-19 22:45:12 +05:30 |
|
hasuniea
|
53f4dc7ae5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-19 20:49:43 +05:30 |
|
hasuniea
|
7a110a8eb5
|
implemented certificateGenerater
|
2015-10-19 20:49:26 +05:30 |
|
geethkokila
|
c46c4f1be9
|
Fixing the policy update issues
|
2015-10-19 20:34:02 +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
|
ca3653737c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 20:22:47 +05:30 |
|
harshanl
|
155606a326
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:54:35 +05:30 |
|
geethkokila
|
703eebb715
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-18 18:39:55 +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 |
|
inosh-perera
|
cab888d321
|
fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files
|
2015-10-18 17:26:32 +05:30 |
|
harshanl
|
81b6770c08
|
Fixed oauth issue with tenants
|
2015-10-18 01:44:28 +05:30 |
|
geethkokila
|
182e15d632
|
Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
|
2015-10-17 20:18:25 +05:30 |
|
Kamidu Sachith
|
ddbd2c5372
|
Java 8 support
|
2015-10-17 20:03:19 +05:30 |
|
harshanl
|
9b40f73597
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-17 17:11:32 +05:30 |
|
geethkokila
|
d15eb10636
|
Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
|
2015-10-17 17:08:12 +05:30 |
|
geethkokila
|
f49345e722
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-16 23:47:19 +05:30 |
|
geethkokila
|
8a8a152d36
|
Adding the policy task config
|
2015-10-16 23:47:16 +05:30 |
|
harshanl
|
0646b424ed
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-16 23:40:25 +05:30 |
|
harshanl
|
6c196d5317
|
Added pagination support
|
2015-10-16 23:40:13 +05:30 |
|
Dulitha Wijewantha
|
5962694ec2
|
Adding annotation for the description
|
2015-10-16 23:37:58 +05:30 |
|
Dulitha Wijewantha
|
002a1ec580
|
Merge branch 'master' of github.com:wso2/carbon-device-mgt
|
2015-10-16 21:06:04 +05:30 |
|
Dulitha Wijewantha
|
1025e9a425
|
Fixes to user api
|
2015-10-16 21:05:51 +05:30 |
|
Kamidu Sachith
|
d5dcf44f27
|
Change the service registration
|
2015-10-16 18:39:34 +05:30 |
|
harshanl
|
2a6db0cdc4
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-10-15 16:32:09 +05:30 |
|
geethkokila
|
d52df2474e
|
Fixing policy descriptions
|
2015-10-15 13:01:53 +05:30 |
|
harshanl
|
9a68aa92bc
|
Removed the use of web-app context in permission.xml of webapps
|
2015-10-14 22:33:36 +05:30 |
|
geethkokila
|
9fca18ae90
|
Fixing the monitoring issue
|
2015-10-14 18:54:39 +05:30 |
|
harshanl
|
b0d6038b69
|
Refactored dynamic client code & add tenancy handling to authenticators
|
2015-10-13 22:30:12 +05:30 |
|
Kamidu Sachith
|
5c215189d1
|
Enable java8 support
|
2015-10-13 11:45:00 +05:30 |
|
harshanl
|
d9bcb617eb
|
Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
|
2015-10-12 19:49:40 +05:30 |
|