Bertocq
851d397395
Replace FinalResult with TotalResult at admin Poll Recounts page
2017-09-19 00:54:46 +02:00
Bertocq
f27fcc7f99
Replace FinalResult with TotalResult at admin BoothAssignment show
2017-09-19 00:45:13 +02:00
Bertocq
97fe464232
Use datetime always with zone
2017-09-15 14:06:29 +02:00
BertoCQ
87eeefff41
Merge pull request #1867 from consul/chore/rubocop_autocorrections
...
🤖 Rubocop autocorrections
2017-09-15 14:04:01 +02:00
BertoCQ
87c99018e7
Merge branch 'master' into user-recomendations
2017-09-14 23:45:56 +02:00
Angel Perez
0611e0f4ea
Validate presence of 'poll_id' attribute on Poll::Question model
...
Fixes #1831
On branch aperez-validate-poll-question-is-selected
Changes to be committed:
modified: app/models/poll/question.rb
modified: spec/models/poll/question_spec.rb
modified: spec/features/admin/poll/polls_spec.rb
2017-09-14 11:52:19 -04:00
Bertocq
e8d748a881
Add Poll Total recount to officing and admin
2017-09-14 15:33:58 +02:00
Bertocq
e4e78c8f16
Rubocop autocorrections
2017-09-14 15:08:35 +02:00
Bertocq
f7568a394f
Remove officing final recounts controller, spec and view
2017-09-14 13:39:21 +02:00
BertoCQ
e38f2908cb
Merge pull request #1854 from wairbut-m2c/aperez-valid-video-url
...
Allow only YouTube/Vimeo URLs on 'video_url' attribute
2017-09-13 19:19:09 +02:00
BertoCQ
440c448ae4
Merge pull request #1862 from wairbut-m2c/iagirre-comments-empty-html
...
Iagirre comments empty html
2017-09-13 19:16:25 +02:00
iagirre
2621d2694b
Added test for comments
2017-09-13 16:04:45 +02:00
Angel Perez
2181a65bc2
Allow only YouTube/Vimeo URLs on 'video_url' attribute
...
Fixes #1841
On branch aperez-valid-video-url
Changes to be committed:
modified: app/models/proposal.rb
modified: spec/factories.rb
modified: spec/models/proposal_spec.rb
Allow only YouTube/Vimeo URLs on 'video_url' attribute
Fixes #1841
On branch aperez-valid-video-url
Changes to be committed:
modified: app/helpers/embed_videos_helper.rb
modified: app/models/proposal.rb
modified: spec/features/management/proposals_spec.rb
modified: spec/features/proposals_spec.rb
modified: spec/features/tags/proposals_spec.rb
modified: spec/models/proposal_spec.rb
2017-09-13 08:35:59 -04:00
iagirre
1356ea217b
Erased extra empty HTML for comments without replies. Added .gitignore rules for Netbeans projects
...
Cambios para hacer commit:
modificado: .gitignore
modificado: app/assets/javascripts/comments.js.coffee
modificado: app/views/comments/_comment.html.erb
modificado: spec/features/comments/debates_spec.rb
2017-09-13 13:30:37 +02:00
BertoCQ
fa8b9a69a3
Merge branch 'master' into polls-persist-officer-data
2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3
Merge pull request #1835 from consul/1677-poll_questions_documents
...
Poll questions document and video
2017-09-11 00:08:31 +02:00
BertoCQ
dd02c83fa3
Merge branch 'master' into poll-shifts-search-officers
2017-09-11 00:07:12 +02:00
rgarcia
4d1f61a87e
adds specs
2017-09-08 22:00:50 +02:00
rgarcia
47564a91a0
persist a shift's officer data
2017-09-08 20:08:45 +02:00
rgarcia
b1abb9dbb3
adds specs
2017-09-07 22:39:03 +02:00
María Checa
fb5211f251
Fixed test
2017-09-07 17:51:55 +02:00
María Checa
27ac4c5815
Added poll questions documents and video specs
...
New tests to ensure video URL is shown in the admin preview. Also that the video URL and documents are correctly saved after creating a question.
2017-09-07 17:19:07 +02:00
taitus
748a54934c
Add missing specs on comments from topics
2017-09-06 15:01:39 +02:00
taitus
79d4a82bfa
Fix specs
2017-09-06 14:16:03 +02:00
taitus
9b6b57a24c
Remove all white spaces
2017-09-06 14:12:32 +02:00
taitus
64774b0d2d
Refactor topics controller. Add Common abilities. Add destroy action.
2017-09-06 13:30:12 +02:00
taitus
5ea16976f7
Refactor communities controller. Add missing specs on topics order.
2017-09-06 12:34:38 +02:00
taitus
ea4d46f786
Fix specs
2017-09-06 11:28:27 +02:00
Raimond Garcia
2519f232ab
Merge branch 'master' into user-recomendations
2017-09-05 17:15:42 +02:00
Raimond Garcia
6f9d48f0eb
Merge branch 'master' into community
2017-09-05 15:40:03 +02:00
Raimond Garcia
eb4528eaa0
Merge branch 'master' into poll-shifts
2017-09-05 14:45:31 +02:00
taitus
9c7cd7d864
Fix features communities spec
2017-09-05 12:55:12 +02:00
taitus
5d22558c2b
Fix specs
2017-09-05 12:54:32 +02:00
taitus
e1a7f9c58c
Add community to Global Settings
2017-09-05 12:54:32 +02:00
taitus
8f7356f7a4
Add missing spec. Improve readability on topics files
2017-09-05 12:54:32 +02:00
taitus
895c942a39
Add community to investments
2017-09-05 12:52:45 +02:00
taitus
4539c5fa00
Refactor and tests.
2017-09-05 12:52:14 +02:00
Alberto
c3b3a837a9
Merge branch 'master' into user-recomendations
2017-09-05 11:31:05 +02:00
Raimond Garcia
ee3b3f2c85
Merge pull request #1809 from rockandror/documentable-ajax
...
[WIP] Documentable
2017-09-05 11:22:46 +02:00
Alberto
3cc904311a
Merge branch 'master' into user-recomendations
2017-09-04 19:53:21 +02:00
decabeza
dd0452ece6
updates texts on specs
2017-09-01 13:18:56 +02:00
Senén Rodero Rodríguez
4081dded5f
Add nested documents to new budgetinvestments.
2017-08-25 18:34:53 +02:00
Senén Rodero Rodríguez
0db49fda4e
Fix translations error and refactor nested documentable shared example spec.
2017-08-25 18:34:52 +02:00
Senén Rodero Rodríguez
cc89907bff
Add nested documents to proposal form.
2017-08-25 18:34:52 +02:00
Senén Rodero Rodríguez
6b61cbe35c
Set maximum number of documents on proposal and budget investments. Show alert on documents tab when maximum reached. Hide upload button when maximum reached.
2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
462931845b
Fix back link on document new page.
2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
586776efd8
Add documentable to proposal model.
2017-08-25 17:27:37 +02:00
Senén Rodero Rodríguez
a2130689ed
Create documentable concern and add it to budget investment model. Create documents controller, documents helper, routes, translations and specs
2017-08-25 17:27:37 +02:00
rgarcia
9181610de9
removes obsolete code
2017-08-04 21:27:30 +02:00
rgarcia
0aba196ba2
adds specs for shifts
2017-08-04 21:27:30 +02:00
