1428 lines
76 KiB
XML
1428 lines
76 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project version="4">
|
|
<component name="ChangeListManager">
|
|
<list default="true" id="d7b1c0f9-5303-4042-90a5-05cecbda0e94" name="Default" comment="">
|
|
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/views/courses/credit.html.erb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/runConfigurations/Development__vim.xml" afterPath="$PROJECT_DIR$/.idea/runConfigurations/Development__vim.xml" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vim.iml" afterPath="$PROJECT_DIR$/.idea/vim.iml" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
=======
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/README.md" afterPath="$PROJECT_DIR$/README.md" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/courses_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/courses_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/courses/index.html.erb" afterPath="$PROJECT_DIR$/app/views/courses/index.html.erb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/views/shared/_sidenav.html.erb" afterPath="$PROJECT_DIR$/app/views/shared/_sidenav.html.erb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/config/routes.rb" afterPath="$PROJECT_DIR$/config/routes.rb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb" afterPath="$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb" />
|
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/db/schema.rb" afterPath="$PROJECT_DIR$/db/schema.rb" />
|
|
>>>>>>> huluobu-master
|
|
</list>
|
|
<ignored path="vim.iws" />
|
|
<ignored path=".idea/workspace.xml" />
|
|
<ignored path="$PROJECT_DIR$/.bundle/" />
|
|
<ignored path="$PROJECT_DIR$/components/" />
|
|
<ignored path="$PROJECT_DIR$/public/system/" />
|
|
<ignored path="$PROJECT_DIR$/tmp/" />
|
|
<ignored path="$PROJECT_DIR$/vendor/bundle/" />
|
|
<ignored path=".idea/dataSources.local.xml" />
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
</component>
|
|
<component name="CoverageDataManager">
|
|
<SUITE FILE_PATH="coverage/vim@CourseSelect_dev.coverage" NAME="CourseSelect_dev Coverage Results" MODIFIED="1480997527350" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="vim" />
|
|
<SUITE FILE_PATH="coverage/vim@Development__vim.coverage" NAME="Development: vim Coverage Results" MODIFIED="1473515325585" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="rcov" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$" MODULE_NAME="vim" />
|
|
</component>
|
|
<component name="CreatePatchCommitExecutor">
|
|
<option name="PATCH_PATH" value="" />
|
|
</component>
|
|
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
|
|
<component name="FavoritesManager">
|
|
<favorites_list name="vim" />
|
|
</component>
|
|
<component name="FileEditorManager">
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="288">
|
|
<caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="20161109105023_add_open_to_courses.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
=======
|
|
<file leaf-file-name="courses_controller.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="135">
|
|
<caret line="72" column="22" selection-start-line="72" selection-start-column="22" selection-end-line="72" selection-end-column="22" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="homes_controller.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/homes_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="72">
|
|
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
|
|
=======
|
|
<file leaf-file-name="20160907152104_create_courses.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="90">
|
|
<caret line="6" column="27" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="27" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="detail.erb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="396">
|
|
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
|
=======
|
|
<file leaf-file-name="credit.html.erb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/credit.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="135">
|
|
<caret line="9" column="76" selection-start-line="9" selection-start-column="76" selection-end-line="9" selection-end-column="76" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="20160907152104_create_courses.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="270">
|
|
<caret line="15" column="27" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
|
|
=======
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="20160909105514_create_grades.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160909105514_create_grades.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="54">
|
|
<caret line="3" column="26" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="26" />
|
|
=======
|
|
<file leaf-file-name="_sidenav.html.erb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/views/shared/_sidenav.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="282">
|
|
<caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="default.jpg" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default.jpg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="avatar_uploader.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="330">
|
|
<caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" />
|
|
=======
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="270">
|
|
<caret line="15" column="27" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
|
|
>>>>>>> huluobu-master
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="grades_controller.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="324">
|
|
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
|
=======
|
|
<state relative-caret-position="36">
|
|
<caret line="2" column="45" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="45" />
|
|
=======
|
|
<state relative-caret-position="30">
|
|
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="courses_controller.rb" pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="342">
|
|
<caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
|
|
<folding />
|
|
</state>
|
|
=======
|
|
<<<<<<< HEAD
|
|
<file leaf-file-name="default.jpg" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default.jpg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
>>>>>>> huluobu-master
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="list.html.erb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="330">
|
|
<caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" />
|
|
=======
|
|
<state relative-caret-position="-198">
|
|
<caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
<state relative-caret-position="330">
|
|
<caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" />
|
|
=======
|
|
<file leaf-file-name="20161206035340_add_degree_attribute.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161206035340_add_degree_attribute.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="45">
|
|
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
|
|
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="229">
|
|
<caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
<file leaf-file-name="index.html.erb" pinned="false" current-in-tab="true">
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="150">
|
|
<caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</file>
|
|
</leaf>
|
|
</component>
|
|
<component name="GeneratorOptions">
|
|
<option name="VCS_SHOW_CONFIRMATION" value="true" />
|
|
</component>
|
|
<component name="Git.Settings">
|
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
<map>
|
|
<entry key="$PROJECT_DIR$" value="master" />
|
|
</map>
|
|
</option>
|
|
</component>
|
|
<component name="IdeDocumentHistory">
|
|
<option name="CHANGED_PATHS">
|
|
<list>
|
|
<<<<<<< HEAD
|
|
<option value="$PROJECT_DIR$/app/helpers/sessions_helper.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/teachers/manage_transcript.html.erb" />
|
|
=======
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<option value="$PROJECT_DIR$/app/controllers/teachers_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/controllers/users_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/grades/manage_transcript.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/course.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/users/_sidenav.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/_sidenav.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/grades/upload.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/controllers/grades_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/grades/index.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/new.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/edit.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/layouts/_header.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/assets/stylesheets/application.scss" />
|
|
<option value="$PROJECT_DIR$/app/views/layouts/application.html.erb" />
|
|
<option value="$PROJECT_DIR$/.trasvis.yml" />
|
|
<option value="$PROJECT_DIR$/config/database.yml" />
|
|
<option value="$PROJECT_DIR$/test/controllers/sessions_controller_test.rb" />
|
|
<option value="$PROJECT_DIR$/test/controllers/grades_controller_test.rb" />
|
|
<option value="$PROJECT_DIR$/test/models/user_test.rb" />
|
|
<option value="$PROJECT_DIR$/test/integration/site_layout_test.rb" />
|
|
<option value="$PROJECT_DIR$/test/fixtures/users.yml" />
|
|
<option value="$PROJECT_DIR$/test/integration/user_login_test.rb" />
|
|
<option value="$PROJECT_DIR$/.travis.yml" />
|
|
<option value="$PROJECT_DIR$/app/controllers/sessions_controller.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161102035441_create_detail_courses.rb" />
|
|
<option value="$PROJECT_DIR$/app/models/detail_course.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161102052958_add_course_introduction_to_courses.rb" />
|
|
<option value="$PROJECT_DIR$/db/seeds.rb" />
|
|
<option value="$PROJECT_DIR$/db/schema.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161108155922_drop_image.rb" />
|
|
<option value="$PROJECT_DIR$/Gemfile" />
|
|
<option value="$PROJECT_DIR$/app/models/image.rb" />
|
|
<option value="$PROJECT_DIR$/app/uploaders/image_uploader.rb" />
|
|
<option value="$PROJECT_DIR$/app/controllers/image_controller.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
|
<option value="$PROJECT_DIR$/app/models/course.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/_form.html.erb" />
|
|
<<<<<<< HEAD
|
|
<option value="$PROJECT_DIR$/app/views/courses/index.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/layouts/_content.html.erb" />
|
|
<option value="$PROJECT_DIR$/config/routes.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/list.html.erb" />
|
|
<option value="$PROJECT_DIR$/README.md" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/detail.erb" />
|
|
<option value="$PROJECT_DIR$/app/controllers/homes_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/homes/index.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/uploaders/avatar_uploader.rb" />
|
|
<<<<<<< HEAD
|
|
<option value="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
|
=======
|
|
=======
|
|
<option value="$PROJECT_DIR$/app/controllers/homes_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/detail.erb" />
|
|
<option value="$PROJECT_DIR$/app/uploaders/avatar_uploader.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/layouts/_content.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/homes/index.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/list.html.erb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb" />
|
|
<option value="$PROJECT_DIR$/db/migrate/20161206035340_add_degree_attribute.rb" />
|
|
<option value="$PROJECT_DIR$/config/routes.rb" />
|
|
<option value="$PROJECT_DIR$/app/controllers/courses_controller.rb" />
|
|
<option value="$PROJECT_DIR$/app/views/shared/_sidenav.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/credit.html.erb" />
|
|
<option value="$PROJECT_DIR$/app/views/courses/index.html.erb" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
</list>
|
|
</option>
|
|
</component>
|
|
<component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
|
|
<component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
|
|
<component name="JsGulpfileManager">
|
|
<detection-done>true</detection-done>
|
|
<sorting>DEFINITION_ORDER</sorting>
|
|
</component>
|
|
<component name="LogFilters">
|
|
<option name="FILTER_ERRORS" value="false" />
|
|
<option name="FILTER_WARNINGS" value="false" />
|
|
<option name="FILTER_INFO" value="true" />
|
|
<option name="FILTER_DEBUG" value="true" />
|
|
<option name="CUSTOM_FILTER" />
|
|
</component>
|
|
<component name="ProjectFrameBounds">
|
|
<option name="y" value="24" />
|
|
<option name="width" value="1366" />
|
|
<option name="height" value="681" />
|
|
</component>
|
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
|
|
<OptionsSetting value="true" id="Add" />
|
|
<OptionsSetting value="true" id="Remove" />
|
|
<OptionsSetting value="true" id="Checkout" />
|
|
<OptionsSetting value="true" id="Update" />
|
|
<OptionsSetting value="true" id="Status" />
|
|
<OptionsSetting value="true" id="Edit" />
|
|
<ConfirmationsSetting value="0" id="Add" />
|
|
<ConfirmationsSetting value="0" id="Remove" />
|
|
</component>
|
|
<component name="ProjectView">
|
|
<navigator currentView="ProjectPane" proportions="" version="1">
|
|
<flattenPackages />
|
|
<showMembers />
|
|
<showModules />
|
|
<showLibraryContents />
|
|
<hideEmptyPackages />
|
|
<abbreviatePackageNames />
|
|
<autoscrollToSource />
|
|
<autoscrollFromSource />
|
|
<sortByType />
|
|
<manualOrder />
|
|
<foldersAlwaysOnTop value="true" />
|
|
</navigator>
|
|
<panes>
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<pane id="Scope" />
|
|
=======
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
<pane id="Scratches">
|
|
<subPane />
|
|
</pane>
|
|
<pane id="RailsProjectView" />
|
|
<pane id="Scope" />
|
|
>>>>>>> huluobu-master
|
|
<pane id="ProjectPane">
|
|
<subPane>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<<<<<<< HEAD
|
|
<option name="myItemId" value="app" />
|
|
=======
|
|
<option name="myItemId" value="db" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="db" />
|
|
<<<<<<< HEAD
|
|
=======
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="migrate" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="views" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="views" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="courses" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<<<<<<< HEAD
|
|
<option name="myItemId" value="uploaders" />
|
|
=======
|
|
<<<<<<< HEAD
|
|
<option name="myItemId" value="assets" />
|
|
=======
|
|
<option name="myItemId" value="shared" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="views" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="courses" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
<PATH>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="vim" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="CourseSelect" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="app" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
<PATH_ELEMENT>
|
|
<option name="myItemId" value="controllers" />
|
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
|
|
</PATH_ELEMENT>
|
|
</PATH>
|
|
</subPane>
|
|
</pane>
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<pane id="Scratches">
|
|
<subPane />
|
|
</pane>
|
|
<pane id="RailsProjectView" />
|
|
=======
|
|
<pane id="RailsProjectView" />
|
|
<pane id="Scope" />
|
|
<pane id="Scratches">
|
|
<subPane />
|
|
</pane>
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
>>>>>>> huluobu-master
|
|
</panes>
|
|
</component>
|
|
<component name="PropertiesComponent">
|
|
<property name="settings.editor.selected.configurable" value="org.jetbrains.plugins.ruby.settings.RubyActiveModuleSdkConfigurable" />
|
|
<property name="settings.editor.splitter.proportion" value="0.2" />
|
|
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
<property name="js-jscs-nodeInterpreter" value="/usr/local/bin/node" />
|
|
<property name="Ruby.ViewRefParam.DefaultExtension" value="html.erb" />
|
|
</component>
|
|
<component name="RecentsManager">
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
<recent name="$PROJECT_DIR$/app/assets/images/fallback" />
|
|
<recent name="$PROJECT_DIR$/config" />
|
|
<recent name="$PROJECT_DIR$/test/controllers" />
|
|
<recent name="$PROJECT_DIR$/lib" />
|
|
<recent name="$PROJECT_DIR$/config/initializers" />
|
|
</key>
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
<recent name="$PROJECT_DIR$/app/views/courses" />
|
|
<recent name="$PROJECT_DIR$/app/views/teachers" />
|
|
<recent name="$PROJECT_DIR$/app/views/users" />
|
|
</key>
|
|
</component>
|
|
<component name="RunManager" selected="Rails.CourseSelect_dev">
|
|
<configuration default="true" type="CucumberRunConfigurationType" factoryName="Cucumber">
|
|
<predefined_log_file id="RUBY_CUCUMBER" enabled="true" />
|
|
<module name="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*.feature" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_TAGS_FILTER" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="TEST_NAME_FILTER" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_ARGS" VALUE="--color -r features" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="VERBOSE_OPTION" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="CUCUMBER_RUNNER_PATH" VALUE="" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_RUNNER" VALUE="false" />
|
|
<CUCUMBER_RUN_CONFIG_SETTINGS_ID NAME="SETTINGS_VERSION" VALUE="2" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="RSpecRunConfigurationType" factoryName="RSpec">
|
|
<predefined_log_file id="RUBY_RSPEC" enabled="true" />
|
|
<module name="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_RUNNER_PATH" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="**/*_spec.rb" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_EXAMPLE_NAME" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPEC_ARGS" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_VERSION" VALUE="" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="USE_CUSTOM_SPEC_RUNNER" VALUE="false" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
|
|
<RSPEC_RUN_CONFIG_SETTINGS_ID NAME="FULL_BACKTRACE" VALUE="false" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="RailsRunConfigurationType" factoryName="Rails">
|
|
<predefined_log_file id="RUBY_RAILS_SERVER" enabled="true" />
|
|
<module name="" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="$MODULE_DIR$" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="SCRIPT_ARGS" VALUE="" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="PORT" VALUE="3000" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="IP" VALUE="0.0.0.0" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="DUMMY_APP" VALUE="test/dummy" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="RAILS_SERVER_TYPE" VALUE="Default" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="ENVIRONMENT_TYPE" VALUE="development" />
|
|
<RAILS_SERVER_CONFIG_SETTINGS_ID NAME="LAUNCH_JS" VALUE="false" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="RakeRunConfigurationType" factoryName="Rake">
|
|
<module name="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_NAME" VALUE="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ARGS" VALUE="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_ATTACHED_TEST_FRAMEWORKS" VALUE="" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_TRACE" VALUE="false" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_DRYRUN" VALUE="false" />
|
|
<RAKE_RUN_CONFIG_SETTINGS_ID NAME="RAKE_TASK_OPTION_PREREQS" VALUE="false" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="RubyRunConfigurationType" factoryName="Ruby">
|
|
<module name="" />
|
|
<RUBY_RUN_CONFIG NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<RUBY_RUN_CONFIG NAME="WORK DIR" VALUE="" />
|
|
<RUBY_RUN_CONFIG NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<RUBY_RUN_CONFIG NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<RUBY_RUN_CONFIG NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<RUBY_RUN_CONFIG NAME="SCRIPT_PATH" VALUE="" />
|
|
<RUBY_RUN_CONFIG NAME="SCRIPT_ARGS" VALUE="" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="TestUnitRunConfigurationType" factoryName="Test::Unit/Shoulda/Minitest">
|
|
<predefined_log_file id="RUBY_TESTUNIT" enabled="true" />
|
|
<module name="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUBY_ARGS" VALUE="-e $stdout.sync=true;$stderr.sync=true;load($0=ARGV.shift)" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="WORK DIR" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="SHOULD_USE_SDK" VALUE="false" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="ALTERN_SDK_NAME" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="myPassParentEnvs" VALUE="true" />
|
|
<envs />
|
|
<EXTENSION ID="BundlerRunConfigurationExtension" bundleExecEnabled="false" />
|
|
<EXTENSION ID="JRubyRunConfigurationExtension" NailgunExecEnabled="false" />
|
|
<EXTENSION ID="RubyCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" track_test_folders="true" runner="rcov">
|
|
<COVERAGE_PATTERN ENABLED="true">
|
|
<PATTERN REGEXPS="/.rvm/" INCLUDED="false" />
|
|
</COVERAGE_PATTERN>
|
|
</EXTENSION>
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TESTS_FOLDER_PATH" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_SCRIPT_PATH" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_FILE_MASK" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_METHOD_NAME" VALUE="" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="TEST_TEST_TYPE" VALUE="TEST_SCRIPT" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="DRB" VALUE="false" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="ZEUS" VALUE="false" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="SPRING" VALUE="false" />
|
|
<RTEST_RUN_CONFIG_SETTINGS_ID NAME="RUNNER_OPTIONS" VALUE="" />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
|
|
<node-interpreter>project</node-interpreter>
|
|
<node-options />
|
|
<gulpfile />
|
|
<tasks />
|
|
<arguments />
|
|
<envs />
|
|
<method />
|
|
</configuration>
|
|
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
|
|
<command value="run-script" />
|
|
<scripts />
|
|
<node-interpreter value="project" />
|
|
<envs />
|
|
<method />
|
|
</configuration>
|
|
<list size="5">
|
|
<item index="0" class="java.lang.String" itemvalue="Rails.CourseSelect_dev" />
|
|
<item index="1" class="java.lang.String" itemvalue="Rails.Production: vim" />
|
|
<item index="2" class="java.lang.String" itemvalue="Rails.Development: vim" />
|
|
<item index="3" class="java.lang.String" itemvalue="Rake.test: vim" />
|
|
<item index="4" class="java.lang.String" itemvalue="Rake.spec: vim" />
|
|
</list>
|
|
</component>
|
|
<component name="ShelveChangesManager" show_recycled="false">
|
|
<option name="remove_strategy" value="false" />
|
|
</component>
|
|
<component name="SvnConfiguration">
|
|
<configuration />
|
|
</component>
|
|
<component name="TaskManager">
|
|
<task active="true" id="Default" summary="Default task">
|
|
<changelist id="d7b1c0f9-5303-4042-90a5-05cecbda0e94" name="Default" comment="" />
|
|
<created>1469151659389</created>
|
|
<option name="number" value="Default" />
|
|
<option name="presentableId" value="Default" />
|
|
<updated>1469151659389</updated>
|
|
<workItem from="1477921128713" duration="246000" />
|
|
<workItem from="1477922576283" duration="971000" />
|
|
<workItem from="1477924054798" duration="78000" />
|
|
<workItem from="1478019546026" duration="46000" />
|
|
<workItem from="1478058543638" duration="6709000" />
|
|
<workItem from="1478065331526" duration="2775000" />
|
|
<workItem from="1478620137437" duration="2132000" />
|
|
<workItem from="1478622284611" duration="1604000" />
|
|
<workItem from="1478623902569" duration="289000" />
|
|
<workItem from="1478624207152" duration="725000" />
|
|
<workItem from="1478664154199" duration="9295000" />
|
|
<workItem from="1478673639496" duration="1071000" />
|
|
<workItem from="1478674726204" duration="2626000" />
|
|
<workItem from="1478686736886" duration="167000" />
|
|
<workItem from="1479035444853" duration="51000" />
|
|
<workItem from="1479012254949" duration="54000" />
|
|
<workItem from="1479273173231" duration="405000" />
|
|
<workItem from="1479273591547" duration="7353000" />
|
|
<workItem from="1479281188590" duration="6069000" />
|
|
<workItem from="1479290164702" duration="49000" />
|
|
<workItem from="1479290433098" duration="9109000" />
|
|
<<<<<<< HEAD
|
|
<workItem from="1479299887930" duration="2374000" />
|
|
<workItem from="1479597022926" duration="1290000" />
|
|
<workItem from="1479572693816" duration="3973000" />
|
|
<workItem from="1479577369583" duration="779000" />
|
|
<workItem from="1479578250669" duration="32000" />
|
|
<workItem from="1479683655211" duration="1866000" />
|
|
<workItem from="1479924259664" duration="2601000" />
|
|
<workItem from="1479900001385" duration="4573000" />
|
|
<workItem from="1479904669591" duration="466000" />
|
|
<<<<<<< HEAD
|
|
<workItem from="1479905211350" duration="825000" />
|
|
<<<<<<< HEAD
|
|
<workItem from="1481119587206" duration="25000" />
|
|
=======
|
|
<workItem from="1481119198687" duration="347000" />
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
<workItem from="1479905211350" duration="896000" />
|
|
<workItem from="1481105344454" duration="13000" />
|
|
=======
|
|
<workItem from="1479299887930" duration="15000" />
|
|
<workItem from="1479901604237" duration="9000" />
|
|
<workItem from="1479901629377" duration="1907000" />
|
|
<workItem from="1480244315475" duration="2535000" />
|
|
<workItem from="1480415630942" duration="129000" />
|
|
<workItem from="1480415773880" duration="305000" />
|
|
<workItem from="1480416092286" duration="148000" />
|
|
<workItem from="1480416343540" duration="18000" />
|
|
<workItem from="1480416390989" duration="697000" />
|
|
<workItem from="1480922290318" duration="52000" />
|
|
<workItem from="1480922472483" duration="98000" />
|
|
<workItem from="1480996301097" duration="259000" />
|
|
<workItem from="1480996584418" duration="804000" />
|
|
<workItem from="1480997318582" duration="3278000" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
</task>
|
|
<task id="LOCAL-00001" summary="增加课程介绍，首页轮播的外观搭建">
|
|
<created>1478067100340</created>
|
|
<option name="number" value="00001" />
|
|
<option name="presentableId" value="LOCAL-00001" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1478067100340</updated>
|
|
</task>
|
|
<task id="LOCAL-00002" summary="为每个课程添加 图片 ，并且可上传">
|
|
<created>1478624887313</created>
|
|
<option name="number" value="00002" />
|
|
<option name="presentableId" value="LOCAL-00002" />
|
|
<option name="project" value="LOCAL" />
|
|
<updated>1478624887313</updated>
|
|
</task>
|
|
<option name="localTasksCounter" value="3" />
|
|
<servers />
|
|
</component>
|
|
<component name="TimeTrackingManager">
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
<option name="totallyTimeSpent" value="70628000" />
|
|
=======
|
|
<option name="totallyTimeSpent" value="70950000" />
|
|
>>>>>>> flyingwaters-master
|
|
=======
|
|
<option name="totallyTimeSpent" value="70687000" />
|
|
=======
|
|
<option name="totallyTimeSpent" value="62078000" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
</component>
|
|
<component name="TodoView">
|
|
<todo-panel id="selected-file">
|
|
<is-autoscroll-to-source value="true" />
|
|
</todo-panel>
|
|
<todo-panel id="all">
|
|
<are-packages-shown value="true" />
|
|
<is-autoscroll-to-source value="true" />
|
|
</todo-panel>
|
|
</component>
|
|
<component name="ToolWindowManager">
|
|
<frame x="0" y="24" width="1366" height="681" extended-state="6" />
|
|
<editor active="false" />
|
|
<layout>
|
|
<<<<<<< HEAD
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23607281" sideWeight="0.4858757" order="1" side_tool="false" content_ui="combo" />
|
|
=======
|
|
<<<<<<< HEAD
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.23607281" sideWeight="0.4858757" order="1" side_tool="false" content_ui="combo" />
|
|
=======
|
|
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18957704" sideWeight="0.4858757" order="1" side_tool="false" content_ui="combo" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
>>>>>>> huluobu-master
|
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.34751773" sideWeight="0.5156082" order="0" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41945288" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32590052" sideWeight="0.48707592" order="5" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
<<<<<<< HEAD
|
|
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.34954408" sideWeight="0.4843918" order="2" side_tool="false" content_ui="tabs" />
|
|
=======
|
|
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18524872" sideWeight="0.49030694" order="2" side_tool="false" content_ui="tabs" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3513732" sideWeight="0.5141243" order="0" side_tool="true" content_ui="tabs" />
|
|
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.28335625" sideWeight="0.48626816" order="6" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" />
|
|
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3287483" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
|
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
|
|
</layout>
|
|
</component>
|
|
<component name="Vcs.Log.UiProperties">
|
|
<option name="RECENTLY_FILTERED_USER_GROUPS">
|
|
<collection />
|
|
</option>
|
|
<option name="RECENTLY_FILTERED_BRANCH_GROUPS">
|
|
<collection />
|
|
</option>
|
|
</component>
|
|
<component name="VcsContentAnnotationSettings">
|
|
<option name="myLimit" value="2678400000" />
|
|
</component>
|
|
<component name="VcsManagerConfiguration">
|
|
<MESSAGE value="增加课程介绍，首页轮播的外观搭建" />
|
|
<MESSAGE value="为每个课程添加 图片 ，并且可上传" />
|
|
<option name="LAST_COMMIT_MESSAGE" value="为每个课程添加 图片 ，并且可上传" />
|
|
</component>
|
|
<component name="XDebuggerManager">
|
|
<breakpoint-manager>
|
|
<<<<<<< HEAD
|
|
<breakpoints>
|
|
<line-breakpoint enabled="true" type="ruby-line">
|
|
<url>file://$PROJECT_DIR$/app/controllers/courses_controller.rb</url>
|
|
<line>134</line>
|
|
<option name="timeStamp" value="160" />
|
|
</line-breakpoint>
|
|
<line-breakpoint enabled="true" type="ruby-line">
|
|
<url>file://$PROJECT_DIR$/app/controllers/homes_controller.rb</url>
|
|
<line>2</line>
|
|
<option name="timeStamp" value="162" />
|
|
</line-breakpoint>
|
|
</breakpoints>
|
|
<option name="time" value="163" />
|
|
=======
|
|
<option name="time" value="167" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
</breakpoint-manager>
|
|
<watches-manager />
|
|
</component>
|
|
<component name="editorHistoryManager">
|
|
<<<<<<< HEAD
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/test/fixtures/users.yml">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="10" column="27" selection-start-line="10" selection-start-column="27" selection-end-line="10" selection-end-column="27" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/config/database.yml.travis">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="12" column="5" selection-start-line="12" selection-start-column="5" selection-end-line="12" selection-end-column="5" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/config/database.yml">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="3" column="9" selection-start-line="3" selection-start-column="9" selection-end-line="3" selection-end-column="9" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/.travis.yml">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="252">
|
|
<caret line="14" column="20" selection-start-line="14" selection-start-column="20" selection-end-line="14" selection-end-column="20" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<entry file="file://$PROJECT_DIR$/app/models/grade.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="18">
|
|
<caret line="1" column="2" selection-start-line="1" selection-start-column="2" selection-end-line="1" selection-end-column="20" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/models/detail_course.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/views/grades/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-306">
|
|
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161102035441_create_detail_courses.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/application_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/test/fixtures/course_details.yml" />
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161108153212_add_attachment_image_to_images.rb" />
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161108155922_drop_image.rb" />
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160818081955_create_users.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="180">
|
|
<caret line="10" column="31" selection-start-line="10" selection-start-column="31" selection-end-line="10" selection-end-column="31" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/seeds.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="2214">
|
|
<caret line="123" column="253" selection-start-line="123" selection-start-column="253" selection-end-line="123" selection-end-column="253" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161108160758_create_images.rb" />
|
|
<entry file="file://$PROJECT_DIR$/db/schema.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="900">
|
|
<caret line="50" column="4" selection-start-line="50" selection-start-column="4" selection-end-line="50" selection-end-column="4" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/models/image.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/uploaders/image_uploader.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/image_controller.rb" />
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161108164630_add_avatar_to_courses.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/assets/images/background.jpg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/fallback/default.jpg" />
|
|
<entry file="file://$PROJECT_DIR$/app/views/users/new.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/Gemfile">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="882">
|
|
<caret line="49" column="0" selection-start-line="49" selection-start-column="0" selection-end-line="49" selection-end-column="0" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/sessions_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="432">
|
|
<caret line="24" column="0" selection-start-line="24" selection-start-column="0" selection-end-line="24" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="90">
|
|
<caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="414">
|
|
<caret line="23" column="8" selection-start-line="23" selection-start-column="8" selection-end-line="23" selection-end-column="8" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="486">
|
|
<caret line="27" column="41" selection-start-line="27" selection-start-column="41" selection-end-line="27" selection-end-column="41" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/layouts/application.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="288">
|
|
<caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/layouts/_footer.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/layouts/_header.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/layouts/_content.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="216">
|
|
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/edit.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="270">
|
|
<caret line="15" column="10" selection-start-line="15" selection-start-column="10" selection-end-line="15" selection-end-column="10" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/users_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="252">
|
|
<caret line="14" column="18" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="18" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/users/_form.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="1152">
|
|
<caret line="64" column="58" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="58" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/new.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="216">
|
|
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/_form.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="2160">
|
|
<caret line="120" column="4" selection-start-line="120" selection-start-column="4" selection-end-line="120" selection-end-column="76" />
|
|
=======
|
|
<state relative-caret-position="180">
|
|
<caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="102" selection-end-column="10" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="450">
|
|
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/README.md">
|
|
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
|
|
<state split_layout="SPLIT">
|
|
<first_editor relative-caret-position="396">
|
|
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
|
</first_editor>
|
|
<second_editor />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/models/course.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="36">
|
|
<caret line="2" column="10" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="10" />
|
|
=======
|
|
<state relative-caret-position="252">
|
|
<caret line="14" column="18" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="18" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/new.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="180">
|
|
<caret line="12" column="19" selection-start-line="12" selection-start-column="19" selection-end-line="12" selection-end-column="19" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/users/_form.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="960">
|
|
<caret line="64" column="58" selection-start-line="64" selection-start-column="21" selection-end-line="64" selection-end-column="58" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="165">
|
|
<caret line="11" column="48" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="48" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="270">
|
|
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="1872">
|
|
<caret line="104" column="0" selection-start-line="104" selection-start-column="0" selection-end-line="104" selection-end-column="0" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
>>>>>>> huluobu-master
|
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/100520.jpeg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/big_aaa.png">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/public/uploads/course/avatar/1/lb_aaa.png">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default_original.jpeg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161102052958_add_course_introduction_to_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="36">
|
|
<caret line="2" column="45" selection-start-line="2" selection-start-column="26" selection-end-line="2" selection-end-column="45" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160909105514_create_grades.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="45">
|
|
<caret line="3" column="26" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="26" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="15">
|
|
<caret line="21" column="21" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="30">
|
|
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161206035340_add_degree_attribute.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="45">
|
|
<caret line="3" column="3" selection-start-line="3" selection-start-column="3" selection-end-line="3" selection-end-column="3" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20160907152104_create_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="270">
|
|
<caret line="15" column="27" selection-start-line="15" selection-start-column="20" selection-end-line="15" selection-end-column="27" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/config/routes.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="229">
|
|
<caret line="32" column="34" selection-start-line="32" selection-start-column="34" selection-end-line="32" selection-end-column="34" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/homes_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="72">
|
|
<caret line="4" column="46" selection-start-line="4" selection-start-column="46" selection-end-line="4" selection-end-column="46" />
|
|
=======
|
|
<state relative-caret-position="90">
|
|
<caret line="6" column="27" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="27" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161109105023_add_open_to_courses.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<<<<<<< HEAD
|
|
<state relative-caret-position="0">
|
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
|
|
=======
|
|
<state relative-caret-position="135">
|
|
<caret line="72" column="22" selection-start-line="72" selection-start-column="22" selection-end-line="72" selection-end-column="22" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/db/migrate/20161113072827_add_open_attribute.rb" />
|
|
<entry file="file://$PROJECT_DIR$/app/views/homes/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="288">
|
|
<caret line="16" column="39" selection-start-line="16" selection-start-column="39" selection-end-line="16" selection-end-column="39" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/app/views/shared/_sidenav.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="282">
|
|
<caret line="52" column="86" selection-start-line="52" selection-start-column="86" selection-end-line="52" selection-end-column="86" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/detail.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="396">
|
|
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/credit.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="135">
|
|
<caret line="9" column="76" selection-start-line="9" selection-start-column="76" selection-end-line="9" selection-end-column="76" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<<<<<<< HEAD
|
|
<entry file="file://$PROJECT_DIR$/app/assets/images/fallback/default.jpg">
|
|
<provider selected="true" editor-type-id="images">
|
|
<state />
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/uploaders/avatar_uploader.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="330">
|
|
<caret line="27" column="35" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="35" />
|
|
=======
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/index.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="150">
|
|
<caret line="31" column="21" selection-start-line="31" selection-start-column="21" selection-end-line="31" selection-end-column="21" />
|
|
>>>>>>> 35b6d0a7f00e66e3dd0d8e7ff14d2ceed8776b54
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/grades_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="324">
|
|
<caret line="18" column="22" selection-start-line="18" selection-start-column="22" selection-end-line="18" selection-end-column="22" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/views/courses/list.html.erb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="-198">
|
|
<caret line="10" column="14" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="14" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
<entry file="file://$PROJECT_DIR$/app/controllers/courses_controller.rb">
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
<state relative-caret-position="342">
|
|
<caret line="79" column="23" selection-start-line="79" selection-start-column="23" selection-end-line="79" selection-end-column="23" />
|
|
<folding />
|
|
</state>
|
|
</provider>
|
|
</entry>
|
|
</component>
|
|
</project> |