Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Poll comments #1961

Merged
merged 10 commits into from
Oct 10, 2017
Merged

Poll comments #1961

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
63cbe2f
20171003 - [WIP] Functionality and tests for polls comments
zamuro Oct 3, 2017
c3d7d47
20171004 - Refactored specs for polls comments
zamuro Oct 4, 2017
8277e3c
removed obsolete polls questions view
zamuro Oct 5, 2017
2b58875
Merge branch 'master' into mlucena-poll-comments
voodoorai2000 Oct 9, 2017
faa2f31
Adds comment's tab
voodoorai2000 Oct 10, 2017
23397ee
increases consistency by moving comment's view to poll's folder
voodoorai2000 Oct 10, 2017
d405d70
add translations
voodoorai2000 Oct 10, 2017
37cae41
adds specs
voodoorai2000 Oct 10, 2017
843048a
cleans up
voodoorai2000 Oct 10, 2017
ffdbdac
fixes specs
voodoorai2000 Oct 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add translations
  • Loading branch information
@voodoorai2000
voodoorai2000 committed Oct 10, 2017
commit d405d70f4c9e5627c37cb6c11650203081499b6b
2 changes: 2 additions & 0 deletions config/locales/en/general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,8 @@ en:
already_voted_in_web: "You have already participated in this poll. If you vote again it will be overwritten."
back: Back to voting
cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
comments_tab: Comments
login_to_comment: You must %{signin} or %{signup} to leave a comment.
signin: Sign in
signup: Sign up
cant_answer_verify_html: "You must %{verify_link} in order to answer."
Expand Down
2 changes: 2 additions & 0 deletions config/locales/es/general.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,8 @@ es:
already_voted_in_web: "Ya has participado en esta votación. Si vuelves a votar se sobreescribirá tu resultado anterior."
back: Volver a votaciones
cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."
comments_tab: Comentarios
login_to_comment: Necesitas %{signin} o %{signup} para comentar.
signin: iniciar sesión
signup: registrarte
cant_answer_verify_html: "Por favor %{verify_link} para poder responder."
Expand Down