62 Commits

Include renames

Author	SHA1	Message	Date
szpyxlwoni	706699a4b8	add team search	2012-12-06 14:33:30 +08:00
junv	a4f546210c	fix pusher channel	2012-12-06 14:19:41 +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	ea1d27c0ff	add antechamber auto-refresh based web-socket,but right now can;t be auto recoverd	2012-12-05 17:15:41 +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	9e0899e6b4	add google search to find loction of person\	2012-12-05 11:04:09 +08:00
szpyxlwoni	a1aaf56959	fix a soundcloud bug	2012-12-04 13:36:22 +08:00
szpyxlwoni	03ad1f5809	fix soundcloud	2012-11-29 11:06:15 +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
szpyxlwoni	4ee3aa1215	config soundcloud in diff host	2012-11-29 09:53:09 +08:00
szpyxlwoni	fa05b3db73	add local uservoice record	2012-11-28 17:42:28 +08:00
junv	a42e7ffb28	add error message when invite people failed	2012-11-27 15:37:11 +08:00
junv	4e8f6b5c29	update add member notification	2012-11-26 17:34:46 +08:00
junv	7eebf1413b	fix bug inivte some one do not belong any org	2012-11-26 16:54:36 +08:00
junv	24a8aa7a52	add import list of people by email	2012-11-26 16:13:43 +08:00
junv	45b02ce459	when publish message someone can publish several blanks	2012-11-23 17:37:32 +08:00
junv	4d0c8ccb3f	change send message in antechamber to ajax	2012-11-23 17:10:20 +08:00
junv	acfe03dd38	change require js position,and change refresh auth-token to ajax	2012-11-23 12:26:15 +08:00
junv	2e33820b54	change jquery import position	2012-11-23 10:05:32 +08:00
junv	b99cab923f	profile edit page user experience improved	2012-11-23 09:43:24 +08:00
junv	d11650ae6c	remove blank	2012-11-22 18:19:23 +08:00
junv	a6c62b261e	update profile page	2012-11-22 17:53:38 +08:00
junv	5915b1acfb	add refresh auth_token	2012-11-20 18:03:01 +08:00
szpyxlwoni	99bccd0477	modify cucumber for test main process	2012-11-15 17:05:23 +08:00
junv	9eba3dfe22	add a concept of organization	2012-11-13 15:24:19 +08:00
Mark Ryall	e089bd0726	reinstated fancybox	2012-11-13 10:41:55 +11:00
junv	9c56b3a0c9	change the login page	2012-11-09 14:58:05 +08:00
Mark Ryall	6dcf2aa396	split show team js out from increasingly huge application.js	2012-10-13 09:40:55 +10:00
Mark Ryall	704d834f71	started implementing search filtering	2012-10-12 21:29:15 +10:00
Mark Ryall	5b1abb9bb2	added filtering by pending	2012-10-12 13:23:23 +10:00
Mark Ryall	a286618274	added filtering by past/current/future	2012-10-12 13:13:53 +10:00