Commit Graph

2480 Commits

Author SHA1 Message Date
Megala
e0a63f5f34 Merge remote-tracking branch 'upstream/release-3.0.x' into new_3.0.x 2017-01-18 09:47:13 +05:30
Megala
c35727ae0b resolving conflicts 2017-01-18 09:47:00 +05:30
Rasika Perera
bf9d93476c Updated title [EMM] into [IoT Server] 2017-01-18 09:02:29 +05:30
Rasika Perera
d68f2607f2 Updated android APK 2017-01-18 09:02:29 +05:30
Rasika Perera
8e8d595655 Merge pull request #531 from warunalakshitha/release-3.0.x
Fix find security Bugs
2017-01-18 08:37:33 +05:30
Megala
444119790c Fixing geo dashboard issues 2017-01-18 02:33:04 +05:30
ayyoob
f1e75d9375 apim seperation 2017-01-18 01:48:43 +05:30
warunalakshitha
989dc12752 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-17 23:23:53 +05:30
Rasika Perera
1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
2017-01-17 19:41:19 +05:30
Rasika Perera
c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
2017-01-17 19:40:38 +05:30
Rasika Perera
00ff43bfb4 Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
2017-01-17 19:40:22 +05:30
Rasika Perera
5fa9ce856d Merge pull request #528 from menakaj/release-3.0.x
Removing unused test page from portal.
2017-01-17 19:39:45 +05:30
Imesh Chandrasiri
dc840c389a Fix for inconsistant notification message 2017-01-17 17:48:12 +05:30
Imesh Chandrasiri
62ba568e05 Fixed android type view notification pane message inconsistancy issue 2017-01-17 17:34:51 +05:30
Hasunie
95a7ff6aaf fixing windows app-conf issue 2017-01-17 16:48:10 +05:30
Hasunie
e030be3d24 fixed code conflicts 2017-01-17 16:40:06 +05:30
Menaka Jayawardena
88b8901f75 Removed unused Test page from portal dashboard. 2017-01-17 16:15:23 +05:30
Menaka Jayawardena
f699ba54b3 Added Api annotation to AndroidSenseService 2017-01-17 16:14:49 +05:30
warunalakshitha
c650b4c818 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-17 16:09:27 +05:30
warunalakshitha
cb9783a67f Fix Hard Coded Password security warning 2017-01-17 16:08:00 +05:30
warunalakshitha
b06d86f87a Fix Predictable pseudorandom number generator security issue 2017-01-17 16:07:02 +05:30
warunalakshitha
e65b61bf95 Fix Message digest is weak security bug 2017-01-17 16:05:42 +05:30
Hasunie
38216c4b9d fixing win10,8.1 conflicting issues 2017-01-17 16:04:48 +05:30
Dunith Dhanushka
bbbfff28d9 UI Improvements for Geo Fencing 2017-01-17 15:40:27 +05:30
Dunith Dhanushka
d4107747ab Update device-view.js 2017-01-17 15:35:59 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Dunith Dhanushka
54b08f9b7a Adding the JSON formatted anchor text 2017-01-17 15:10:46 +05:30
Dunith Dhanushka
6634dded55 Building the anchor text 2017-01-17 15:09:05 +05:30
Rasika Perera
0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
2017-01-17 11:49:59 +05:30
Rasika Perera
9e658799ba Merge pull request #526 from dunithd/release-3.0.x
Setting device id and type to page title
2017-01-17 11:49:49 +05:30
Dunith Dhanushka
c6437c3065 Formatting the title 2017-01-17 11:14:58 +05:30
Dunith Dhanushka
c1de144bcf Setting device id and type to page title 2017-01-17 11:04:19 +05:30
Rasika Perera
2639c90e50 Updating cdmf version into [2.0.8-SNAPSHOT] 2017-01-17 09:54:12 +05:30
ayyoob
dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 22:40:03 +05:30
Rasika Perera
7fcc80d01c Merge pull request #525 from dunithd/release-3.0.x
UI improvements for Geo fencing
2017-01-16 19:36:35 +05:30
Dunith Dhanushka
b4f876d961 Updating the label text for Geo fencing link 2017-01-16 18:57:45 +05:30
Dunith Dhanushka
97d4fb1ef9 Removing advanced Geo fencing controls 2017-01-16 18:54:42 +05:30
Dunith Dhanushka
2c696b7222 Displaying the sidebar while page loads 2017-01-16 18:41:10 +05:30
ayyoob
76326b936c Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 18:30:01 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Ruwan
8ad75198eb Merge pull request #524 from menakaj/release-3.0.x
Replacing android-sense apk and changing portal home url
2017-01-16 14:39:38 +05:30
Menaka Jayawardena
ed85f78311 Replacing android-sense agent 2017-01-16 14:14:18 +05:30
Menaka Jayawardena
d8c2d65f05 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 00:13:35 +05:30
Rasika Perera
de0d304bca Merge pull request #523 from wso2/release-3.0.6
Release 3.0.6
2017-01-15 03:58:22 +05:30
Imesh Chandrasiri
8eb95c3695 Fix for multiple popup issue 2017-01-14 23:56:51 +05:30
Imesh Chandrasiri
d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 23:51:43 +05:30
Imesh Chandrasiri
e112371d8e Fix for multiple popup issue 2017-01-14 23:51:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
Rasika Perera
780137574e Updating cdmf-core version into [2.0.7] 2017-01-14 17:45:00 +05:30