{"shas":[["adb110e26772cf2706a7d0de02dd9e9d9414dffb","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Merge branch 'xproject-dev' into merge_xproject_dev","Noah Paessel"],["0c4bd58d32fc43e23528adc5313d9c6c887a94a1","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Cherry pick from itsisu f2cfa2d67f4e1d use bundler\n\nConflicts manually adjusted. Mistakenly took the wrong\nacivities listing(!)\n\nConflicts:\n\n\t.gitignore\n\tconfig/deploy.rb\n\tconfig/environment.rb\n\tconfig/environments/cucumber.rb\n\tconfig/environments/test.rb\n\tthemes/itsisu/views/activities/_runnable_list.html.haml\n\tvendor/gems/ar-extensions-0.9.2/.specification\n\tvendor/gems/arrayfields-4.7.4/.specification\n\tvendor/gems/capistrano-2.5.5/.specification\n\tvendor/gems/capistrano-ext-1.2.1/.specification\n\tvendor/gems/chriseppstein-compass-0.6.3/.specification\n\tvendor/gems/diff-lcs-1.1.2/.specification\n\tvendor/gems/echoe-3.1.1/.specification\n\tvendor/gems/fastercsv-1.5.0/.specification\n\tvendor/gems/ffi-ncurses-0.3.2.1/.specification\n\tvendor/gems/grit-2.0.0/.specification\n\tvendor/gems/haml-2.2.0/.specification\n\tvendor/gems/has_many_polymorphs-2.13/.specification\n\tvendor/gems/highline-1.5.2/.specification\n\tvendor/gems/httpclient-2.1.5.2/.specification\n\tvendor/gems/jnlp-0.6.1/.specification\n\tvendor/gems/josevalim-rails-footnotes-3.6.2/.specification\n\tvendor/gems/mime-types-1.16/.specification\n\tvendor/gems/mislav-will_paginate-2.3.6/.specification\n\tvendor/gems/net-scp-1.0.2/.specification\n\tvendor/gems/net-sftp-2.0.2/.specification\n\tvendor/gems/net-ssh-2.0.15/.specification\n\tvendor/gems/net-ssh-gateway-1.0.1/.specification\n\tvendor/gems/open4-0.9.6/.specification\n\tvendor/gems/prawn-0.4.1/.specification\n\tvendor/gems/prawn-format-0.1.1/.specification\n\tvendor/gems/prawn-layout-0.1.0/.specification\n\tvendor/gems/rack-1.0.0/.specification\n\tvendor/gems/ruby-ole-1.2.8.2/.specification\n\tvendor/gems/rubyforge-1.0.3/.specification\n\tvendor/gems/rubyist-aasm-2.0.5/.specification\n\tvendor/gems/spreadsheet-0.6.3.1/.specification\n\tvendor/gems/thoughtbot-factory_girl-1.2.2/.specification\n\tvendor/gems/uuidtools-2.0.0/.specification","Noah Paessel"],["678c27b5f685ddbc375dd68b729dd0ba11100477","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","remove has_many_polymorphs\n\nLocal conflicts were trivial\n\n\tapp/models/portal/school.rb","Noah Paessel"],["89170b96086f640cdd72385c90423a5ebfa159b9","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","ignore local_files directory, for stashing good things","Noah Paessel"],["4b8e1c6aa2544eb558e429a47f8dd2dff61da26d","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","This file is not required -- and causes problems.\n\nInadvertantly added by Noah and Ethan a while back","Noah Paessel"],["5db330227a7440760cc9c85a0c953173eef4b744","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","HAML update doesn't like quotes in url properties.","Noah Paessel"],["041bd7a2378a9014059590cb6425ac31d4a16221","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Add Rites Banner.","Noah Paessel"],["aec9c094cd32dd5754cf5b80de254c990bb25ccf","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Fix student Signup Link. ( was stduents/new )","Noah Paessel"],["eb61b33b8aa10674f405a8a40f064bb6067b3b76","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Factor out commpon components in Layouts","Noah Paessel"],["e6294327468034199ebeccef5fa8ca6b2582d5de","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Remove rites CSS for now.","Noah Paessel"],["d33f426ca22558719fd545ea8790a10981dd3784","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Clean whitespace.","Noah Paessel"],["0204282adacadaae015b2460ebade08d0ce82975","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Fix version_jnlp gzip_flag bug instance var name\n\nthe JNLP gem defines Jnlp::Jnlp which has\nan instance var of @include_pack_gz\n\nBut the versioned_jnlp model tries to assign to\na include_pack_gzip -- which was resulting in\nndefined method `include_pack_gzip' for #<Jnlp::Jnlp:0x1081666e8>\n\nNot sure how this worked ever ...\n\nSee gist for stack trace, and explaination:\n\nhttp://bit.ly/g1Xc2T","Noah Paessel"],["bd8fbf9c3d00c81df7eac855fbef51a6365efb0f","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","[# 10196675] Offering/Inv. Search & Paginate.\n\nModify Login button 2 be found in cuke steps (!)\n\nWIP: Cucumber test for testing investigations.\n\nCucumber feature for browsing and searching invs.\n\nparam_find was evaluating null strings as true.\n\nfor will_paginate, search is a 'get' request\n\nSearching Investigations features complete.\n\nput spinner where the results will display.\n\nAdd pagination helper scripts.\n\nCorrectly associate teachers with their groups.\n\nAlways paginate the investigations directly.\n\nHave to track (in app JS) pending ajax requests.\n\nSearching and browsing features almost complete.\n\nAnd only one failure in investigations_searching..\n\nBetter image for searching.\n\nFor Ajax steps, wait for pending requests (fixed)\n\nCall repaginate after all pending request are back\n\nInvestigation/runnable_list matches shared/runnabl\n\nRemove console log.","Noah Paessel"],["63d5c1e91c8f8f2ff6575c0dcef9b4d37a4e1999","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Specifying themes in cucumber steps.","Noah Paessel"],["55244e8f7f41e6e1453fe5e39ae2cf662c0dfded","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Cuke cleanup: move user create to global steps.","Noah Paessel"],["bf2a19b028d25fed003a6e2e315c0cda1b5c4263","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Refactor project header into smaller bits.","Noah Paessel"],["1c0a569f10f91697d87d378c2891e2d5fa527602","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","[# 10463393] (part 1) dont display Investigations\n\nRemove links to Resources and Investigations\n\nResources shows up on assignment screen as well as in the navigation bar. RITES teachers should not have access to these.","Noah Paessel"],["bc65d9eb5d91fe7b1f05d0373e9e73659881e6c5","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","Forgot to re-enable all feature tests for RITES.","Noah Paessel"],["ad8adf2d85f9aa2897f0be34e9cf4bb8e968f39c","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","[# 10472553] Edit  class link missing.\n\nhttps://www.pivotaltracker.com/story/show/10472553","Noah Paessel"],["9e8b7a756958f2d792e4c03b22a846ae9e995241","3f8753993a1e1fe9185f213c3280a239503810cd@gmail.com","rename the scenario.","Noah Paessel"]],"repo":"stepheneb/rigse","actor":"knowuh","ref":"refs/heads/has-dev","size":78,"head":"da77c60d79862671d671dc7e0e797a91b5dd5cce","actor_gravatar":"9232505d592cae5f257fa1c04942877b","push_id":27335592}