Commit Graph

325 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
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
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
Raimond Garcia
ee3b3f2c85 Merge pull request #1809 from rockandror/documentable-ajax
[WIP] Documentable
2017-09-05 11:22:46 +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
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
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
BertoCQ
cf3dbc8149 Merge pull request #1769 from rockandror/empty-user-interests
Add empty interests list message.
2017-07-26 18:31:14 +02:00
decabeza
0b235d69d4 adds consistency for back links 2017-07-26 18:18:30 +02:00
Senén Rodero Rodríguez
3370896ead Add empty interests list message. 2017-07-26 17:48:47 +02:00
Bertocq
7d406cae76 Rubocop autocorrections 2017-07-25 13:01:03 +02:00
BertoCQ
13871b823b Merge pull request #1750 from rockandror/followable-user-activity
User page: new following section
2017-07-24 13:10:09 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
c40294e931 Remove officing recount feature 2017-07-23 23:28:38 +02:00
Senén Rodero Rodríguez
b7bce2e699 Remove complex methods from follow model. Create instance method followed_by? on followable model concern. Some code improvements. 2017-07-19 21:50:37 +02:00
Senén Rodero Rodríguez
119a6b3397 Remove where clause from followable button partial and rename followable_button partial to follow_button. 2017-07-19 17:51:51 +02:00
Senén Rodero Rodríguez
c9a6630c94 Remove popup on follow buttons and remove uneeded code. 2017-07-19 17:51:45 +02:00
Senén Rodero Rodríguez
cba497b32e Create new followables helper to have some methods previously on follows helper. Rename entity to followable. 2017-07-19 17:50:46 +02:00
rgarcia
b7ef755b16 minor refactoring for follows 2017-07-19 13:52:38 +02:00
Senén Rodero Rodríguez
57c8887077 Add method to follows helper to get followable partial name and arguments automatically. 2017-07-18 19:35:47 +02:00
Senén Rodero Rodríguez
249641fe23 Simpler code to get followable object icon. 2017-07-18 19:16:48 +02:00
Senén Rodero Rodríguez
36f9836e68 Use inflector methods instead of manual replacements. 2017-07-18 19:12:24 +02:00
taitus
7e2e94d709 Add following tab to user public page. 2017-07-13 20:29:34 +02:00