Commit Graph

5153 Commits

Author SHA1 Message Date
madhawap
95336baf5f Added .swp files to .gitignore 2017-08-08 13:07:51 +05:30
madhawap
cff50471af Correction to PR carbon-device-mgt/pull/884
Removed .pom.xml.swp
2017-08-08 13:04:04 +05:30
Pasindu
d129b8ab4a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-08 08:02:10 +05:30
lasantha
149901828a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-07 23:59:27 +05:30
WSO2 Builder
d78d443b1f [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare for next development iteration 2017-08-07 17:49:32 +00:00
WSO2 Builder
d604f9048c [WSO2 Release] [Jenkins #2531] [Release 3.0.62] prepare release v3.0.62 2017-08-07 17:48:07 +00:00
Dharmakeerhi Lasantha
919a16affb resolved broken pipe issue (#885) 2017-08-07 23:13:23 +05:30
lasantha
86426ba8f8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-07 00:17:21 +05:30
lasantha
10e4e9a288 resolved broken pipe issue 2017-08-07 00:16:47 +05:30
WSO2 Builder
dfad4c3707 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare for next development iteration 2017-08-05 10:02:54 +00:00
WSO2 Builder
acf4fb59f1 [WSO2 Release] [Jenkins #2527] [Release 3.0.61] prepare release v3.0.61 2017-08-05 10:01:30 +00:00
WSO2 Builder
4539e47fac [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare for next development iteration 2017-08-05 09:30:33 +00:00
WSO2 Builder
bba6c32e62 [WSO2 Release] [Jenkins #2526] [Release 3.0.60] prepare release v3.0.60 2017-08-05 09:29:09 +00:00
Lahiru Madushanka
c001d96877 Fix for 1261 (#884) 2017-08-05 14:53:44 +05:30
Madawa Soysa
db325a637e Truncating applist version if length greater than allowed length (#881)
In this commit, the application version is truncated if the version length is greater than the maximum allowed length in the database level.
2017-08-05 14:53:32 +05:30
GDLMadushanka
6628d97745 Fix for 1261 2017-08-04 18:19:51 +05:30
WSO2 Builder
f166be7d54 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare for next development iteration 2017-08-04 10:36:13 +05:30
WSO2 Builder
cbdf9ff922 [WSO2 Release] [Jenkins #2523] [Release 3.0.59] prepare release v3.0.59 2017-08-04 10:35:58 +05:30
Milan Perera
25840a1279 Fixed NPE in API publisher client (#882) 2017-08-04 09:33:37 +05:30
Pasindu
22858a5f9e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-04 09:03:41 +05:30
WSO2 Builder
7abc9e5844 [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare for next development iteration 2017-08-03 15:35:34 +00:00
WSO2 Builder
b204d2f17d [WSO2 Release] [Jenkins #2520] [Release 3.0.58] prepare release v3.0.58 2017-08-03 15:34:09 +00:00
Geeth
c6ecdf8d68 Merge pull request #883 from lasanthaDLPDS/master
fixes wso2/product-iots#1246
2017-08-03 20:57:20 +05:30
lasantha
1fc66ed180 Adding generate link api 2017-08-03 20:24:39 +05:30
Pasindu
938776e5df Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-03 09:45:37 +05:30
WSO2 Builder
63a0082c40 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare for next development iteration 2017-08-02 10:55:31 +00:00
WSO2 Builder
534a6b4235 [WSO2 Release] [Jenkins #2517] [Release 3.0.57] prepare release v3.0.57 2017-08-02 10:54:06 +00:00
Geeth
d8d8b6f644 Merge pull request #880 from milanperera/iot-master
Fixed JWT properties reading issue
2017-08-02 16:23:16 +05:30
Milan Perera
43eda69c62 Fixed JWT properties reading issue
Previously JWT properties file was read to get the defult-jwt-client properties. If someone wants to avoid reading the default keystores, it can only be done by uploading a jwt properties to registry and reading from itself.
This fix changes the default properties reading mechanism to get the properties from the file and creates a jwt client without being the default
2017-08-02 15:58:27 +05:30
WSO2 Builder
161657a790 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare for next development iteration 2017-08-02 09:45:58 +00:00
WSO2 Builder
9949209364 [WSO2 Release] [Jenkins #2515] [Release 3.0.56] prepare release v3.0.56 2017-08-02 09:44:34 +00:00
Dunith Dhanushka
d8d61b75c2 Removing DEFAULT NULL clause from DM_DEVICE_PROPERTIES table. (#872) 2017-08-02 15:09:05 +05:30
WSO2 Builder
787defbc55 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare for next development iteration 2017-08-02 07:39:39 +00:00
WSO2 Builder
c75b82c400 [WSO2 Release] [Jenkins #2513] [Release 3.0.55] prepare release v3.0.55 2017-08-02 07:38:14 +00:00
Milan Perera
5a8b82af3a Merge pull request #879 from DimalChandrasiri/master
Fix for tooltip not showing issue in device details page
2017-08-02 13:03:05 +05:30
Imesh Chandrasiri
b8e496f57e Fix for tooltip not showing issue in device details page 2017-08-02 12:49:43 +05:30
WSO2 Builder
11c915863c [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare for next development iteration 2017-08-01 11:35:57 +00:00
WSO2 Builder
4c5ea04c09 [WSO2 Release] [Jenkins #2510] [Release 3.0.54] prepare release v3.0.54 2017-08-01 11:34:33 +00:00
Madhawa Perera
885bbb9f61 Merge pull request #877 from sameeragunarathne/master
adding indexes required for get pending operation
2017-08-01 16:59:02 +05:30
sameera910409
02662fc3dc adding indexes required for get pending operation 2017-08-01 14:54:36 +05:30
Pasindu
0774917785 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-08-01 08:52:39 +05:30
WSO2 Builder
21f53fc7fe [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare for next development iteration 2017-07-31 08:21:19 +00:00
WSO2 Builder
28d9c15b82 [WSO2 Release] [Jenkins #2507] [Release 3.0.53] prepare release v3.0.53 2017-07-31 08:21:02 +00:00
Geeth
ce8220364e Merge pull request #873 from rasika/master
Fixing [Oracle12C] Errors on startup when started with -Dsetup
2017-07-31 12:32:31 +05:30
Madhawa Perera
3693d84b4f Merge pull request #875 from hasuniea/master
fixing connection-type issue
2017-07-31 12:05:38 +05:30
Hasunie
eb35c8e6d0 fixing connection-type issue 2017-07-31 11:51:21 +05:30
Madhawa Perera
55770caab1 Merge pull request #869 from DimalChandrasiri/master
Fixing [Policies] Policy deactivate option is not available
2017-07-31 11:39:59 +05:30
Madhawa Perera
28060d011d Merge pull request #874 from rasika/geo-fence-issues
Geo Fencing improvements
2017-07-31 11:39:20 +05:30
Rasika Perera
176738b14b Geo Fencing improvements 2017-07-29 16:46:00 +05:30
Rasika Perera
ea20c534f4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2017-07-28 17:59:05 +05:30