Commit Graph

Select branches

Hide Pull Requests

develop

fix

master

0.1.1

rm

Mono Color

• ece31349d1 team member list page ui changed junv 2012-11-27 17:31:08 +08:00
• a42e7ffb28 add error message when invite people failed junv 2012-11-27 15:37:11 +08:00
• f73932f9a8 fix junv 2012-11-27 14:45:04 +08:00
• 32180e0db5 Merge branch 'master' of https://github.com/wahyd4/ocelots junv 2012-11-27 14:32:21 +08:00
• 0592347620 a little ux improved junv 2012-11-27 14:32:00 +08:00
• 85492000f5 add a test for ensure do not invite someone more than once szpyxlwoni 2012-11-27 13:53:06 +08:00
• 6fcde56593 fix invite bugs fix develop szpyxlwoni 2012-11-27 11:23:34 +08:00
• 046fda7e3a fix some bug junv 2012-11-26 17:50:57 +08:00
• 4e8f6b5c29 update add member notification junv 2012-11-26 17:34:46 +08:00
• 7eebf1413b fix bug inivte some one do not belong any org junv 2012-11-26 16:54:36 +08:00
• 24a8aa7a52 add import list of people by email junv 2012-11-26 16:13:43 +08:00
• 39f63a265a Merge pull request #15 from wahyd4/master Mark Ryall 2012-11-23 16:25:04 -08:00
• 45b02ce459 when publish message someone can publish several blanks junv 2012-11-23 17:37:32 +08:00
• 4d0c8ccb3f change send message in antechamber to ajax junv 2012-11-23 17:10:20 +08:00
• acfe03dd38 change require js position,and change refresh auth-token to ajax junv 2012-11-23 12:26:15 +08:00
• 2e33820b54 change jquery import position junv 2012-11-23 10:05:32 +08:00
• b99cab923f profile edit page user experience improved junv 2012-11-23 09:43:24 +08:00
• e3ae2fb38e fixed broken soundcloud partial Mark Ryall 2012-11-23 00:46:39 +11:00
• b31b736406 changed to a textarea for messages Mark Ryall 2012-11-23 00:22:31 +11:00
• 691918b144 added ability to remove delete your own messages Mark Ryall 2012-11-22 23:50:01 +11:00
• 4143dfa13e Merge pull request #14 from wahyd4/master Mark Ryall 2012-11-22 04:23:14 -08:00
• d11650ae6c remove blank junv 2012-11-22 18:19:23 +08:00
• d8cad08b25 sss junv 2012-11-22 18:16:24 +08:00
• 5ba6feb867 try to fix junv 2012-11-22 18:14:07 +08:00
• 94938065c5 fix junv 2012-11-22 17:59:15 +08:00
• a6c62b261e update profile page junv 2012-11-22 17:53:38 +08:00
• ec89c90724 add a script for remove duplicate membership szpyxlwoni 2012-11-22 11:55:50 +08:00
• fc2bf50488 fixed some bugs szpyxlwoni 2012-11-22 10:18:49 +08:00
• 9b9b8e6588 code improved junv 2012-11-22 09:21:42 +08:00
• e564d79506 add flickr support in profile page junv 2012-11-21 16:35:52 +08:00
• 8ce2a76d67 fix homepage avatar bug junv 2012-11-21 10:15:06 +08:00
• 9576829155 fixed google_oauth issue (calling old build method) Mark Ryall 2012-11-21 00:24:17 +11:00
• fd354936d7 Merge pull request #13 from wahyd4/master Mark Ryall 2012-11-20 05:18:23 -08:00
• 5915b1acfb add refresh auth_token junv 2012-11-20 18:03:01 +08:00
• ad555bcb0a add more test to main preocess szpyxlwoni 2012-11-20 14:09:18 +08:00
• f6462a3296 add invite people from new organisation junv 2012-11-20 14:07:02 +08:00
• ec25604a9c modify a function name junv 2012-11-20 11:07:19 +08:00
• 14e894f147 WIP junv 2012-11-20 09:08:16 +08:00
• 6b868a5f3f WIP junv 2012-11-20 09:06:32 +08:00
• 0e528860bf removed some more unnecessary requires from home controller Mark Ryall 2012-11-20 01:14:19 +11:00
• eef7cf13f6 fixed issue with home page spec (requiring google oauth environment variables) Mark Ryall 2012-11-20 01:11:34 +11:00
• 8bb11e42ea modified supposedly failing spec (according to tddium) Mark Ryall 2012-11-20 01:05:20 +11:00
• 9ae81d6aa4 simplified routes for google oauth authentication Mark Ryall 2012-11-20 00:57:37 +11:00
• e64f89c470 moved google oauth stuff into a mixin and removed unnecesary serialisation to the session Mark Ryall 2012-11-20 00:40:16 +11:00
• e88ae7017c modify every team to private,you can only view your organisation"s team junv 2012-11-19 17:38:54 +08:00
• eb70f666cc user can choose whether to show avatar junv 2012-11-19 13:56:39 +08:00
• 7a46b6c601 Merge remote-tracking branch 'upstream/master' junv 2012-11-19 13:33:21 +08:00
• 5515df166b added my_membership partial back in (to allow users to edit their membership) Mark Ryall 2012-11-19 15:51:30 +11:00
• eb36188f0b modify gitignore junv 2012-11-19 09:15:21 +08:00
• ddad8d2ced added environment variable around simplecov (which seems to be killing the tddium build) Mark Ryall 2012-11-18 20:39:23 +10:00
• b70c3524ee added home page mixin method Mark Ryall 2012-11-18 20:33:16 +10:00
• c2d90d4940 started adding some page mixins Mark Ryall 2012-11-18 20:31:30 +10:00
• 75d3a800de removed spec for test controller Mark Ryall 2012-11-18 20:15:53 +10:00
• 9bd133fb66 switched default capybara driver, removed test controller and modified existing cucumber feature Mark Ryall 2012-11-18 20:13:49 +10:00
• f2d39cc71f added code coverage to specs and features Mark Ryall 2012-11-18 19:45:38 +10:00
• 4fac4ca12d added github ribbon and link to github contributors on home page Mark Ryall 2012-11-18 08:57:14 +10:00
• 698551b57b corrected mime type validation on photo for person Mark Ryall 2012-11-18 08:46:12 +10:00
• faf104feff removed some trailing whitespace to trigger a build Mark Ryall 2012-11-17 20:33:00 +10:00
• 550bcc81f7 added markdown processing of message content and added limit to messages displayed in antechamber Mark Ryall 2012-11-17 20:16:47 +10:00
• b9befb508d changed capybara config and the feature seems to now pass Mark Ryall 2012-11-17 19:12:12 +10:00
• 9fc903c121 updated to rails 3.2.9 Mark Ryall 2012-11-17 16:58:27 +10:00
• 4b39b7585e added wip mode to cucumber Mark Ryall 2012-11-17 13:26:41 +10:00
• 6ff332c3d4 added root namespec to ENV Mark Ryall 2012-11-17 12:07:38 +10:00
• 5890a5dd37 changed google auth spec to verify use of environment variablse Mark Ryall 2012-11-17 12:00:42 +10:00
• 7fbcc4f78b Merge pull request #12 from wahyd4/master Mark Ryall 2012-11-16 17:28:47 -08:00
• 69cfa712fe removed cucumber from the ci build (while it does not work) Mark Ryall 2012-11-17 12:24:58 +11:00
• 8386d46f00 now the home page's avatars are dynmic generate from db junv 2012-11-16 17:35:17 +08:00
• 0eb2568e4d Merge remote-tracking branch 'origin/master' junv 2012-11-16 16:38:07 +08:00
• 7fe12c5efa not done yet junv 2012-11-16 16:38:02 +08:00
• faca6ff97f change client secret szpyxlwoni 2012-11-16 16:09:17 +08:00
• c86b64d573 Merge branch 'master' of https://github.com/wahyd4/ocelots szpyxlwoni 2012-11-16 15:52:34 +08:00
• 9b8586e9f2 change client secret szpyxlwoni 2012-11-16 15:52:00 +08:00
• 1470416ac3 Merge branch 'master' into develop junv 2012-11-16 15:42:52 +08:00
• b163c015f5 teams list page ui improvment junv 2012-11-16 15:42:44 +08:00
• 4e7fe3c138 Merge pull request #11 from wahyd4/master Mark Ryall 2012-11-15 21:30:19 -08:00
• 1c3ca05b31 modify the test of main process szpyxlwoni 2012-11-16 10:25:15 +08:00
• 3768f8257e modify cucumber test to make more functional test szpyxlwoni 2012-11-16 10:08:12 +08:00
• 5979c14301 fix some team will display twice junv 2012-11-16 10:06:04 +08:00
• a11bc3da4b back to disply teams which someone has already quit,and fix in some situations the person will display twice junv 2012-11-16 09:52:36 +08:00
• e8192df6be fix some teams will diaply twice junv 2012-11-15 17:49:01 +08:00
• 090f6a6a85 Merge branch 'master' of https://github.com/wahyd4/ocelots szpyxlwoni 2012-11-15 17:46:08 +08:00
• 7c6760a8b6 cancel some modify to make test pass szpyxlwoni 2012-11-15 17:45:38 +08:00
• 9bef58302e Merge branch 'master' of https://github.com/wahyd4/ocelots junv 2012-11-15 17:09:51 +08:00
• f2f48cb9f9 Merge branch 'master' of https://github.com/wahyd4/ocelots szpyxlwoni 2012-11-15 17:06:16 +08:00
• 99bccd0477 modify cucumber for test main process szpyxlwoni 2012-11-15 17:05:23 +08:00
• a39139f361 Merge branch 'master' of https://github.com/wahyd4/ocelots junv 2012-11-15 16:51:47 +08:00
• 14a8ac3eea fix quit team function,and remove the team show page will always show yourselef"s infomation,in no matter past,current,future junv 2012-11-15 16:51:28 +08:00
• f4533f3f22 Merge pull request #10 from wahyd4/master Jeff Xiong 2012-11-14 23:41:23 -08:00
• 3055bb4288 change gem source back to rubygems.org Jeff Xiong 2012-11-15 15:38:00 +08:00
• 365b523a61 none junv 2012-11-15 11:24:45 +08:00
• 08bf45a3be fix some ruby best practices junv 2012-11-15 11:22:02 +08:00
• e7c3136469 Merge pull request #9 from wahyd4/master Jeff Xiong 2012-11-14 18:27:21 -08:00
• fc511e710a change gem source back to rubygems.org Jeff Xiong 2012-11-15 10:23:41 +08:00
• 40a0452ff1 change gem source back to rubygems.org Jeff Xiong 2012-11-15 10:22:46 +08:00
• df5d404e89 change gem repo to rubygems junv 2012-11-15 10:22:03 +08:00
• 2a35cb975e Merge branch 'master' of https://github.com/wahyd4/ocelots szpyxlwoni 2012-11-15 10:17:24 +08:00
• eabc239dc2 add cucumber test for main process szpyxlwoni 2012-11-15 10:17:16 +08:00
• 9291cd0119 fix the gravatar junv 2012-11-15 09:18:49 +08:00
• e7e5566447 add gravatar api,if user uploaded photo ,the system will use it first,if not system will use gravatar.com API junv 2012-11-14 23:17:38 +08:00
• a08f44c212 Merge pull request #8 from wahyd4/master Jeff Xiong 2012-11-14 02:23:40 -08:00