mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-16 11:55:35 +05:30 |
|
mharindu
|
f2ac5c5cad
|
Implemented extended scope validator and improved webapp publisher to support Synapse
|
2016-05-16 11:46:30 +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 |
|
geethkokila
|
362cf40d85
|
Fixing the operation activity id issues
|
2016-05-13 00:25:13 +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 |
|
ayyoob
|
42dde2c8eb
|
updated property
|
2016-05-12 19:17:31 +05:30 |
|
ayyoob
|
df473e4284
|
revert back
|
2016-05-12 13:49:32 +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 |
|
charitha
|
18957b0110
|
Add required jagerry modules for the app
|
2016-05-11 19:30:55 +05:30 |
|
dilanua
|
e151bca0c7
|
Adding device-identification attribute for database views in dashboard analytics feature
|
2016-05-11 16:25:00 +05:30 |
|
dilanua
|
754195bee6
|
Adding mssql support to dashboard analytics feature
|
2016-05-11 12:01:39 +05:30 |
|
Dilan U. Ariyaratne
|
c9eed309aa
|
Merge pull request #238 from dilee/master
Fixed errors in MSSQL DB script
|
2016-05-11 11:08:14 +05:30 |
|
Dileesha Rajapakse
|
e055519d4c
|
Fixed errors in MSSQL DB script
|
2016-05-11 11:02:43 +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 |
|
dilanua
|
adec59e934
|
Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
|
2016-05-10 15:26:20 +05:30 |
|
Dileesha Rajapakse
|
cb5736854a
|
Fixed issues in Oracle DB script
|
2016-05-10 14:58:02 +05:30 |
|
Dileesha Rajapakse
|
de08e96646
|
Fixed errors in PostgreSQL script
|
2016-05-09 14:35:45 +05:30 |
|
dilanua
|
13c5fe3d1b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-09 12:33:34 +05:30 |
|
dilanua
|
0ab4035b37
|
Adding H2, MySQL Support for dashboard analytics feature
|
2016-05-09 12:33:11 +05:30 |
|
Kasun Delgolla
|
4cb7b86f4c
|
Fixing SQL errors
|
2016-05-09 12:20:43 +05:30 |
|
ayyoob
|
c165156dcd
|
remove imports
|
2016-05-09 01:05:08 +05:30 |
|
ayyoob
|
5f302fce63
|
removed unused code and resolved host issues
|
2016-05-04 01:19:56 +05:30 |
|
geethkokila
|
e4b400a5e7
|
Disabling device analytics publishing by default
|
2016-05-02 10:45:10 +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
|
5a77e08fd5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-27 17:57:05 +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 |
|
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 |
|
prabathabey
|
95d3b97c5f
|
Code cleanup
|
2016-04-26 15:59:22 +05:30 |
|
geethkokila
|
f1aeb1a846
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-04-24 08:38:28 +05:30 |
|
geethkokila
|
37e431d6a0
|
Adding the h2.sql for resolving conflicts
|
2016-04-24 08:33:57 +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 |
|
Prabath Abeysekara
|
8ced6cf38e
|
Merge pull request #211 from charithag/master
Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
|
2016-04-19 13:36:37 +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
|
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 |
|
Kasun Delgolla
|
4e57e5bc85
|
Committing restructuring mdm-admin + UI merging style fixes
|
2016-04-07 10:42:56 +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 |
|
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 |
|
ayyoob
|
562ced1be7
|
Added api application extension feature
|
2016-03-31 00:10:40 +05:30 |
|
ayyoob
|
7632d4e929
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
|
2016-03-30 22:03:48 +05:30 |
|
inosh-perera
|
41ba2f4f0a
|
adding database changes
|
2016-03-30 19:08:42 +05:30 |
|
ayyoob
|
81ae512f13
|
Merge pull request #6 from ayyoob/merge-devicetype
merge device type
|
2016-03-30 12:20:02 +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 |
|
geethkokila
|
aa63b5f592
|
Fixing the application memory usage and adding location based search
|
2016-03-29 17:48:36 +05:30 |
|
charithag
|
fa2f61f48a
|
Add missing parts in group management
|
2016-03-29 12:41:38 +05:30 |
|
ayyoob
|
c45895685b
|
Added device type multi tenancy capability.
|
2016-03-29 11:40:58 +05:30 |
|
prabathabey
|
38f3b037eb
|
Code cleanup
|
2016-03-27 21:17:33 +05:30 |
|
prabathabey
|
099613da73
|
Merging device.mgt.ui features
|
2016-03-27 17:29:26 +05:30 |
|
prabathabey
|
e9954dab4b
|
merging device.mgt.ui feature
|
2016-03-27 17:11:31 +05:30 |
|
prabathabey
|
284ca1b8e8
|
Removing obsolete source structures
|
2016-03-27 16:08:22 +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
|
5dcd9dfe4a
|
Merging device analytics feature impl to master
|
2016-03-27 00:23:37 +05:30 |
|
geethkokila
|
e9da24c9e8
|
Changing the snapshot versions from 1.0.4 to 1.1.0
|
2016-03-24 11:41:52 +05:30 |
|
geethkokila
|
3a3df04331
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-03-21 10:33:49 +05:30 |
|
geethkokila
|
41191d6df0
|
Adding the search feature to device mgt plugin
|
2016-03-21 10:33:35 +05:30 |
|
inosh-perera
|
ef117ffa74
|
adding mutual SLL authentication and certificate management DAOs
|
2016-03-17 14:14:59 +05:30 |
|
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
|
3772d54ea1
|
Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution
|
2016-03-12 16:07:08 +05:30 |
|
prabathabey
|
0b31042aa2
|
More improvements to the email sending functionality
|
2016-03-12 15:42:08 +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 |
|
Dileesha Rajapakse
|
edec1452b2
|
Fixed EMM-1171
|
2016-01-05 14:16:36 +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 |
|
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 |
|
prabathabey
|
30cd44a7fb
|
Fixing name of the BSTAuthenticator
|
2015-12-22 03:48:21 +05:30 |
|
prabathabey
|
ed8242fc66
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 20:22:14 +05:30 |
|
prabathabey
|
a7b447b7db
|
Adding BST authenticator
|
2015-12-21 20:21:51 +05:30 |
|
pasinduj
|
8628e5e523
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 15:03:46 +05:30 |
|
harshanl
|
42a8df75e6
|
Changed default oauth validator type to local
|
2015-12-21 15:01:18 +05:30 |
|
pasinduj
|
c7b53f7110
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 14:44:23 +05:30 |
|
prabathabey
|
67e1bfb012
|
Making attribute names schema compliant and code cleanup
|
2015-12-21 12:23:59 +05:30 |
|
prabathabey
|
0cdc139a0b
|
Adding updated webapp authenticator config
|
2015-12-21 11:57:50 +05:30 |
|
pasinduj
|
08387e178d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-21 09:37:21 +05:30 |
|
prabathabey
|
337afa5da2
|
Revert "Further optimizing webapp authenticator valve implementation"
This reverts commit 262e53ddcc.
|
2015-12-19 13:27:45 +05:30 |
|
prabathabey
|
262e53ddcc
|
Further optimizing webapp authenticator valve implementation
|
2015-12-19 13:09:31 +05:30 |
|
Dileesha Rajapakse
|
9e5891a728
|
Fixed EMM-1116
|
2015-12-18 15:34:50 +05:30 |
|
pasinduj
|
9a50455a29
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-14 08:57:36 +05:30 |
|
harshanl
|
00cf61c44c
|
Fixed EMM-1069 and refactore DCR services
|
2015-12-11 20:04:22 +05:30 |
|
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 |
|
pasinduj
|
5ac2447080
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-10 17:00:35 +05:30 |
|
pasinduj
|
bb010bde28
|
modified oracle db script to remove a foriegn key
|
2015-12-10 16:59:03 +05:30 |
|
Dileesha Rajapakse
|
96366de4dd
|
Fixed syntax errors in sequence creation
|
2015-12-10 15:30:17 +05:30 |
|
pasinduj
|
4656a9eae7
|
modified all dbscripts removing a foriegn key
|
2015-12-10 11:43:44 +05:30 |
|
pasinduj
|
6e94a084a0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2015-12-09 10:18:10 +05:30 |
|
pasinduj
|
6ed2710550
|
revert mysql edited lines
|
2015-12-09 10:15:43 +05:30 |
|