Commit Graph

Select branches

Hide Pull Requests

develop

fix

master

0.1.1

rm

Mono Color

• 958fa365c5 get rid of annoying outputs from controller specs Jeff Xiong 2012-11-14 18:22:43 +08:00
• a107e1f7d3 fix confilcts junv 2012-11-14 17:50:02 +08:00
• 038a93c85a add quit from team junv 2012-11-14 17:26:49 +08:00
• c3e210d035 add quit from a team junv 2012-11-14 17:08:00 +08:00
• 091ee5ebba rm mis-committed files Jeff Xiong 2012-11-14 17:01:08 +08:00
• d661f4736a add to a team avaliable to my organisation szpyxlwoni 2012-11-14 03:48:16 -05:00
• 1c789028e3 add join the team button junv 2012-11-14 16:06:46 +08:00
• e2c75d1d96 Merge pull request #7 from wahyd4/master Jeff Xiong 2012-11-13 20:32:49 -08:00
• a9d2881d81 add all accessable team to show junv 2012-11-14 11:51:10 +08:00
• 57c959659d configure redirect url to diff host szpyxlwoni 2012-11-13 21:19:31 -05:00
• b08113f894 Merge pull request #6 from wahyd4/master Jeff Xiong 2012-11-13 03:02:26 -08:00
• 01986595ad Merge branch 'master' of github.com:wahyd4/ocelots Jeff Xiong 2012-11-13 19:00:48 +08:00
• 49921c45b4 fix a broken view Jeff Xiong 2012-11-13 19:00:14 +08:00
• 7e3550ce6c fix a broken view Jeff Xiong 2012-11-13 19:00:06 +08:00
• adaf59430a Merge pull request #5 from wahyd4/master Jeff Xiong 2012-11-13 02:06:09 -08:00
• ceb8bee0d3 Merge pull request #5 from wahyd4/master Jeff Xiong 2012-11-13 18:04:34 +08:00
• d41515607c fix some bas smell junv 2012-11-13 18:00:08 +08:00
• 3f26bc8ab4 Merge branch 'master' of https://github.com/wahyd4/ocelots junv 2012-11-13 17:28:53 +08:00
• f23fad343b Merge branch 'master' of github.com:wahyd4/ocelots Jeff Xiong 2012-11-13 17:16:12 +08:00
• 8b827625a3 add a favicon Jeff Xiong 2012-11-13 17:15:29 +08:00
• 2b42b2170f just a test for heroku junv 2012-11-13 16:40:01 +08:00
• 10280c8e6e chmod create organisations script to 755 ,so we can excute it on heroku junv 2012-11-13 16:20:46 +08:00
• 98bfb48d20 modify the team create page checkbox junv 2012-11-13 16:10:36 +08:00
• 211bda5ab4 Merge pull request #4 from wahyd4/master Jeff Xiong 2012-11-12 23:51:53 -08:00
• c388cb024d fixed the team create method error junv 2012-11-13 15:30:57 +08:00
• 9eba3dfe22 add a concept of organization junv 2012-11-13 15:24:19 +08:00
• 8fdc0b01d9 Merge pull request #3 from wahyd4/master Jeff Xiong 2012-11-12 20:27:39 -08:00
• 8d2d53d7fe Merge remote-tracking branch 'upstream/master' junv 2012-11-13 12:24:11 +08:00
• 95a23ecff7 modify rubygems site junv 2012-11-13 12:23:15 +08:00
• 1f8fcf9181 add google account login junv 2012-11-13 12:21:08 +08:00
• a9a9ae2342 Merge branch 'master' of heroku.com:ocelots Mark Ryall 2012-11-13 10:46:13 +11:00
• e089bd0726 reinstated fancybox Mark Ryall 2012-11-13 10:41:55 +11:00
• a8c1d9ad9d remove something bad junv 2012-11-12 08:59:53 +08:00
• 5cc0361c8b Merge pull request #2 from wahyd4/master Jeff Xiong 2012-11-11 16:49:26 -08:00
• 8ed34523f7 fix update profile bug junv 2012-11-09 15:14:24 +08:00
• 7d937a13c5 fixed assets precompile junv 2012-11-09 15:01:51 +08:00
• 9c56b3a0c9 change the login page junv 2012-11-09 14:58:05 +08:00
• 180c814afd make user friendly walidation error message junv 2012-11-09 13:41:02 +08:00
• e1a93423ff fixed login.css junv 2012-11-08 18:12:30 +08:00
• c96a48e299 rename login.css junv 2012-11-08 17:48:14 +08:00
• 8ff93dd1f9 change login.css to login junv 2012-11-08 17:44:20 +08:00
• ed48dcbbaf modify the home page junv 2012-11-08 17:14:11 +08:00
• 72bd4a1279 all junv 2012-11-07 17:42:00 +08:00
• 4b5ce19999 Merge pull request #1 from wahyd4/master Jeff Xiong 2012-11-06 19:37:33 -08:00
• 664bf0b5de modified gemfile,and execjs & therubyracer Administrator 2012-11-07 11:06:33 +08:00
• 1de5be6e10 renamed default task to ci Mark Ryall 2012-11-06 19:14:41 +10:00
• 4d102870b1 added content header to curl example (otherwise json is not parsed by rails) Mark Ryall 2012-11-06 18:39:58 +10:00
• 8105842891 Merge branch 'master' of github.com:ocelots/ocelots Mark Ryall 2012-11-06 18:28:20 +10:00
• 972fb2a755 cleaned up the readme a little Mark Ryall 2012-11-06 18:25:51 +10:00
• 3859360afc added api method to post a new antechamber message Mark Ryall 2012-11-06 18:23:14 +10:00
• 11915d2849 added from parameter to retrieve only recent antechamber messages Mark Ryall 2012-11-06 17:54:56 +10:00
• f51f56fef1 implemented antechamber api call Mark Ryall 2012-11-06 17:50:11 +10:00
• 8ca68446d5 added documentation and stub for antechamber url Mark Ryall 2012-11-06 17:39:18 +10:00
• 02fc56fccb added some documentation of the current API Mark Ryall 2012-11-06 17:03:52 +10:00
• d6ce1f34cd added rails best practices check Jeff Xiong 2012-11-05 15:07:06 +08:00
• 177c3f0daf enable tddium Jeff Xiong 2012-11-05 12:03:15 +08:00
• 43905be0b7 Fix build on a new dev machine Jeff Xiong 2012-11-05 09:45:51 +08:00
• 23d05e4a8f environmental changes Jeff Xiong 2012-11-05 08:57:51 +08:00
• 72c8b15d2b switched to using postgres locally instead of sqlite Mark Ryall 2012-11-05 11:54:32 +11:00
• d790860e07 added google analytics (why not?) Mark Ryall 2012-10-20 15:48:36 +10:00
• 4d84eecc94 added user voice to get some feedback Mark Ryall 2012-10-20 12:17:29 +10:00
• 8b6d34311a can now create messages in team antechamber Mark Ryall 2012-10-19 00:16:23 +11:00
• 30b7f6ef28 started adding antechamber to team Mark Ryall 2012-10-18 23:51:15 +11:00
• 40be3fd943 slightly changed description of membership duration Mark Ryall 2012-10-13 09:43:36 +10:00
• 6dcf2aa396 split show team js out from increasingly huge application.js Mark Ryall 2012-10-13 09:40:55 +10:00
• 704d834f71 started implementing search filtering Mark Ryall 2012-10-12 21:29:15 +10:00
• 11c06999b6 moved duplication between membership views to partial and added display of start and end dates Mark Ryall 2012-10-12 17:55:56 +10:00
• 5b1abb9bb2 added filtering by pending Mark Ryall 2012-10-12 13:23:23 +10:00
• a286618274 added filtering by past/current/future Mark Ryall 2012-10-12 13:13:53 +10:00
• 39f1da6c48 added hidden class to hide team members who have left a team, have not yet joined or are hidden Mark Ryall 2012-10-11 21:31:28 +10:00
• 4b673a6da8 added role to membership Mark Ryall 2012-10-02 20:08:34 +10:00
• 4756cb968c added heaeding to membership edit form Mark Ryall 2012-10-02 20:00:27 +10:00
• 35b2f05cf8 made hidden attribute editable for membership Mark Ryall 2012-10-02 18:42:37 +10:00
• 524d8c5a2f added editing of start and end dates Mark Ryall 2012-10-02 18:39:36 +10:00
• b19d7d8230 renamed soundcloud specific membership action to update membership Mark Ryall 2012-10-02 18:24:13 +10:00
• 2e4760a2ab added current_person as a helper method so views can use it Mark Ryall 2012-10-02 08:20:10 +10:00
• a432cfba95 added a hidden field to membership Mark Ryall 2012-10-02 08:17:10 +10:00
• aa6cd09918 made all phone numbers tel links Mark Ryall 2012-09-24 22:49:29 +10:00
• 183a537136 Added a view for birth place to user profile page Mark Ryall 2012-09-23 19:59:05 +10:00
• 13211ebab8 located map canvas with jquery Mark Ryall 2012-09-23 19:52:03 +10:00
• 5b65713e91 changed type from float to real Mark Ryall 2012-09-23 19:31:55 +10:00
• f27206fefb added draggable map pointer to specify birth locaation Mark Ryall 2012-09-23 19:14:45 +10:00
• 191630f523 added lat lng to person Mark Ryall 2012-09-23 18:48:37 +10:00
• 95684b5444 added a map (for no apparent reason) in the user profile edit page Mark Ryall 2012-09-23 18:48:22 +10:00
• 69d8890e29 added google maps api and added environment variable to documentation Mark Ryall 2012-09-23 16:30:44 +10:00
• 3230f59ce3 show soundcloud track on edit page only if one has been specified Mark Ryall 2012-09-23 16:20:38 +10:00
• 4162dc0cbe added missing application helper Mark Ryall 2012-09-23 14:43:05 +10:00
• b0033b6961 forced use of square images everywhere - this will break most image links Mark Ryall 2012-09-23 14:42:47 +10:00
• 7d93c70dc9 minor reformatting Mark Ryall 2012-09-23 13:48:34 +10:00
• 88c4ff0e69 copied some of the profile view into the profile edit page Mark Ryall 2012-09-23 13:43:57 +10:00
• 778661dc9b added rake tasks to dump current people and teams Mark Ryall 2012-09-20 08:56:15 +10:00
• 2dc323d239 modified specification for application controller Mark Ryall 2012-09-20 08:45:09 +10:00
• 2ce08a1400 allow site login using auth_token Mark Ryall 2012-09-20 08:41:12 +10:00
• 6422f4a585 added team retrieval and cleaned up logic around which profiles can be accessed Mark Ryall 2012-09-19 08:41:06 +10:00
• 4dabab2b18 moved logic determining whether a user can be viewed out of the two controllers Mark Ryall 2012-09-18 09:15:54 +10:00
• 1d289de93d renamed teams to memberships in api Mark Ryall 2012-09-18 08:52:50 +10:00
• 5378bb46d6 filtered out profiles for people in a shared membership that has not yet been approved Mark Ryall 2012-09-17 18:20:27 +10:00
• aff81489ea added api entry point to retrieve list of user teams Mark Ryall 2012-09-17 17:54:42 +10:00
• e2ced7b402 switched to retrieving users in api via persona_id Mark Ryall 2012-09-14 14:58:14 +10:00
• 41c5ee004c added retrieval of photo url when it has been uploaded Mark Ryall 2012-09-14 14:53:00 +10:00