Harshan Liyanage
|
e686b2af0e
|
Resolved merge conflicts
|
8 years ago |
Harshan Liyanage
|
4272bd1a7a
|
Merge branch 'sameeragunarathne-master'
|
8 years ago |
Harshan Liyanage
|
755786db8b
|
Merge branch 'master' of https://github.com/sameeragunarathne/carbon-device-mgt into sameeragunarathne-master
|
8 years ago |
WSO2 Builder
|
d433525145
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
35ee3eca3a
|
[WSO2 Release] [Jenkins #2150] [Release 2.0.24] prepare release v2.0.24
|
8 years ago |
Kamidu Sachith Punchihewa
|
1a35595701
|
Merge pull request #633 from harshanL/master
Fixed device renaming issue.
|
8 years ago |
Harshan Liyanage
|
a7e28f2b10
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Harshan Liyanage
|
75486b3bb8
|
Fixed Device renaming issue.
|
8 years ago |
Susinda Perera
|
d86bdb0be4
|
Update build status button
|
8 years ago |
sameera910409
|
33132b1f8e
|
refactor code for firebase cloud messaging
|
8 years ago |
WSO2 Builder
|
4e0afb7d39
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
33f1448c82
|
[WSO2 Release] [Jenkins #2146] [Release 2.0.23] prepare release v2.0.23
|
8 years ago |
Harshan Liyanage
|
3ab025a6d8
|
Merge pull request #631 from ayyoob/cloud-3.1.0
added claimable property and fixed unsecured endpoint bug
|
8 years ago |
ayyoob
|
b1b0b03ce1
|
changed license year
|
8 years ago |
WSO2 Builder
|
e95e96f06c
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
5d55413e02
|
[WSO2 Release] [Jenkins #2141] [Release 2.0.22] prepare release v2.0.22
|
8 years ago |
Susinda
|
40469d0e4d
|
Adding maven.javadoc.skip to org.wso2.carbon.apimgt.integration.generated.client project
|
8 years ago |
Susinda Perera
|
700da104fd
|
Merge pull request #630 from susinda/master
Adding Hasunie's fix on initialOperations implementation
|
8 years ago |
Susinda
|
e23aaa6647
|
Adding Hasunie's fix on initialOperations implementation
|
8 years ago |
Susinda
|
668744a604
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
8 years ago |
Susinda
|
7083c4ec9b
|
version corrected to 2.0.22-SNAPSHOT
|
8 years ago |
Charitha Goonetilleke
|
8d4681aca5
|
Merge pull request #629 from ruwany/master
Fixing build break
|
8 years ago |
Ace
|
1c1c49a846
|
Fixing build break
|
8 years ago |
Susinda Perera
|
bd7d6939e5
|
Merge pull request #628 from susinda/master
Merging from cloud-3.1.0
|
8 years ago |
Susinda
|
e83fa8cb02
|
org.wso2.carbon.apimgt.integration.generated.client version increment
|
8 years ago |
WSO2 Builder
|
ae3300afde
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
6646c0c56f
|
[WSO2 Release] [Jenkins #2134] [Release 2.0.21] prepare release v2.0.21
|
8 years ago |
Susinda Perera
|
7c9659ed29
|
Merge pull request #1 from susinda/cloud-3.1.0
Cloud 3.1.0
|
8 years ago |
WSO2 Builder
|
21cdcdd21a
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
23be60ebd0
|
[WSO2 Release] [Jenkins #2133] [Release 2.0.20] prepare release v2.0.20
|
8 years ago |
Susinda Perera
|
2147fbe092
|
Merge pull request #627 from susinda/master
Megre 3.1.0-test to master
|
8 years ago |
Susinda
|
b0ecd4ba54
|
Merge branch 'master' into 3.1.0-test
|
8 years ago |
Charitha Goonetilleke
|
968913f135
|
Merge pull request #626 from Kamidu/cloud-3.1.0
remove the cloud related config from config.json
|
8 years ago |
kamidu
|
0fade6aa9f
|
remove the cloud related config from config.jason
|
8 years ago |
Charitha Goonetilleke
|
fc1cc5049f
|
Merge pull request #625 from Kamidu/cloud-3.1.0
Device Cloud Requested UI fixes
|
8 years ago |
kamidu
|
dd26f366df
|
Merge branch 'cloud-3.1.0' of https://github.com/wso2/carbon-device-mgt into cloud-3.1.0
|
8 years ago |
kamidu
|
f9a03133fa
|
device cloude related ui improvements
|
8 years ago |
ayyoob
|
2384755a97
|
added claimable property and fixed unsecured endpoint bug
|
8 years ago |
Harshan Liyanage
|
0ac8329fbc
|
Merge branch 'ayyoob-cloud-3.1.0' into cloud-3.1.0
|
8 years ago |
ayyoob
|
964fb7ce72
|
regenerated swagger api based on apimgt 2.1.0 rest api
|
8 years ago |
ayyoob
|
525b55d603
|
avoid race condition by loading tiers
|
8 years ago |
Ayyoob Hamza
|
f554f62e1d
|
Merge pull request #621 from ayyoob/cloud-3.1.0
added permission and subscription fix
|
8 years ago |
ayyoob
|
5e4b0564b7
|
added permission fix for operation and synchronised application creation to avoid duplicate subscription
|
8 years ago |
Susinda Perera
|
1009c98da4
|
Merge pull request #620 from Megala21/revert_task
Reverting task related changes, that are done for cloud deployment
|
8 years ago |
ayyoob
|
6a0c0cb299
|
added default permissions
|
8 years ago |
Megala
|
a2d0c59e17
|
Revert 2988357eb9
|
8 years ago |
Megala
|
4fdeec89cc
|
Revert f3f7635d3b
|
8 years ago |
Milan Perera
|
2a250371a2
|
Merge pull request #619 from ayyoob/cloud-3.1.0
added logger trace and made api app registration to be device type specific
|
8 years ago |
ayyoob
|
d66e439f49
|
added carbon local ip as config
|
8 years ago |
Susinda Perera
|
44904b6601
|
Merge pull request #618 from susinda/3.1.0-test
increment carbon-devicemgt version to 2.0.20
|
8 years ago |