Restore missing PRs in feature/surveys#1421
Merged
beagleknight merged 26 commits intofeature/surveysfrom May 31, 2017
Merged
Conversation
* Add engine skeleton * Add feature test * An admin can update a survey without questions * Admin can add n questions to a survey * Admin can edit survey questions * An admin can remove questions from surveys * Admin can publish a survey * Minor refactor * Users answer surveys * Fix minor errors * Rubocop * Add model validations * Fix minor things * Fix hound complains * Fix more complains * Fix broken specs * Add some feedback * Add some permissions * Add missing translation * Fix rubocop issues * Add tests to the CI * Fix broken test suite * Normalize locales
* Admin can mark question as mandatory * Users must respond mandatory questions * Fix problems with poltergeist * Fix rubocop complains * Fix i18n-issues * Add feedback * Fix rubocop complains
|
@beagleknight, thanks for your PR! By analyzing the history of the files in this pull request, we identified @lastpotion and @mrcasals to be potential reviewers. |
Codecov Report
@@ Coverage Diff @@
## feature/surveys #1421 +/- ##
===================================================
+ Coverage 94.6% 94.97% +0.36%
===================================================
Files 443 461 +18
Lines 7565 7879 +314
===================================================
+ Hits 7157 7483 +326
+ Misses 408 396 -12 |
oriolgual
approved these changes
May 31, 2017
beagleknight
added a commit
that referenced
this pull request
Jun 2, 2017
* Add custom styles * Change from toc to tos * Fix broken tests * Fix typo * Fix spec * Fix rubocop issues * Add Surveys engine MVP (#1364) * Add engine skeleton * Add feature test * An admin can update a survey without questions * Admin can add n questions to a survey * Admin can edit survey questions * An admin can remove questions from surveys * Admin can publish a survey * Minor refactor * Users answer surveys * Fix minor errors * Rubocop * Add model validations * Fix minor things * Fix hound complains * Fix more complains * Fix broken specs * Add some feedback * Add some permissions * Add missing translation * Fix rubocop issues * Add tests to the CI * Fix broken test suite * Normalize locales * Admin can mark question as mandatory (#1386) * Admin can mark question as mandatory * Users must respond mandatory questions * Fix problems with poltergeist * Fix rubocop complains * Fix i18n-issues * Add feedback * Fix rubocop complains * Huge refactor templates * Fix rubocop issues * Admins can select question type * Factor out auto label position code * Moar refactor * Huge JS refactor * Add dynamic answer options for a question * Admin survey form working with dynamic answer options * Single and multiple options working * Fixed rubocop issues * Fix i18n problems * Ignore unused i18n * Add ignore unused * Add answer option default value * Fix rectify problem * Fix minor issues * Fix a few bad merges * Fix broken specs
beagleknight
added a commit
that referenced
this pull request
Jun 5, 2017
* Add custom styles * Change from toc to tos * Fix broken tests * Fix typo * Fix spec * Fix rubocop issues * Add Surveys engine MVP (#1364) * Add engine skeleton * Add feature test * An admin can update a survey without questions * Admin can add n questions to a survey * Admin can edit survey questions * An admin can remove questions from surveys * Admin can publish a survey * Minor refactor * Users answer surveys * Fix minor errors * Rubocop * Add model validations * Fix minor things * Fix hound complains * Fix more complains * Fix broken specs * Add some feedback * Add some permissions * Add missing translation * Fix rubocop issues * Add tests to the CI * Fix broken test suite * Normalize locales * Admin can mark question as mandatory (#1386) * Admin can mark question as mandatory * Users must respond mandatory questions * Fix problems with poltergeist * Fix rubocop complains * Fix i18n-issues * Add feedback * Fix rubocop complains * Huge refactor templates * Fix rubocop issues * Admins can select question type * Factor out auto label position code * Moar refactor * Huge JS refactor * Add dynamic answer options for a question * Admin survey form working with dynamic answer options * Single and multiple options working * Fixed rubocop issues * Fix i18n problems * Ignore unused i18n * Add ignore unused * Add answer option default value * Fix rectify problem * Fix minor issues * Fix a few bad merges * Fix broken specs
josepjaume
pushed a commit
that referenced
this pull request
Jun 6, 2017
* Add Surveys engine MVP (#1364) * Add engine skeleton * Add feature test * An admin can update a survey without questions * Admin can add n questions to a survey * Admin can edit survey questions * An admin can remove questions from surveys * Admin can publish a survey * Minor refactor * Users answer surveys * Fix minor errors * Rubocop * Add model validations * Fix minor things * Fix hound complains * Fix more complains * Fix broken specs * Add some feedback * Add some permissions * Add missing translation * Fix rubocop issues * Add tests to the CI * Fix broken test suite * Normalize locales * Survey questions can be sorted using drag and drop (#1373) * Add basic drag and drop features * Refactor JS and minor adjustments * Add missing documentation * Minor label adjustments * Fix rubocop complains * Add missing index * Add missing feature test * Fix rubocop issues * Fix lint errors * Fix broken specs * Admin can mark question as mandatory * Restore missing PRs in feature/surveys (#1421) * Add custom styles * Change from toc to tos * Fix broken tests * Fix typo * Fix spec * Fix rubocop issues * Add Surveys engine MVP (#1364) * Add engine skeleton * Add feature test * An admin can update a survey without questions * Admin can add n questions to a survey * Admin can edit survey questions * An admin can remove questions from surveys * Admin can publish a survey * Minor refactor * Users answer surveys * Fix minor errors * Rubocop * Add model validations * Fix minor things * Fix hound complains * Fix more complains * Fix broken specs * Add some feedback * Add some permissions * Add missing translation * Fix rubocop issues * Add tests to the CI * Fix broken test suite * Normalize locales * Admin can mark question as mandatory (#1386) * Admin can mark question as mandatory * Users must respond mandatory questions * Fix problems with poltergeist * Fix rubocop complains * Fix i18n-issues * Add feedback * Fix rubocop complains * Huge refactor templates * Fix rubocop issues * Admins can select question type * Factor out auto label position code * Moar refactor * Huge JS refactor * Add dynamic answer options for a question * Admin survey form working with dynamic answer options * Single and multiple options working * Fixed rubocop issues * Fix i18n problems * Ignore unused i18n * Add ignore unused * Add answer option default value * Fix rectify problem * Fix minor issues * Fix a few bad merges * Fix broken specs * Add survey exports (#1417) * Add user answers serializer * Finish export and serializer * Add admin feature specs * Fix rubocop issues * Add allow_answers step setting (#1430) * Admin cannot modify questions if already answered * Add step setting to allow/disallow answers * Fix rubocop issues * Replace answered? with questions_editable? * Use available_locales instead of Decidim locales
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
🎩 What? Why?
I mess up with git and lost #1398 #1410 from the feature/surveys branch.
📌 Related Issues
📋 Subtasks
None
📷 Screenshots (optional)
None
👻 GIF