 junv
|
3e40ad643d
|
ux experience improved
|
2013-02-04 15:18:32 +08:00 |
|
 szpyxlwoni
|
120abe5666
|
add sort list of team to viewed team
|
2012-12-06 17:49:18 +08:00 |
|
|
szpyxlwoni
|
92e3156740
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-12-06 14:17:46 +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
|
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 |
|
|
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
|
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
|
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 |
|
|
szpyxlwoni
|
fa05b3db73
|
add local uservoice record
|
2012-11-28 17:42:28 +08:00 |
|
|
szpyxlwoni
|
6fcde56593
|
fix invite bugs
|
2012-11-27 11:23:34 +08:00 |
|
|
junv
|
046fda7e3a
|
fix some bug
|
2012-11-26 17:50:57 +08:00 |
|
|
junv
|
24a8aa7a52
|
add import list of people by email
|
2012-11-26 16:13:43 +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 |
|
 Mark Ryall
|
691918b144
|
added ability to remove delete your own messages
|
2012-11-22 23:50:01 +11:00 |
|
|
junv
|
5915b1acfb
|
add refresh auth_token
|
2012-11-20 18:03:01 +08:00 |
|
|
junv
|
f6462a3296
|
add invite people from new organisation
|
2012-11-20 14:07:02 +08:00 |
|
|
junv
|
ec25604a9c
|
modify a function name
|
2012-11-20 11:07:19 +08:00 |
|
|
junv
|
14e894f147
|
WIP
|
2012-11-20 09:08:16 +08:00 |
|
|
Mark Ryall
|
0e528860bf
|
removed some more unnecessary requires from home controller
|
2012-11-20 01:14:19 +11:00 |
|
|
Mark Ryall
|
9ae81d6aa4
|
simplified routes for google oauth authentication
|
2012-11-20 00:57:37 +11:00 |
|
|
Mark Ryall
|
e64f89c470
|
moved google oauth stuff into a mixin and removed unnecesary serialisation to the session
|
2012-11-20 00:40:16 +11:00 |
|
|
junv
|
e88ae7017c
|
modify every team to private,you can only view your organisation"s team
|
2012-11-19 17:38:54 +08:00 |
|
|
junv
|
eb70f666cc
|
user can choose whether to show avatar
|
2012-11-19 13:56:39 +08:00 |
|
|
Mark Ryall
|
9bd133fb66
|
switched default capybara driver, removed test controller and modified existing cucumber feature
|
2012-11-18 20:13:49 +10:00 |
|
|
Mark Ryall
|
550bcc81f7
|
added markdown processing of message content and added limit to messages displayed in antechamber
|
2012-11-17 20:16:47 +10:00 |
|
|
junv
|
0eb2568e4d
|
Merge remote-tracking branch 'origin/master'
|
2012-11-16 16:38:07 +08:00 |
|
|
junv
|
7fe12c5efa
|
not done yet
|
2012-11-16 16:38:02 +08:00 |
|
|
szpyxlwoni
|
9b8586e9f2
|
change client secret
|
2012-11-16 15:52:00 +08:00 |
|
|
szpyxlwoni
|
3768f8257e
|
modify cucumber test to make more functional test
|
2012-11-16 10:08:12 +08:00 |
|
|
junv
|
5979c14301
|
fix some team will display twice
|
2012-11-16 10:06:04 +08:00 |
|
|
junv
|
a11bc3da4b
|
back to disply teams which someone has already quit,and fix in some situations the person will display twice
|
2012-11-16 09:52:36 +08:00 |
|
|
junv
|
e8192df6be
|
fix some teams will diaply twice
|
2012-11-15 17:49:01 +08:00 |
|
|
szpyxlwoni
|
090f6a6a85
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-15 17:46:08 +08:00 |
|
|
szpyxlwoni
|
7c6760a8b6
|
cancel some modify to make test pass
|
2012-11-15 17:45:38 +08:00 |
|
|
junv
|
9bef58302e
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-15 17:09:51 +08:00 |
|
|
szpyxlwoni
|
99bccd0477
|
modify cucumber for test main process
|
2012-11-15 17:05:23 +08:00 |
|
|
junv
|
14a8ac3eea
|
fix quit team function,and remove the team show page will always show yourselef"s infomation,in no matter past,current,future
|
2012-11-15 16:51:28 +08:00 |
|
|
junv
|
08bf45a3be
|
fix some ruby best practices
|
2012-11-15 11:22:02 +08:00 |
|