Commit Graph

187 Commits

Author SHA1 Message Date
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
charithag
30df14b284 Add permissions required to grouping 2015-07-23 12:36:58 +05:30
charithag
54a4bc4961 Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	modules/p2-profile-gen/pom.xml
2015-07-23 10:09:17 +05:30
ayyoob
1d45022ec6 removed user.core.manager 2015-07-23 00:24:42 +05:30
charithag
c32d4a97df Merge remote-tracking branch 'upstream/master' 2015-07-22 18:43:33 +05:30
ayyoob
15d2b01c01 few changes 2015-07-22 18:40:34 +05:30
Shabir Mohamed
04e4be51a2 added mqtt support for sending device controls 2015-07-22 17:59:35 +05:30
ayyoob
5b5df161fc few changes after test 2015-07-22 11:10:37 +05:30
Rasika Perera
3740712d96 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-21 16:53:09 +05:30
Rasika Perera
1b58491680 fixing fuse.jag issue on windows 2015-07-21 16:46:40 +05:30
charithag
2e752c61d9 Graph time will automatically set to current time when user tried to change graph duration 2015-07-21 16:29:43 +05:30
charithag
796bbdf7f5 Add CPU temperature graph to analysis 2015-07-21 13:36:02 +05:30
Rasika Perera
eae80dd834 changes to jaggery app, sketch 2015-07-21 12:37:53 +05:30
ayyoob
813f67c44a changed analytics 2015-07-21 06:09:06 +05:30
charithag
b2eb1f9b44 Fixed issue with bundle export 2015-07-20 15:26:59 +05:30
ayyoob
5886952eb5 removed iot 2015-07-17 17:34:23 +05:30
Rasika Perera
669e1d0599 fixing jaggery app performance issue 2015-07-17 17:31:23 +05:30
ayyoob
5fd7fbb273 added schema validator 2015-07-12 22:05:22 +05:30
ayyoob
a91dd73b90 bam and analytics corrections 2015-07-12 04:10:59 +05:30
charithag
64b1d81da7 Merge branch 'master' of https://github.com/wso1-dev/product-device-cloud 2015-07-06 17:54:41 +05:30
charithag
e336c4f9f2 Add sensor types for CPU Load and RAM Usage 2015-07-06 17:53:47 +05:30
Rasika
15534b789f adding changes 2015-07-06 17:43:18 +05:30
Rasika
f435d6d1b4 fixing errors 2015-07-06 13:58:41 +05:30
charithag
d04f8a22b7 Filter analytics according to device types 2015-07-06 13:18:39 +05:30
charithag
4bd39ed385 Fix analytics js and css issue 2015-07-06 12:41:52 +05:30
Rasika
db8d7985bc adding iotserver 2015-07-06 11:41:38 +05:30
Rasika
0da2c1dd74 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-07-06 11:39:32 +05:30
Rasika
21e10c2bb2 adding iotserver 2015-07-06 11:39:19 +05:30
ayyoob
f45a8500ab few changes 2015-07-06 04:53:29 +05:30
Rasika
7388502ac2 fixing sketch property file issue 2015-07-06 00:13:40 +05:30
ayyoob
202c6b61f9 few fixes 2015-07-06 00:03:46 +05:30
ayyoob
4eef5c0a3e added access & refresh token generation 2015-07-05 06:21:25 +05:30
charithag
e2eafa1320 Add statistic selection options with updated date range picker 2015-07-03 20:40:31 +05:30
charithag
62467ac564 Add graph capability to resize according to window size. 2015-07-03 18:02:35 +05:30
charithag
9af5baef1b Updated device statistic graphs 2015-07-03 17:31:55 +05:30
ayyoob
0b9e14ddb3 login redirection resolved 2015-07-02 17:09:21 +05:30
ayyoob
c50c7b36dc Few changes on Android Sense 2015-06-29 13:35:23 +05:30
Rasika
98dde99da1 Merge branch 'master' of https://github.com/wso2-dev/product-device-cloud 2015-06-23 16:24:37 +05:30
Rasika
9cd77d88a0 adding organized units 2015-06-23 16:24:17 +05:30
ayyoob
f8d7d9796e few changes 2015-06-22 12:13:17 +05:30
ayyoob
cc4098adbb few changes 2015-06-22 11:26:07 +05:30
ayyoob
ee3d545b9d android device type added 2015-06-21 22:43:13 +05:30
ayyoob
add5a8cfd9 Few changes 2015-06-21 00:38:44 +05:30
ayyoob
bbd09ae509 Few tweaks on fire alarm, arduino and sensebot after testing 2015-06-21 00:38:28 +05:30
Shabir Mohamed
92358c4135 added new firealarm sketch 2015-06-18 17:26:17 +05:30
ayyoob
3ceed63107 Few changes for graph display 2015-06-17 18:12:48 +05:30
ayyoob
07bae69062 Android Device Type Updated 2015-06-17 00:59:26 +05:30
ayyoob
be5e12deb9 change on arduino jaggery 2015-06-16 23:05:14 +05:30
Shabir Mohamed
c4bd0ec88d re-enabled watch-dog timer reset in sensebot code 2015-06-15 10:47:45 +05:30
Shabir Mohamed
036bec9888 commented out the watch_dog library stuff 2015-06-12 00:48:19 +05:30
Shabir Mohamed
3e43767efe increased content length to enable APIM support 2015-06-11 10:53:07 +05:30
ayyoob
8a8b9e6ae1 update 2015-06-11 01:46:49 +05:30
ayyoob
7ea36598c5 db update 2015-06-11 01:30:54 +05:30
ayyoob
635161d8f5 added arduino device type 2015-06-10 22:29:59 +05:30
ayyoob
a39e79fe96 sketch corrections 2015-06-10 06:04:55 +05:30
Shabir Mohamed
5e94332a50 added agent for device type sensebot 2015-06-10 00:49:03 +05:30
Rasika
dd138ebad5 change user api 2015-06-10 00:02:21 +05:30
Rasika
8454bb2ea7 changing user api 2015-06-09 23:41:46 +05:30
Rasika
142b5b4a4b adding statistics to any device 2015-06-09 21:30:42 +05:30
ayyoob
f1bc4007d2 API manager roles added 2015-06-09 20:35:55 +05:30
Rasika
7b03db48ed jaggery app changes 2015-06-09 20:21:48 +05:30
Rasika
a1b80d0b3c removing sensebot jaggery app 2015-06-09 16:02:00 +05:30
ayyoob
2ca214975c few changes to resolve the error on bam config 2015-06-09 12:20:37 +05:30
ayyoob
468d3284c8 change digital display db name 2015-06-08 22:50:51 +05:30
ayyoob
a51990351e Added device types - Digital Display, Sensebot, Raspberrypi 2015-06-08 01:42:55 +05:30
ayyoob
e857a7aa5d Refactor 2015-06-07 19:37:25 +05:30
Rasika
06f21466de adding changes 2015-06-06 22:50:51 +05:30
Rasika
ae3a134f87 service api changes 2015-06-06 22:44:25 +05:30
ayyoob
52200f68e0 Refactor product device cloud 2015-06-06 00:30:57 +05:30
ayyoob
bf6b4bcb31 refactored 2015-06-05 19:06:29 +05:30
Rasika
2b2ce0f35b fixing hanging on list all devices 2015-06-03 18:19:24 +05:30
Rasika
1b5e29a5a5 removing unneccessary files 2015-06-03 18:17:31 +05:30