Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Feb 14, 2013
@senior senior Removed FasterCSV, switched to built in CSV parser
ba27db7
@senior senior FasterCSV -> CSV
96269e7
Commits on Feb 15, 2013
@marioaquino marioaquino Remove drb flag because no more sporky
fedaa89
@marioaquino marioaquino Rearrange gem order to prevent trigger of warning message during test…
… run
1937172
Commits on Feb 16, 2013
@marioaquino marioaquino Gems updates.
RSpec runs but many failures.
Must add many require_relatives
e28d400
Commits on Mar 09, 2013
@marioaquino marioaquino Intermediate commit. Ajaxful_rating updated. Many broken specs. Many …
…table updates.
760554a
Commits on Mar 17, 2013
@marioaquino marioaquino Upgrade version of rspec-rails and shoulda.
e946a6d
@marioaquino marioaquino Fix broken spec.
2a8999f
@marioaquino marioaquino Fix failing spec
516aac0
@marioaquino marioaquino Add require for model
1846f96
@marioaquino marioaquino Add views directory for proposals to load path. There has to be a bet…
…ter way to make this work. Its needed to get tests to pass
43f5afa
@marioaquino marioaquino Rename cached_slug columns to slug, as needed for friendly_id. Fix co…
…nference session spec.
7b724bc
Commits on Mar 22, 2013
@senior senior Qualify Refinery class in the migration scripts with Refinery::
d525392
@senior senior switch old migrations from users to refinery_users
39ae728
@senior senior speaker_mailer Role to Refinery::Role
f16eed9
@senior senior Switch from ActiveSupport::SecureRandom to ruby SecureRandom
800b45b
@senior senior Switch customer matcher failure_message to failure_message_should
bbfee9f
@senior senior Convert conference session year to integer before comparin in control…
…ler spec
0ddc776
Commits on Mar 26, 2013
@marioaquino marioaquino Update path to site-specific engines
b04e8b2
@marioaquino marioaquino Update refinery table rename for images
74ff53c
@marioaquino marioaquino Move environment-specific configuration settings for refinery
f541cef
@marioaquino marioaquino Update model requires for factory girl
5122cae
Commits on Mar 27, 2013
@marioaquino marioaquino Update dragonfly gem and remove jammit
dc9b83f
@marioaquino marioaquino Update conference sessions plugin to match the plugin layout demonstr…
…ated by the news plugin. This update is needed because of plugin differences between the current and previous version of refinery and probably rails
d6c2637
@marioaquino marioaquino Add refinery engine routes helpers so that it can see the helper for …
…building the conference session url
724885f
Commits on Mar 30, 2013
@marioaquino marioaquino Moved ConferenceSession types beneath refinery namespace. This seems …
…to now be necessary for all refinery plugins.
454b57c
Commits on Mar 31, 2013
@marioaquino marioaquino Moved proposal engine into structure called for with rails and refine…
…ry upgrade
646f96e
@marioaquino marioaquino Update load path
41728d2
@marioaquino marioaquino Remove use of deprecated Memoizable
fb97e3a
@marioaquino marioaquino Fix controller inheritance
1818f4f
@marioaquino marioaquino Add initializer
f7cac98
@marioaquino marioaquino Add rename of refinery resources table
c6601a6
Commits on Apr 01, 2013
@marioaquino marioaquino Move assets into their proper home with the asset pipeline in rails 3.1
e34dfe0
@senior senior Added attr_accessible to som conference_session attrs
55ad01d
@senior senior Updated attendee_spec test to use should_not allow_mass_assignment_of
1374fc4
@senior senior Set ;name and :capacity in Room to be accessible
c758105
@senior senior Marked some Talk files as accessible
06685c8
@marioaquino marioaquino Update sponsorship plugin to match new directory layout under the ref…
…inery namespace
014e910
Commits on Apr 02, 2013
@senior senior Make proposal id and status accessible
b39b66c
@senior senior Comment's title, user and comment field marked as accessible
053576a
@senior senior Added title and duration to talk's accessible fields
8875e74
@senior senior Added Track.name as accessible
2d3e041
@senior senior Added SessionTime accessible fields
b025384
@senior senior Added session time to conference_session accessible attrs
d10f437
@senior senior set uid and image fields as accessible
55cd064
@marioaquino marioaquino Add and/or rename columns in refinery tables needed by refinery upgrade
aa65b13
Commits on Apr 03, 2013
@marioaquino marioaquino More column updates for refinery tables
e24bab0
@marioaquino marioaquino Update references to shared/refinery partials, javascript loading, an…
…d stylesheets
3a5f1a0
Commits on Apr 05, 2013
@marioaquino marioaquino Add refinery routes helpers for rspec test runs
cf41254
@marioaquino marioaquino Refactor algorithm for gathering reviewers
771ce14
@marioaquino marioaquino Make sure that the rails env is set to test before loading the app en…
…vironment.
83e3ce1
@marioaquino marioaquino Fix admin proposals path references
cbc70e5
Commits on Apr 06, 2013
@marioaquino marioaquino Fix refinery image creation code
f900cda
@marioaquino marioaquino Fix plugin paths
30adde2
@marioaquino marioaquino Add refinery level in internationalization files
76e0066
@marioaquino marioaquino Add refinery prefixes to type references and path shortcuts
7937022
Commits on Apr 08, 2013
@marioaquino marioaquino Try to fix dragonfly datastore configuration.
43cdedf
Commits on Apr 12, 2013
@marioaquino marioaquino Update stylesheet to use scss
5870459
@marioaquino marioaquino Update the image type
0733e40
Commits on Apr 14, 2013
@marioaquino marioaquino Update image serving config. Dragonfly & refinery changed under us.
a0f85d3
@marioaquino marioaquino Update method for retrieving scaled images. Necessary because the ima…
…ge_fu function from refinery changed the way it works.
bc84049
@marioaquino marioaquino Upgrade the version of mysql2 gem we are using.
7975605
@marioaquino marioaquino Begin to move library assets into their proper place
9b2f450
@marioaquino marioaquino Move the superfish stylesheet into the right place for the asset pipe…
…line
c2d2f90