Geeth Munasinghe
|
845c9f8998
|
changing the read me file
|
10 years ago |
Geeth Munasinghe
|
f4a40a2fd1
|
changing the read me file
|
10 years ago |
Geeth Munasinghe
|
fd631f9563
|
Nerging Dulitha's changes
Merge branch 'dulichan-master'
|
10 years ago |
Geeth Munasinghe
|
cf8eaaef41
|
Merge branch 'master' of https://github.com/dulichan/product-mdm
|
10 years ago |
Geeth Munasinghe
|
46c1218259
|
Merge branch 'master' of https://github.com/dulichan/product-mdm into dulichan-master
|
10 years ago |
manoj
|
40489f986d
|
Merge remote-tracking branch 'upstream/master'
|
10 years ago |
manoj
|
4974d49320
|
License Management
|
10 years ago |
Dulitha Wijewantha
|
f1193b5647
|
Fixed indentation. UI module changes
|
10 years ago |
Geeth Munasinghe
|
20a228992f
|
Adding org.wso2.carbon.identity.self.registration.server.feature to p2 profile gen
|
10 years ago |
Dulitha Wijewantha
|
ba8f6621a4
|
Merge branch 'master' of github.com:dulichan/product-mdm
|
10 years ago |
Dulitha Wijewantha
|
24184b48a7
|
Reverted changes back to the list implementation. The Map conversion is not properly supported in CXF
|
10 years ago |
Dulitha Wijewantha
|
dcf222d2c1
|
Reverted changes back to the list implementation. The Map conversion is not properly supported in CFX
|
10 years ago |
manoj
|
b702a72b2f
|
Merge remote-tracking branch 'upstream/master'
|
10 years ago |
manoj
|
b96d561ef0
|
License Manaproduct/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.javagement
|
10 years ago |
harshanL
|
2b3ee5e4f2
|
Added package-info.java
|
10 years ago |
harshanL
|
ad3f748e0b
|
Fixed merge conflicts
|
10 years ago |
harshanL
|
163fe58120
|
Added new changes in operation management
|
10 years ago |
prabathabey
|
7fc4244259
|
Fixing issues in package-info.java
|
10 years ago |
Prabath Abeysekara
|
4c1d4a01a5
|
Merge pull request #4 from dulichan/master
UI improvements and backend implementations
|
10 years ago |
Dulitha Wijewantha
|
d5c00a2e1e
|
Merge branch 'master' of github.com:wso2/product-mdm
|
10 years ago |
Dulitha Wijewantha
|
9f71408001
|
* Fixed the JNDI bug
* Added a device module method and apis for a single device
* UI improvement to the device page
|
10 years ago |
Geeth Munasinghe
|
2883f0dda2
|
Merge branch 'master' of https://github.com/wso2/product-mdm
|
10 years ago |
Geeth Munasinghe
|
118ee37998
|
Adding changes of asok
Merge branch 'asokaravinda-master'
|
10 years ago |
prabathabey
|
8e3d4e11e3
|
Adding org.wso2.carbon.um.ws.service.client.feature.group feature required for API management related dependencies
|
10 years ago |
Geeth Munasinghe
|
737eee4270
|
Merge branch 'master' of https://github.com/asokaravinda/product-mdm into asokaravinda-master
|
10 years ago |
asok
|
2947e6fd21
|
commiting windows plugin
|
10 years ago |
Geeth
|
1bf1f5d09d
|
Merge pull request #2 from dulichan/master
Merging left over changes from MDM. Most of the changes are from HarshanL
|
10 years ago |
Geeth Munasinghe
|
fd814c7e24
|
Fixing version issues and changing cdm to mdm
|
10 years ago |
Dulitha Wijewantha
|
90402107f6
|
Included the UI improvements to cdm jaggery app. Included the sso jaggery module dependency.
|
10 years ago |
Dulitha Wijewantha
|
99f7cd25e8
|
Merging left over changes from MDM. Most of the changes are from @harshahL.
|
10 years ago |
Geeth Munasinghe
|
bc93ff08a4
|
Changing cdm to mdm
|
10 years ago |
asok
|
ebe0aa2663
|
commiting windows plugin
|
10 years ago |
asok
|
eb52073e37
|
commiting windows plugin
|
10 years ago |
Geeth Munasinghe
|
5e3ebc141c
|
As discussed in the product counsil, the MDM will be the mobile solution built upon CDM framework
|
10 years ago |
prabathabey
|
715d242b22
|
Resolving conflicts in README.md and .gitignore
|
10 years ago |
prabathabey
|
e506ed0cdc
|
Resolving conflicts in .gitignore
|
10 years ago |
inosh-perera
|
1f489c8d62
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
|
10 years ago |
inosh-perera
|
2663ee014c
|
xml element name changes of UI
|
10 years ago |
inosh-perera
|
8de9a702d7
|
added authentication response handler, comment fixes
|
10 years ago |
Geeth Munasinghe
|
77016e614c
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
|
10 years ago |
Geeth Munasinghe
|
4c6d97a30a
|
Fixing repo conflicts
|
10 years ago |
harshanL
|
5cb85e2069
|
Fixed merge conflicts
|
10 years ago |
harshanL
|
193eca9e2d
|
Added operation persistance logic & refactored the code
|
10 years ago |
manoj
|
17457bf6d3
|
Refactor Agents module
|
10 years ago |
Geeth Munasinghe
|
9f789af79f
|
Fixing git repo issues
|
10 years ago |
Geeth Munasinghe
|
ce3149bc45
|
Adding partially completed policy evaluation
|
10 years ago |
manoj
|
dd9bfdb6a7
|
Refactor Operations
|
10 years ago |
manoj
|
da0351ebcd
|
Change device type to device type Id
|
10 years ago |
manoj
|
72a3df080b
|
Merge branch 'master' of https://github.com/geethkokila/product-cdm
Conflicts:
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/DeviceManagementRepository.java
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
product/modules/mobileservices/agents/android/jax-rs/src/main/java/org/wso2/cdmserver/mobileservices/android/util/AndroidAPIUtils.java
product/pom.xml
|
10 years ago |
manoj
|
aa50bf96ed
|
Add License Mgt
|
10 years ago |