GitBucket
|
fix merge conflicts
|
|---|
bhavi
authored
on 27 Jun 2017
|
| Gemfile |
|---|
|
Too large
|
| Gemfile.lock |
|---|
|
Too large
|
| app/controllers/guidances_controller.rb |
|---|
|
Too large
|
| app/controllers/orgs_controller.rb |
|---|
|
Too large
|
| app/controllers/plans_controller.rb |
|---|
|
Too large
|
| app/helpers/plans_helper.rb |
|---|
|
Too large
|
| app/views/contact_us/contacts/new.html.erb |
|---|
|
Too large
|
| app/views/devise/passwords/new.html.erb |
|---|
|
Too large
|
| app/views/devise/registrations/edit.html.erb |
|---|
|
Too large
|
| app/views/guidance_groups/admin_edit.html.erb |
|---|
|
Too large
|
| app/views/guidance_groups/admin_new.html.erb |
|---|
|
Too large
|
| app/views/guidance_groups/admin_show.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/guidances/admin_edit.html.erb |
|---|
|
Too large
|
| app/views/guidances/admin_index.html.erb |
|---|
|
Too large
|
| app/views/guidances/admin_new.html.erb |
|---|
|
Too large
|
| app/views/guidances/admin_show.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/home/index.html.erb |
|---|
|
Too large
|
| app/views/layouts/_branding.html.erb |
|---|
|
Too large
|
| app/views/layouts/_footer.html.erb |
|---|
|
Too large
|
| app/views/layouts/_header.html.erb |
|---|
|
Too large
|
| app/views/layouts/_navigation.html.erb |
|---|
|
Too large
|
| app/views/layouts/_signin_signout.html.erb |
|---|
|
Too large
|
| app/views/layouts/application.html.erb |
|---|
|
Too large
|
| app/views/orgs/_shibboleth_ds_list.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/orgs/admin_edit.html.erb |
|---|
|
Too large
|
| app/views/orgs/admin_show.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/orgs/shibboleth_ds.html.erb |
|---|
|
Too large
|
| app/views/phases/_edit_phase.html.erb |
|---|
|
Too large
|
| app/views/phases/_show_phase.html |
|---|
|
Too large
|
| app/views/phases/admin_add.html.erb |
|---|
|
Too large
|
| app/views/phases/admin_show.html.erb |
|---|
|
Too large
|
| app/views/phases/edit.html.erb |
|---|
|
Too large
|
| app/views/plans/_details.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_download.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_phase.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_plan_details.html.erb |
|---|
|
Too large
|
| app/views/plans/_plan_nav_tabs.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/plans/_plan_title.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/plans/_share.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_show_details.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_show_phase.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/plans/_toolbar.html.erb 100644 → 0 |
|---|
|
Too large
|
| app/views/plans/edit.html.erb |
|---|
|
Too large
|
| app/views/plans/index.html.erb |
|---|
|
Too large
|
| app/views/plans/new.html.erb |
|---|
|
Too large
|
| app/views/plans/public_index.html.erb |
|---|
|
Too large
|
| app/views/plans/share.html.erb |
|---|
|
Too large
|
| app/views/plans/show.html.erb |
|---|
|
Too large
|
| app/views/sections/_edit_section.html.erb |
|---|
|
Too large
|
| app/views/shared/_export_links.html.erb |
|---|
|
Too large
|
| app/views/shared/_login_form.html.erb |
|---|
|
Too large
|
| app/views/shared/_register_form.html.erb |
|---|
|
Too large
|
| app/views/shared/_table_filter.html.erb 0 → 100644 |
|---|
|
Too large
|
| app/views/static_pages/about_us.html.erb |
|---|
|
Too large
|
| app/views/static_pages/help.html.erb |
|---|
|
Too large
|
| app/views/static_pages/roadmap.html.erb |
|---|
|
Too large
|
| app/views/static_pages/termsuse.html.erb |
|---|
|
Too large
|
| app/views/templates/_admin_nav_tabs.html.erb |
|---|
|
Too large
|
| app/views/templates/_show_phases_sections.html.erb |
|---|
|
Too large
|
| app/views/templates/_show_template.html.erb |
|---|
|
Too large
|
| app/views/templates/admin_index.html.erb |
|---|
|
Too large
|
| app/views/templates/admin_template.html.erb |
|---|
|
Too large
|
| app/views/templates/admin_template_history.html.erb |
|---|
|
Too large
|
| app/views/users/admin_grant_permissions.html.erb |
|---|
|
Too large
|
| app/views/users/admin_index.html.erb |
|---|
|
Too large
|
| config/application.rb |
|---|
|
Too large
|
| db/migrate/20170619173045_add_data_contact_email_and_data_contact_phone_to_plans.rb 0 → 100644 |
|---|
|
Too large
|
| db/schema.rb |
|---|
|
Too large
|
| lib/assets/images/logo.png |
|---|
|
Too large
|
| lib/assets/images/logo_100x100.jpg 100644 → 0 |
|---|
|
Too large
|
| lib/assets/images/logo_300x300.jpg 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/Dmproadmap.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/admin.js |
|---|
|
Too large
|
| lib/assets/javascripts/answers/status.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/application.js |
|---|
|
Too large
|
| lib/assets/javascripts/bootstrap.min.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/bootstrap_listeners.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/contacts/new_contact.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/devise/passwords/new.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/devise/registrations/edit.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/accordions.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/admin.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/forms.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/modals.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/tables.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/tabs.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/dmproadmap/utils.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/export_configure.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/home/index.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery-accessible-autocomplet-list-aria.js 100755 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery.placeholder.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/jquery.tablesorter.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/notes/index.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/orgs/shibboleth_ds.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/plans/edit.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/plans/index.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/plans/new.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/plans/share.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/registrations/sign_in_sign_up.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/roadmap-form.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/roadmap-tabs.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/roadmap-utils.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/select2.min.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/shared/login_form.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/shared/register_form.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/toolbar.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/v1.js 100644 → 0 |
|---|
|
Too large
|
| lib/assets/javascripts/vendor/jquery-accessible-autocomplet-list-aria.js 0 → 100755 |
|---|
|
Too large
|
| lib/assets/javascripts/vendor/jquery-ui.min.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/vendor/jquery.placeholder.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/vendor/jquery.tablesorter.min.js 0 → 100755 |
|---|
|
Too large
|
| lib/assets/javascripts/vendor/v1.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/answers/status.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/contacts/new_contact.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/devise/passwords/new.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/devise/registrations/edit.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/guidances/admin_edit.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/home/index.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/notes/index.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/orgs/admin_edit.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/orgs/shibboleth_ds.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/plans/edit.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/plans/export_configure.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/plans/index.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/plans/new.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/plans/share.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/registrations/sign_in_sign_up.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/shared/login_form.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/javascripts/views/shared/register_form.js 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/admin.css.less 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/application.css 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/application.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/bootstrap.css 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/bootstrap_and_overrides.css.less 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/accordions.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/base.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/forms.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/modals.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/tables.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/dmproadmap/tabs.scss 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/httpd.conf 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/roadmap-form.scss 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/roadmap-hacks.scss 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/roadmap-tabs.scss 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/roadmap.scss 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/select2.css 100644 → 0 |
|---|
|
Too large
|
| lib/assets/stylesheets/vendor/jquery-ui.min.css 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/vendor/jquery-ui.structure.min.css 0 → 100644 |
|---|
|
Too large
|
| lib/assets/stylesheets/vendor/jquery-ui.theme.min.css 0 → 100644 |
|---|
|
Too large
|