328 Commits
Author SHA1 Message Date
junv 1c789028e3 add join the team button 2012-11-14 16:06:46 +08:00
Jeff Xiong e2c75d1d96 Merge pull request #7 from wahyd4/master
Allow users to view teams in same organisation
2012-11-13 20:32:49 -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 b08113f894 Merge pull request #6 from wahyd4/master
Fix a broken view
2012-11-13 03:02:26 -08: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 adaf59430a Merge pull request #5 from wahyd4/master
Allow users to create teams associated with organisations
2012-11-13 02:06:09 -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
Jeff Xiong 211bda5ab4 Merge pull request #4 from wahyd4/master
Added a concept of organisations
2012-11-12 23:51:53 -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
junv 1f8fcf9181 add google account login 2012-11-13 12:21:08 +08:00
Mark Ryall a9a9ae2342 Merge branch 'master' of heroku.com:ocelots 2012-11-13 10:46:13 +11:00
Mark Ryall e089bd0726 reinstated fancybox 2012-11-13 10:41:55 +11:00
junv a8c1d9ad9d remove something bad 2012-11-12 08:59:53 +08:00
Jeff Xiong 5cc0361c8b Merge pull request #2 from wahyd4/master
change the homepage,and add profile validation.
2012-11-11 16:49:26 -08:00
junv 8ed34523f7 fix update profile bug 2012-11-09 15:14:24 +08:00
junv 7d937a13c5 fixed assets precompile 2012-11-09 15:01:51 +08:00
junv 9c56b3a0c9 change the login page 2012-11-09 14:58:05 +08:00
junv 180c814afd make user friendly walidation error message 2012-11-09 13:41:02 +08:00
junv e1a93423ff fixed login.css 2012-11-08 18:12:30 +08:00
junv c96a48e299 rename login.css 2012-11-08 17:48:14 +08:00
junv 8ff93dd1f9 change login.css to login 2012-11-08 17:44:20 +08:00
junv ed48dcbbaf modify the home page 2012-11-08 17:14:11 +08:00
junv 72bd4a1279 all 2012-11-07 17:42:00 +08:00
Jeff Xiong 4b5ce19999 Merge pull request #1 from wahyd4/master
Modify the Gemfile
2012-11-06 19:37:33 -08:00
Administrator 664bf0b5de modified gemfile,and execjs & therubyracer 2012-11-07 11:06:33 +08:00
Mark Ryall 1de5be6e10 renamed default task to ci 2012-11-06 19:14:41 +10:00
Mark Ryall 4d102870b1 added content header to curl example (otherwise json is not parsed by rails) 2012-11-06 18:39:58 +10:00
Mark Ryall 8105842891 Merge branch 'master' of github.com:ocelots/ocelots 2012-11-06 18:28:20 +10:00
Mark Ryall 972fb2a755 cleaned up the readme a little 2012-11-06 18:25:51 +10:00
Mark Ryall 3859360afc added api method to post a new antechamber message 2012-11-06 18:23:14 +10:00
Mark Ryall 11915d2849 added from parameter to retrieve only recent antechamber messages 2012-11-06 17:54:56 +10:00
Mark Ryall f51f56fef1 implemented antechamber api call 2012-11-06 17:50:11 +10:00
Mark Ryall 8ca68446d5 added documentation and stub for antechamber url 2012-11-06 17:39:18 +10:00
Mark Ryall 02fc56fccb added some documentation of the current API 2012-11-06 17:03:52 +10:00
Jeff Xiong d6ce1f34cd added rails best practices check 2012-11-05 15:07:06 +08:00
Jeff Xiong 177c3f0daf enable tddium 2012-11-05 12:03:15 +08:00