1894 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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