Commit Graph

246 Commits (0ffce8b177fc4d33ccf8c1158b0a4247fde6059e)

Author SHA1 Message Date
Ace 0cb99be949 Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
8 years ago
Rasika Perera 71784e6609 Fixing modal popups
8 years ago
Rasika Perera b99bd42a91 Fixing download modal issue on virtual firealarm
8 years ago
Chatura Dilan Perera bf72d212f7 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 18780e5274 [maven-release-plugin] prepare release v2.2.1
8 years ago
Ace a05dad6f4d Merging with master
8 years ago
Chatura Dilan Perera 89621ddfcb [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 28898a85e9 [maven-release-plugin] prepare release v2.2.0
8 years ago
mharindu 0d3cd0c9e1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.7
8 years ago
Chatura Dilan Perera ca2e631076 Fix conflicts
8 years ago
Chatura Dilan Perera 7ff9204646 [maven-release-plugin] prepare for next development iteration
8 years ago
Chatura Dilan Perera 5e43c5bef9 [maven-release-plugin] prepare release v2.1.2
8 years ago
hasuniea 97ff014b1b fixing log info message issue
8 years ago
hasuniea 5e2a42d798 fixing app-install issue
8 years ago
ayyoob 55107aaae5 fixing commit issues
8 years ago
ayyoob 38b9f017c3 merged with origin
8 years ago
harshanl b207554bba Refacotered IOT plugins to use own keystore.
8 years ago
mharindu b9289e801f Addin carbon 4.4.7 migration changes
8 years ago
harshanl e1e7bccd57 Temporary removed VirtualFireAlarm module to fix the build issue
8 years ago
mharindu 352574d2fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
hasuniea 4562b4d318 adding security fixes
8 years ago
mharindu 8ddee3b217 Refactored scopes
8 years ago
ayyoob d70c576ff0 refactored android configuration
8 years ago
mharindu 5f917e51f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
Rasika Perera 7b62aa3361 Fixing: Requested resource /app/conf/reader/main.js cannot be found
8 years ago
dilanua 42cfd92575 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
8 years ago
dilanua 6fe83cd0ac Updating path changes to business-controllers
8 years ago
mharindu 576bfb8236 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
Chatura Dilan Perera fb4d8ae990 refactor files
8 years ago
mharindu 2b3dfa0ce2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
Dilan U. Ariyaratne cd7ca448a0 Merge pull request #311 from ayyoob/com
8 years ago
ayyoob 04b1a22a00 Added missing license headers
8 years ago
ayyoob 618230e121 remove new line
8 years ago
Dilan U. Ariyaratne 4f07a42a95 Merge pull request #310 from ayyoob/com
8 years ago
ayyoob b60487304f removed error message variable
8 years ago
Milan Perera 2998c1e4ac Merge pull request #309 from ayyoob/com
8 years ago
ayyoob 20cf418394 Fixed Issues raised in the comments
8 years ago
ayyoob 95ca419d17 avoided null check when comparing
8 years ago
ayyoob 9eec100535 fixed formatting issues
8 years ago
ayyoob 4ffa47f0b4 removed redundant brackets
8 years ago
Chatura Dilan 1fa5bdba44 Merge branch 'master' of github.com:wso2/carbon-device-mgt-plugins
8 years ago
Chatura Dilan 338d804dba Added validations for invalid device Ids
8 years ago
Ruwan 5356ee920c Merge pull request #308 from ayyoob/transport
8 years ago
ayyoob d650e86e00 few changes in real time analytics
8 years ago
mharindu be73e9a659 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
dilanua 01e32c86c8 Updating base ui app config reader
8 years ago
ayyoob 22f4a9e2af added mqtt and web socket authorisation
8 years ago
mharindu 965402a7ac Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into scope-impl
8 years ago
Ace d802570be9 Adding app.conf for mobile base plugin
8 years ago
mharindu 2563098948 Fixed conflicts and merged
9 years ago