 junv
|
7fe12c5efa
|
not done yet
|
2012-11-16 16:38:02 +08:00 |
|
|
junv
|
1470416ac3
|
Merge branch 'master' into develop
|
2012-11-16 15:42:52 +08:00 |
|
|
junv
|
b163c015f5
|
teams list page ui improvment
|
2012-11-16 15:42:44 +08:00 |
|
 szpyxlwoni
|
1c3ca05b31
|
modify the test of main process
|
2012-11-16 10:25:15 +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
|
f2f48cb9f9
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-15 17:06:16 +08:00 |
|
|
szpyxlwoni
|
99bccd0477
|
modify cucumber for test main process
|
2012-11-15 17:05:23 +08:00 |
|
|
junv
|
a39139f361
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-15 16:51:47 +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 |
|
 Jeff Xiong
|
3055bb4288
|
change gem source back to rubygems.org
|
2012-11-15 15:38:00 +08:00 |
|
|
junv
|
365b523a61
|
none
|
2012-11-15 11:24:45 +08:00 |
|
|
junv
|
08bf45a3be
|
fix some ruby best practices
|
2012-11-15 11:22:02 +08:00 |
|
|
Jeff Xiong
|
fc511e710a
|
change gem source back to rubygems.org
|
2012-11-15 10:23:41 +08:00 |
|
|
Jeff Xiong
|
40a0452ff1
|
change gem source back to rubygems.org
|
2012-11-15 10:22:46 +08:00 |
|
|
junv
|
df5d404e89
|
change gem repo to rubygems
|
2012-11-15 10:22:03 +08:00 |
|
|
szpyxlwoni
|
2a35cb975e
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-15 10:17:24 +08:00 |
|
|
szpyxlwoni
|
eabc239dc2
|
add cucumber test for main process
|
2012-11-15 10:17:16 +08:00 |
|
|
junv
|
9291cd0119
|
fix the gravatar
|
2012-11-15 09:18:49 +08:00 |
|
|
junv
|
e7e5566447
|
add gravatar api,if user uploaded photo ,the system will use it first,if not system will use gravatar.com API
|
2012-11-14 23:17:38 +08:00 |
|
|
Jeff Xiong
|
958fa365c5
|
get rid of annoying outputs from controller specs
|
2012-11-14 18:22:43 +08:00 |
|
|
junv
|
a107e1f7d3
|
fix confilcts
|
2012-11-14 17:50:02 +08:00 |
|
|
junv
|
038a93c85a
|
add quit from team
|
2012-11-14 17:26:49 +08:00 |
|
|
junv
|
c3e210d035
|
add quit from a team
|
2012-11-14 17:08:00 +08:00 |
|
|
Jeff Xiong
|
091ee5ebba
|
rm mis-committed files
|
2012-11-14 17:01:08 +08:00 |
|
|
szpyxlwoni
|
d661f4736a
|
add to a team avaliable to my organisation
|
2012-11-14 03:48:16 -05:00 |
|
|
junv
|
1c789028e3
|
add join the team button
|
2012-11-14 16:06:46 +08:00 |
|
|
junv
|
a9d2881d81
|
add all accessable team to show
|
2012-11-14 11:51:10 +08:00 |
|
|
szpyxlwoni
|
57c959659d
|
configure redirect url to diff host
|
2012-11-13 21:19:31 -05:00 |
|
|
Jeff Xiong
|
01986595ad
|
Merge branch 'master' of github.com:wahyd4/ocelots
|
2012-11-13 19:00:48 +08:00 |
|
|
Jeff Xiong
|
49921c45b4
|
fix a broken view
|
2012-11-13 19:00:14 +08:00 |
|
|
Jeff Xiong
|
7e3550ce6c
|
fix a broken view
|
2012-11-13 19:00:06 +08:00 |
|
|
Jeff Xiong
|
ceb8bee0d3
|
Merge pull request #5 from wahyd4/master
Allow users to create teams associated with organisations
|
2012-11-13 18:04:34 +08:00 |
|
|
junv
|
d41515607c
|
fix some bas smell
|
2012-11-13 18:00:08 +08:00 |
|
|
junv
|
3f26bc8ab4
|
Merge branch 'master' of https://github.com/wahyd4/ocelots
|
2012-11-13 17:28:53 +08:00 |
|
|
Jeff Xiong
|
f23fad343b
|
Merge branch 'master' of github.com:wahyd4/ocelots
|
2012-11-13 17:16:12 +08:00 |
|
|
Jeff Xiong
|
8b827625a3
|
add a favicon
|
2012-11-13 17:15:29 +08:00 |
|
|
junv
|
2b42b2170f
|
just a test for heroku
|
2012-11-13 16:40:01 +08:00 |
|
|
junv
|
10280c8e6e
|
chmod create organisations script to 755 ,so we can excute it on heroku
|
2012-11-13 16:20:46 +08:00 |
|
|
junv
|
98bfb48d20
|
modify the team create page checkbox
|
2012-11-13 16:10:36 +08:00 |
|
|
junv
|
c388cb024d
|
fixed the team create method error
|
2012-11-13 15:30:57 +08:00 |
|
|
junv
|
9eba3dfe22
|
add a concept of organization
|
2012-11-13 15:24:19 +08:00 |
|
|
Jeff Xiong
|
8fdc0b01d9
|
Merge pull request #3 from wahyd4/master
Now we can login with Google Accounts
|
2012-11-12 20:27:39 -08:00 |
|
|
junv
|
8d2d53d7fe
|
Merge remote-tracking branch 'upstream/master'
|
2012-11-13 12:24:11 +08:00 |
|
|
junv
|
95a23ecff7
|
modify rubygems site
|
2012-11-13 12:23:15 +08:00 |
|