Commit Graph

512 Commits

Author SHA1 Message Date
charithag
f04cb206b6 Add policies to extended search 2015-07-27 12:21:41 +05:30
charithag
9419c935ca Add policies to extended search 2015-07-27 12:20:56 +05:30
charithag
055ae43007 Add policies to extended search 2015-07-27 12:19:55 +05:30
charithag
d7c6c083a0 Add Sonar graph to analytics. Fix undefined content issue in device details 2015-07-27 11:59:50 +05:30
Rasika Perera
019f077ea4 fixing jaggery app performance issue 2015-07-27 11:46:27 +05:30
Rasika Perera
68ced07235 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-27 10:42:40 +05:30
Rasika Perera
c7b3161231 adding policies 2015-07-27 10:42:23 +05:30
Rasika Perera
987c35fecc adding temporary mqtt client jar deployment 2015-07-27 10:31:15 +05:30
charithag
751dfb1bcf Avoid page reloading 2015-07-27 10:21:52 +05:30
Rasika Perera
770ce0f71e Merge pull request #1 from charithag/master
Add Grouping
2015-07-26 12:16:04 +05:30
charithag
ef3b196674 Completed device association with groups 2015-07-26 11:08:02 +05:30
charithag
91c2c8d959 Merge remote-tracking branch 'upstream/master' 2015-07-26 11:07:14 +05:30
Rasika Perera
59df602f6b adding policy creation 2015-07-26 09:21:34 +05:30
charithag
665e88acfb Completed group sharing 2015-07-26 09:05:21 +05:30
charithag
2f6e195f95 Merge remote-tracking branch 'upstream/master' 2015-07-26 06:49:14 +05:30
Rasika Perera
f64ff853d0 improve user listing method 2015-07-26 04:13:40 +05:30
Rasika Perera
a726beb345 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-26 04:06:33 +05:30
Rasika Perera
65fda67af1 fixing error in policy listing module 2015-07-26 04:06:12 +05:30
Rasika Perera
11da6b4c28 fixing error in get users 2015-07-26 04:04:20 +05:30
ayyoob
81cd1f9ece user api conflict resolved 2015-07-26 02:18:32 +05:30
charithag
3bdbb2d9b1 Merge remote-tracking branch 'upstream/master' 2015-07-25 21:38:19 +05:30
charithag
e473946547 Add group details page 2015-07-25 21:37:43 +05:30
Rasika Perera
166236f46a removing cdmf user core dependencies 2015-07-25 20:51:03 +05:30
Rasika Perera
daeccc4410 removing manual dropins 2015-07-25 20:50:22 +05:30
charithag
70dd0203b5 Merge remote-tracking branch 'upstream/master' 2015-07-25 10:51:25 +05:30
Rasika Perera
ecacf33c69 improving performance and re-adding cdmf.user.core 2015-07-25 10:50:22 +05:30
charithag
09a6f99c89 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	modules/distribution/src/repository/jaggeryapps/iotserver/api/user-api.jag
2015-07-25 10:27:54 +05:30
charithag
b59a2e22de Group module completed without sharing 2015-07-25 10:25:52 +05:30
Rasika Perera
c478db455f restoring previous errornous jaggery app 2015-07-25 09:33:52 +05:30
Rasika Perera
77eb089e2a changes 2015-07-25 01:37:03 +05:30
Rasika Perera
554d5a1acb merged conflicts 2015-07-25 01:34:14 +05:30
Rasika Perera
bfab890abd adding old jaggery app 2015-07-25 01:31:43 +05:30
charithag
00122dc921 Merge remote-tracking branch 'upstream/master' 2015-07-24 23:07:55 +05:30
charithag
e27279a83b Fix bugs in unified framework 2015-07-24 23:07:04 +05:30
charithag
35aaffd7e0 Commit before unified framework changes [Unstable] 2015-07-24 22:59:29 +05:30
ayyoob
8d5451c589 added roles 2015-07-24 16:35:26 +05:30
charithag
4ee7427ec1 Merge remote-tracking branch 'upstream/master' 2015-07-24 15:58:32 +05:30
Rasika Perera
0b5c1b3bc6 adding policies 2015-07-24 15:43:26 +05:30
charithag
1a91687e06 Merge remote-tracking branch 'upstream/master' 2015-07-23 22:43:24 +05:30
Rasika Perera
f3648800bc Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-23 22:42:47 +05:30
Rasika Perera
ca0cf8d6cd fixing user management issue 2015-07-23 22:36:29 +05:30
charithag
92bcaef0fc Add permissions required to grouping 2015-07-23 22:33:44 +05:30
charithag
f507be159c Merge remote-tracking branch 'upstream/master' 2015-07-23 22:14:43 +05:30
Shabir Mohamed
9ee807d783 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-23 19:46:27 +05:30
Shabir Mohamed
ced4a6fbdf added xmpp and mqtt configs to file 2015-07-23 19:46:15 +05:30
Rasika Perera
954341a90a adding xmpp script 2015-07-23 17:01:46 +05:30
Rasika Perera
201ff62664 fixing getowner() according to cdmf device object refactoring 2015-07-23 16:01:07 +05:30
charithag
52e0b66b58 Merge remote-tracking branch 'upstream/master' 2015-07-23 15:35:08 +05:30
ayyoob
e055e79ea4 api publisher config removed 2015-07-23 15:13:55 +05:30
Rasika Perera
47a06249bf fix changes for usermanager osgi service retrieve 2015-07-23 13:00:59 +05:30