Bootstrap #3

Merged
merged 196 commits into from Apr 17, 2013

Conversation

Projects
None yet
3 participants
Member

scotdalton commented Oct 4, 2012

First cut of the bootstrap refactor.

scotdalton added some commits Sep 19, 2012

Name change for location method which appears to conflict with and in…
…ternal rails method name. Refactor email JS into CoffeeScript and moved the error display into a helper.
Update GBS test to use VCR, refactor to use TestWithCassette from @jr…
…ochkind's bento_search and move sunspot_rails require statement to Umlaut::Engine.
Add/update tests for sfx4 searching and sfx4solr searching. Add instr…
…uctions for creating SearchMethods in README. Configured sfx_db to point to test SFX4.
Update to remove sunspot_rails gem dependency and only include Sfx4So…
…lr functionality if the application has explicitly added it.
Change name of umlaut_icons folder to avoid namespace clashes. Update…
… resolve controller test to look at holdings. Use famfamfam instead of glyphicons for icons.

scotdalton added some commits Feb 15, 2013

Change italic/alternate voice tag (<i>) to emphasis tag (<em>) since …
…Twitter Bootstrap uses the alternate voice tag for icons, unfortunately.
Remove improved modal, since it was causing problems and wasn't even …
…that improved for our purposes. Remove jquery-ui dependency, since we're using Twitter bootstrap. Update modal with progress bar.

Changes Unknown when pulling b366dc5 on bootstrap into * on master*.

View Details

Changes Unknown when pulling b366dc5 on bootstrap into * on master*.

View Details

Changes Unknown when pulling bd3d7d9 on bootstrap into * on master*.

View Details

Coverage remained the same when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

Coverage increased (+0.12%) when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

Coverage increased (+0.12%) when pulling a2aaeea on bootstrap into 764e971 on master.

View Details

@jrochkind jrochkind merged commit a2aaeea into master Apr 17, 2013

1 check passed

default The Travis build passed
Details
Owner

jrochkind commented Apr 17, 2013

merged bootstrap-continued branch into master!

tagged "pre-bootstrap" first, just in case it ends up being helpful. I get so nervous with giant merges!

Member

scotdalton commented Apr 17, 2013

👏 AWESOME!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment