Commit Graph

6205 Commits

Author SHA1 Message Date
Arcane94
e778700a5e Some more license year changes 2018-03-14 12:05:21 +05:30
Arcane94
0aff4193d3 License year changes and comment changes 2018-03-14 12:05:21 +05:30
Arcane94
8c303911b0 Final frontend and backend changes 2018-03-14 12:05:21 +05:30
Arcane94
1ffaad6fb7 rolling back some imports 2018-03-14 11:59:54 +05:30
Arcane94
27ae7cfed8 Fix for adding alerts twice with same name bug 2018-03-14 11:57:01 +05:30
Arcane94
9e64c8971d Minor changes in execution plans 2018-03-14 11:46:38 +05:30
Arcane94
7c88dfa0b3 Minor changes in backend APIs 2018-03-14 11:46:38 +05:30
Arcane94
7583957e16 Execution Plans and other updates 2018-03-14 11:46:38 +05:30
Arcane94
790f91b3b7 Add method overloads 2018-03-14 11:46:38 +05:30
Charitha Goonetilleke
6922a8693f
Merge pull request #1221 from geethkokila/master
Add GDPR fixes
2018-03-14 05:46:06 +00:00
WSO2 Builder
ffb28d018b [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare for next development iteration 2018-03-14 04:57:03 +00:00
WSO2 Builder
66591d3680 [WSO2 Release] [Jenkins #2959] [Release 3.1.4] prepare release v3.1.4 2018-03-14 04:56:53 +00:00
geethkokila
ec3f814133 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-14 10:05:48 +05:30
Charitha Goonetilleke
9d8a88aa74
Merge pull request #1219 from charithag/master
Bump kernel, identity, analytics common & sso versions
2018-03-14 04:25:37 +00:00
Charitha Goonetilleke
329e41b04c
Merge pull request #1197 from Arcane94/master
Fixed https://github.com/wso2/carbon-device-mgt/issues/1194
2018-03-14 04:25:21 +00:00
charitha
c26198c0e1 Bump analytics commons version 2018-03-14 09:26:40 +05:30
charitha
b1696eb08e Bump identity versions 2018-03-13 19:47:44 +05:30
charitha
709c2b0a3d Bump kernel and identity versions 2018-03-13 18:19:23 +05:30
charitha
fc5e7577b7 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-13 12:11:29 +05:30
charitha
4903f73e4a Merge branch '330-release' of https://github.com/geethkokila/carbon-device-mgt 2018-03-13 12:10:30 +05:30
Kamidu Sachith Punchihewa
5bd42415b2
Merge pull request #1209 from lasanthaDLPDS/master
Fix formatting issues
2018-03-13 11:05:23 +05:30
WSO2 Builder
0f272ff4ed [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare for next development iteration 2018-03-13 04:16:58 +00:00
WSO2 Builder
ac9d20af2f [WSO2 Release] [Jenkins #2954] [Release 3.1.3] prepare release v3.1.3 2018-03-13 04:16:48 +00:00
Geeth
a2b3522617
Merge pull request #1220 from geethkokila/330-release
Fix the api publishing api version
2018-03-13 09:32:35 +05:30
geethkokila
07abb25a7a Fix the api publishing api version 2018-03-13 09:15:33 +05:30
charitha
fbbddfaab6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 17:37:17 +05:30
WSO2 Builder
bbe144e25f [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare for next development iteration 2018-03-12 11:42:26 +00:00
WSO2 Builder
7ee1bdacb6 [WSO2 Release] [Jenkins #2952] [Release 3.1.2] prepare release v3.1.2 2018-03-12 11:42:16 +00:00
charitha
d8dbeb6c00 Bump analytics common & sso versions 2018-03-12 17:03:59 +05:30
WSO2 Builder
549cf42dca Merge commit 'b31c31b410c8ab7dbfe691eb0ab276c75415f440' into 9f91fa60-cc25-41d7-9140-3797020ccc0f 2018-03-12 11:30:32 +00:00
lasantha
11da4e6dd1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:55:14 +05:30
Kamidu Sachith Punchihewa
be63361d4a
Merge pull request #1218 from geethkokila/330-release
Update the identity and oauth version
2018-03-12 16:51:06 +05:30
geethkokila
366ee009b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into 330-release 2018-03-12 16:46:16 +05:30
geethkokila
ca935759a7 Updating the identity and oauth components 2018-03-12 16:45:52 +05:30
WSO2 Builder
b31c31b410 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare for next development iteration 2018-03-12 11:15:23 +00:00
WSO2 Builder
ab8cd3f8e3 [WSO2 Release] [Jenkins #2951] [Release 3.1.1] prepare release v3.1.1 2018-03-12 11:15:13 +00:00
lasantha
04527696eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2018-03-12 16:36:33 +05:30
Rasika Perera
7860e02814
Merge pull request #1217 from lasanthaDLPDS/geet_3.3.0
Fix OAuth2ScopeValidator Issues
2018-03-12 16:32:40 +05:30
lasantha
9629101a85 Fix OAuth2ScopeValidator Issues
Due to the version bumping of the identity component, there were some references to the deprecated methods. Hence removed those and referred approved methods. In addition to that, to compatible with WSO2 cording standards, reformat the source as well.
2018-03-12 15:31:14 +05:30
WSO2 Builder
748798df4c [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare for next development iteration 2018-03-12 09:51:53 +00:00
WSO2 Builder
e0704671de [WSO2 Release] [Jenkins #2949] [Release 3.1.0] prepare release v3.1.0 2018-03-12 09:51:43 +00:00
Rasika Perera
15d6c7ed06
Merge pull request #1216 from geethkokila/330-release
Update device-mgt component version-3.1.0
2018-03-12 15:08:32 +05:30
geethkokila
71f1ff96e6 Update device-mgt component version (3.1.0) 2018-03-12 14:57:21 +05:30
WSO2 Builder
9ba315217c [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare for next development iteration 2018-03-12 08:42:09 +00:00
WSO2 Builder
96ee898b50 [WSO2 Release] [Jenkins #2947] [Release 3.0.244] prepare release v3.0.244 2018-03-12 08:41:56 +00:00
Kamidu Sachith Punchihewa
2bba71030e
Merge pull request #1213 from geethkokila/330-release
Upgrade the versions
2018-03-12 13:59:34 +05:30
geethkokila
7a9cf05e37 Merge branch '330-release' of https://github.com/geethkokila/carbon-device-mgt into 330-release 2018-03-12 12:00:53 +05:30
geethkokila
4e4fa8d832 Updating the jwt version 2018-03-12 11:53:05 +05:30
geethkokila
7a25109882 Changing the carbon commons versions and api-registration endpoint 2018-03-12 11:30:28 +05:30
geethkokila
812c715c09 Bump the versions of other components
This commits changes the versions of other components and fixes the compilation errors and test failures
2018-03-12 11:30:28 +05:30