Commit Graph

1026 Commits

Author SHA1 Message Date
Bertocq
614ff79ba1 WIP 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
7c998e541e Use not deprecated method to check if a field contains errors. 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
3e976b4f4b Use helper argument intead of instance variable. 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
45d907219a Fix unused translations warning. 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
cf9a7a21cc Add method to investments helper to calculate absolute url for investments images. Use it in social share widget. 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
79ed66ec4c Rename investment helper method 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c914c772c0 Add budget investment image dimmensions validator. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
1327b7276d Create investments helper. Fix indentation error and some specs names and structure. 2017-09-26 13:53:42 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
BertoCQ
aafd82542e Merge pull request #1894 from consul/chore/rubocop
🤖  Rubocop fixes and config
2017-09-25 19:12:06 +02:00
María Checa
2629837306 Fixed admin menu active states 2017-09-22 17:25:33 +02:00
María Checa
02fa3a83b5 Custom tags for Legislation Process available
Custom tags for Legislation Processes, editable in the admin section.
2017-09-22 17:16:04 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
decabeza
c400c83fa2 removes unnecessary methods on topics helper 2017-09-21 17:41:35 +02:00
María Checa
6c1c71fcc9 Minor fixes
Fixed subnavigation active links and button to create new proposal.
2017-09-21 16:18:08 +02:00
BertoCQ
d58d71b98d Merge pull request #1898 from consul/clean-css
Clean CSS
2017-09-21 10:24:03 +02:00
BertoCQ
34568567a3 Merge pull request #1885 from consul/chore/remove_final_recounts
Remove Poll Final Recounts, replace with Total Results
2017-09-20 23:00:03 +02:00
decabeza
b43e464292 renames js class 2017-09-20 19:27:11 +02:00
Bertocq
12658e33a9 Use %w string array syntax to comply with the 140 char line limit 2017-09-20 16:07:19 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
BertoCQ
8cbdc5a6fd Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
2017-09-19 18:52:44 +02:00
decabeza
42749b0389 avoids use class variables on helper 2017-09-19 17:30:40 +02:00
decabeza
fc3eac7e8e refactors proposal helper and use correctly on proposal show view 2017-09-19 17:30:40 +02:00
decabeza
adc71faf1c moves author actions to sidebar on proposal show 2017-09-19 17:30:40 +02:00
Bertocq
c5671ed462 Use correct Predicate name on function 2017-09-19 17:30:40 +02:00
Bertocq
6082147571 Use snake_case for method names 2017-09-19 17:30:40 +02:00
BertoCQ
8c943c5c68 Merge pull request #1876 from consul/chore/rubocop_fixes
Manual 🤖  rubocop fixes
2017-09-19 11:22:18 +02:00
Bertocq
1c1bb7bf38 Remove no longer used functions 2017-09-19 01:12:24 +02:00
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
decabeza
4ce06fac4e avoids use class variables on helper 2017-09-18 17:52:36 +02:00
decabeza
1c6a873b6d refactors proposal helper and use correctly on proposal show view 2017-09-18 17:31:37 +02:00
decabeza
2b3cbac5bc moves author actions to sidebar on proposal show 2017-09-18 14:21:38 +02:00
Bertocq
20aca263d7 Use correct Predicate name on function 2017-09-15 14:06:20 +02:00
Bertocq
a3428ee589 Use snake_case for method names 2017-09-15 14:06:17 +02:00
iagirre
d629aef3b9 When "Profiles" submenus are selected, the "Site custom" menu doesn't open. Moreover, when "Site custom" submenus are selected, the menu remains opened. 2017-09-15 12:33:31 +02:00
BertoCQ
87c99018e7 Merge branch 'master' into user-recomendations 2017-09-14 23:45:56 +02:00
Bertocq
e4e78c8f16 Rubocop autocorrections 2017-09-14 15:08:35 +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
rgarcia
0ad24c1080 highlights correct item in admin menu 2017-09-08 22:00:45 +02:00
taitus
c5cb463a2e Refactor helpers. 2017-09-06 13:47:29 +02:00
taitus
b4a6f664bb Remove image by default on carousel. Remove duplicate code. Add background when user recomendations is actived 2017-09-05 19:11:32 +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
d8e9aad331 Fix community access text. 2017-09-05 12:55:12 +02:00
taitus
62003b3000 Add back link on community show. Add styles on login to create topic. 2017-09-05 12:55:12 +02:00
taitus
8d0ba0bf5e Display tag author only proposal or budget investment author 2017-09-05 12:55:12 +02:00
taitus
ec309de273 Add partial with participants on community show page. 2017-09-05 12:54:32 +02:00
taitus
895c942a39 Add community to investments 2017-09-05 12:52:45 +02:00