291 Commits

Include renames

Author	SHA1	Message	Date
Jeff Xiong	1cc624c10b	fix a typo	2012-12-06 14:44:21 +08:00
szpyxlwoni	706699a4b8	add team search	2012-12-06 14:33:30 +08:00
szpyxlwoni	7cf845153a	Merge remote-tracking branch 'heroku/master'	2012-12-06 14:24:13 +08:00
szpyxlwoni	1376cc92fc	fix a bug	2012-12-06 14:23:15 +08:00
junv	a4f546210c	fix pusher channel	2012-12-06 14:19:41 +08:00
szpyxlwoni	92e3156740	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-06 14:17:46 +08:00
szpyxlwoni	a70a948f97	add team search input	2012-12-06 14:17:21 +08:00
junv	ec6b5b4bb2	filter blanks of slug when create a team	2012-12-06 14:12:21 +08:00
szpyxlwoni	490476cca2	Merge remote-tracking branch 'heroku/master'	2012-12-06 14:08:35 +08:00
szpyxlwoni	1e009425f7	fix google maps error message and make list of team sort by team name	2012-12-06 14:07:22 +08:00
junv	1fd6d145b4	fix pusher channel bug	2012-12-06 13:00:41 +08:00
junv	3995c7e239	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-06 11:24:29 +08:00
junv	b1cd590a63	change push message to pusher ,before use it we should config it at localhost and heroku	2012-12-06 11:16:41 +08:00
szpyxlwoni	c1e4d4ff18	Merge remote-tracking branch 'heroku/master'	2012-12-06 11:15:00 +08:00
szpyxlwoni	b6dc5e4e32	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-06 11:12:07 +08:00
szpyxlwoni	68afb37c29	add search people in a team	2012-12-06 11:11:56 +08:00
junv	d40596ef06	trying	2012-12-06 09:54:42 +08:00
junv	f37d88d84a	ddd	2012-12-06 09:30:36 +08:00
junv	46c4fd5081	try to fix	2012-12-06 08:54:38 +08:00
junv	661882f409	try to fix	2012-12-05 18:16:24 +08:00
junv	4bd724079f	try to fix	2012-12-05 18:11:58 +08:00
junv	709fbe1a1c	try to fix address bug	2012-12-05 18:04:12 +08:00
junv	a365c0f436	try	2012-12-05 17:59:31 +08:00
junv	9315f2ad96	fix web socket address port	2012-12-05 17:54:08 +08:00
junv	686fc27126	fix web socket address bind bug	2012-12-05 17:48:30 +08:00
junv	51ba3907d8	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-05 17:15:48 +08:00
junv	ea1d27c0ff	add antechamber auto-refresh based web-socket,but right now can;t be auto recoverd	2012-12-05 17:15:41 +08:00
szpyxlwoni	72a4102090	Merge remote-tracking branch 'heroku/master'	2012-12-05 16:39:37 +08:00
szpyxlwoni	721c552ce4	add sort of list of teams	2012-12-05 16:36:42 +08:00
junv	f79ad1cc53	qMerge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-05 14:28:56 +08:00
junv	70f89d3d47	add experiment websocket feature	2012-12-05 14:27:34 +08:00
szpyxlwoni	f277ab8b9c	fix a bug that person add a team with nil name	2012-12-05 11:30:33 +08:00
szpyxlwoni	5c0bf3bd1f	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-05 11:04:24 +08:00
szpyxlwoni	9e0899e6b4	add google search to find loction of person\	2012-12-05 11:04:09 +08:00
junv	8bdbb5caa8	fix git personal website	2012-12-05 08:53:34 +08:00
szpyxlwoni	1c3d9c246a	modify quiz	2012-12-04 17:22:06 +08:00
szpyxlwoni	b57c4e92bc	select person with facts in quiz page	2012-12-04 17:09:22 +08:00
junv	f068ce3eea	remove google map js from some unused pages	2012-12-04 16:46:31 +08:00
junv	cf3f915488	fix profile page flickr dispaly bug	2012-12-04 15:51:50 +08:00
junv	d7245ac9a4	add job title to avatars print page	2012-12-04 15:29:53 +08:00
szpyxlwoni	89ae1532d1	add job title to people	2012-12-04 15:14:10 +08:00
szpyxlwoni	f2610e8b42	Merge branch 'master' of https://github.com/wahyd4/ocelots	2012-12-04 13:36:51 +08:00
szpyxlwoni	a1aaf56959	fix a soundcloud bug	2012-12-04 13:36:22 +08:00
junv	409e7e3b20	fix social media display bug	2012-12-04 13:23:17 +08:00
junv	39f0d2e1df	Merge remote-tracking branch 'heroku/master'	2012-11-29 11:15:27 +08:00
szpyxlwoni	383b6164b4	fix soundcloud	2012-11-29 11:13:20 +08:00
szpyxlwoni	03ad1f5809	fix soundcloud	2012-11-29 11:06:15 +08:00
junv	11a791e261	Merge remote-tracking branch 'heroku/master'	2012-11-29 11:04:55 +08:00
szpyxlwoni	6ac344ddfa	fix soundcloud	2012-11-29 10:47:03 +08:00
szpyxlwoni	6f1f983c13	fix soundcloud	2012-11-29 10:41:51 +08:00