forked from railsbridge/docs
-
Notifications
You must be signed in to change notification settings - Fork 15
Merge railsbridge HEAD #39
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…::Page subclass utilize technology of inheritance
It was only used for a single "@include border-radius" line which is no longer present
Rather than forcing students to endure another create-and-deploy to Heroku, volunteers should just examine the student's successfully deployed Heroku app from the previous page. Also updated the 'default rails page' screenshot
* use Sinatra 1.3.6 * add short stack trace to error log * various refactorings * put Deck file server ahead of Sinatra in middleware chain (using Rack::Cascade)
Modifications include: * fleshing out all the sites/ruby workshop content -- janetriley, mxie, dpickett * Adding the 'challenge' tag to the dsl -- dpickett
* Goals that had markdown blocks now actually show up * Fix "next_step" and "back to" to work with pages that have colons * Prune some empty-ish pages * Remove 'objects.step' (dupe of classes.step)
… page containing a list of editors and where to get them.
…page exists The most current instructions for installing a given editor are probably best left to the editor's website.
Conflicts: Gemfile.lock README.md lib/doc_page.rb lib/site_index.rb lib/titleizer.rb sites/en/docs/docs.step sites/en/installfest/_install_ruby.step sites/en/installfest/_install_rvm.step sites/en/installfest/_install_textmate.step sites/en/installfest/_switch_to_home_directory.step sites/en/installfest/clean_up.step sites/en/installfest/configure_git.step sites/en/installfest/configure_the_windows_terminal.step sites/en/installfest/create_a_heroku_account.step sites/en/installfest/create_an_ssh_key.step sites/en/installfest/deploy_a_rails_app.step sites/en/installfest/img/AboutThisMac.png sites/en/installfest/img/WinRailsInstaller.jpg sites/en/installfest/img/appstore.jpg sites/en/installfest/img/get_a_sticker_you_should_see.png sites/en/installfest/img/install_sublime_text.png sites/en/installfest/img/railsbridge_findingCommandPrompt.png sites/en/installfest/img/railsbridge_ubuntu12-checkbox.png sites/en/installfest/img/railsbridge_windowsScreenshot-commandprompt-pinnedtotaskbar.png sites/en/installfest/img/railsbridge_windowsScreenshot-commandprompt_ror.jpg sites/en/installfest/img/xcode-prefs.jpg sites/en/installfest/install_xcode.step sites/en/installfest/install_xcode_from_app_store.step sites/en/installfest/install_xcode_from_dvd.step sites/en/installfest/installfest.step sites/en/installfest/osx_panther.step sites/en/installfest/osx_railsinstaller.step sites/en/installfest/osx_rvm.step sites/en/installfest/windows.step sites/en/intermediate-rails/add_other_features_of_your_choosing.step sites/en/intermediate-rails/add_pages_to_create_and_look_at_individual_posts.step sites/en/intermediate-rails/add_replying.step sites/en/intermediate-rails/commands.md sites/en/intermediate-rails/create_a_new_rails_app_with_a_static_home_page.step sites/en/intermediate-rails/creating_a_new_controller.md sites/en/intermediate-rails/img/create_post.png sites/en/intermediate-rails/img/create_reply.png sites/en/intermediate-rails/img/header.png sites/en/intermediate-rails/img/inline_reply.png sites/en/intermediate-rails/img/post_index.png sites/en/intermediate-rails/img/request-cycle.jpg sites/en/intermediate-rails/img/show_post.png sites/en/intermediate-rails/img/show_replies.png sites/en/intermediate-rails/img/static_home_page.png sites/en/intermediate-rails/inline_replying_on_a_post.step sites/en/intermediate-rails/install_devise.step sites/en/intermediate-rails/intermediate-rails.step sites/en/intermediate-rails/make_a_posts_index_page.step sites/en/intermediate-rails/make_it_pretty_with_bootstrap.step sites/en/intermediate-rails/mvc_overview.md sites/en/intermediate-rails/the_request_cycle.md sites/en/intro-to-rails/CRUD_with_scaffolding.step sites/en/intro-to-rails/_consider_deploying.step sites/en/intro-to-rails/_switch_to_home_directory.step sites/en/intro-to-rails/add_the_project_to_a_git_repo.step sites/en/intro-to-rails/allow_people_to_vote.step sites/en/intro-to-rails/clean_up_links_on_the_topics_list.step sites/en/intro-to-rails/credits_and_next_steps.step sites/en/intro-to-rails/deploying_to_heroku.step sites/en/intro-to-rails/getting_started.step sites/en/intro-to-rails/hooking_up_votes_and_topics.step sites/en/intro-to-rails/img/Seattle_list_with_topic.png sites/en/intro-to-rails/img/Seattle_topic_created.png sites/en/intro-to-rails/img/Seattle_topic_list_page.png sites/en/intro-to-rails/img/Start_page.png sites/en/intro-to-rails/img/finished_app.png sites/en/intro-to-rails/img/mvc.png sites/en/intro-to-rails/img/rails4_rails_info_routing.png sites/en/intro-to-rails/img/seattle_display_vote_count.png sites/en/intro-to-rails/img/sublime_add_folder_to_project.png sites/en/intro-to-rails/img/sublime_project_as_folder.png sites/en/intro-to-rails/img/workflow.png sites/en/intro-to-rails/intro-to-rails.step sites/en/intro-to-rails/make_the_topic_title_a_link.step sites/en/intro-to-rails/redirect_to_the_topics_list_after_creating_a_new_topic.step sites/en/intro-to-rails/ruby_language.step sites/en/intro-to-rails/running_your_application_locally.step sites/en/intro-to-rails/setting_the_default_page.step sites/en/intro-to-rails/voting_on_topics.step sites/en/javascript/clone_a_repo.step sites/en/javascript/javascript.step sites/en/javascript/javascript_not_java.step sites/en/javascript/numbers_strings_and_booleans.step sites/en/ruby/arrays.step sites/en/ruby/classes.step sites/en/ruby/hashes.step sites/en/ruby/ruby.step sites/en/ruby/strings.step sites/intro-to-php/add_the_project_to_a_git_repo.step sites/intro-to-php/img/sublime_add_folder_to_project.png sites/intro-to-php/intro-to-php.step sites/intro-to-rails/add_the_project_to_a_git_repo.step sites/intro-to-rails/img/sublime_add_folder_to_project.png sites/intro-to-rails/intro-to-rails.step spec/contents_spec.rb spec/titleizer_spec.rb
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges in the latest from railsbridge/docs, including localization support.
This means that the docs have moved to docs/sites//*
Currently the spanish docs just says: