Commit Graph

991 Commits

Author SHA1 Message Date
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
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
d676018a23 remove condition on current poll officer helper 2017-09-01 20:52:43 +02:00
decabeza
dd6ad5294c improves show_admin_menu helper 2017-09-01 19:01:19 +02:00
decabeza
c68923c5a8 adds helper to prevent show empty admin menu 2017-09-01 18:31:03 +02:00
Senén Rodero Rodríguez
57930df535 Remove unused code 2017-08-25 19:14:15 +02:00
Senén Rodero Rodríguez
796e6f9ce1 Code adaptation to work with nested documents and plain documents. 2017-08-25 18:34:55 +02:00
Senén Rodero Rodríguez
b2a6189cf5 Views and helpers refactor 2017-08-25 18:34:54 +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
cc89907bff Add nested documents to proposal form. 2017-08-25 18:34:52 +02:00
Senén Rodero Rodríguez
e9c5f77368 Accept nested attributes for documents on proposals. Adapt documentable js file to allow many input files at the same page. 2017-08-25 18:34:51 +02:00
Senén Rodero Rodríguez
c438e510c0 Add rel attribute with nofollow value. 2017-08-25 18:34:51 +02:00
Senén Rodero Rodríguez
a709cd0479 Add accept HTML attribute to documents form file input. 2017-08-25 18:34:50 +02:00
Senén Rodero Rodríguez
92e8468e89 Use documentables helper method within specs and document model. 2017-08-25 18:34:50 +02:00
Senén Rodero Rodríguez
3a7c9d9f83 Add documentables helper 2017-08-25 18:34:49 +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
456429f08b adds shifts 2017-08-04 21:27:30 +02:00
taitus
6e2063310f Add empty recommended messages text. 2017-08-04 13:27:03 +02:00
BertoCQ
411fb96ec7 Merge pull request #1770 from consul/back-link
Back link
2017-08-04 01:54:12 +02:00
Senén Rodero Rodríguez
1dea11ca8b Add empty interests list message. 2017-08-03 14:03:19 +02:00
decabeza
a18d86e8a7 replaces html to content_tag on users helper 2017-08-03 10:14:45 +02:00
decabeza
b2b15d1fd7 improves deleted elements on user activity 2017-08-03 10:14:45 +02:00
taitus
52e3610876 Minimum required by consul core. Remove comments. Fix texts. Decrease size of methods. 2017-08-02 00:15:03 +02:00
taitus
11395e0b27 Remove old code. Add whitespaces. 2017-08-01 16:48:42 +02:00
taitus
c6a9ffc19c Remove recommended investments 2017-08-01 16:28:01 +02:00
taitus
b6d5be3df0 Rename dynamic display to carousel size 2017-08-01 16:28:01 +02:00
taitus
ee0a10855d Calculate carousel size. 2017-08-01 16:28:01 +02:00
taitus
fd8e2c1503 Allow to display images on carousel partial. 2017-08-01 16:28:01 +02:00
taitus
f8c6422b30 Testing links on carousel. Improve tests descripions 2017-08-01 16:28:01 +02:00
taitus
522c4e2cfc Regroup all carousels on 1 partial. Rename partial 2017-08-01 16:28:01 +02:00
taitus
ff6471982c Add recommended debates, proposals and investement to Home page. 2017-08-01 15:48:21 +02:00
decabeza
bd27767d06 fixes content_tag span on back_link_to helper 2017-07-27 00:50:55 +02:00
Bertocq
10da3dba58 Use content_tag to render span icon on back link helper 2017-07-26 19:13:46 +02:00