Commit Graph

4892 Commits

Author SHA1 Message Date
María Checa
56e10f9532 Merge pull request #2160 from consul/relationables
Related Content model and Relatable concern
2017-12-05 15:19:42 +01:00
Bertocq
7339a98b74 Create installation controller with consul details method, add route on routes.rb 2017-12-04 18:32:04 +01:00
Bertocq
05a6c35b65 Switch case statement for if 2017-12-04 15:48:09 +01:00
Bertocq
b327420e72 Force setseed value range from -1 o 1 2017-12-04 15:42:59 +01:00
Bertocq
6d8657ab5c Move css styles from custom file to correct admin.scss one 2017-11-30 11:45:51 +01:00
María Checa
f9e65b0f80 Merge pull request #2102 from wairbut-m2c/iagirre-admin-poll-stats
Iagirre admin poll stats
2017-11-29 20:07:53 +01:00
Bertocq
cd021aee4b Add relationed_contents helper function on Relationable concern with spec 2017-11-29 19:02:25 +01:00
Bertocq
0482eb4098 Add report_related_content helper funcion on Relationable concern with spec 2017-11-29 19:02:25 +01:00
Bertocq
e02f511b3a Add times_reported integer attribute to RelatedContent 2017-11-29 19:02:14 +01:00
Bertocq
04dfc98c3f Create RelatedContent model spec to check relationable destroy 2017-11-29 19:01:50 +01:00
Bertocq
03f0534b2f Add scenario to RelatedContent model spec to check opposite related content creation 2017-11-29 19:01:12 +01:00
Bertocq
13f5fa55ab Use Relationable concern on Debates, Proposals and Budget Investments 2017-11-29 19:01:12 +01:00
Bertocq
8f3769aa7d Create Relationable concern 2017-11-29 19:01:12 +01:00
Bertocq
a138cda364 Create RelatedContent model 2017-11-29 19:00:54 +01:00
BertoCQ
0df316be4c Merge pull request #2158 from consul/fix/random_seed_order
Prevent a division by zero bug on sort by random scope
2017-11-29 16:05:58 +01:00
Alberto García
effab2988b Merge pull request #1941 from periflo90/master
Issue #1901: Budget related entries in Management shouldn't appear if budgets are globally disabled
2017-11-29 12:11:21 +01:00
Bertocq
c5fa85e3f6 Prevent a division by zero from happening on sort by random investment scope 2017-11-29 11:40:10 +01:00
BertoCQ
e7226dfca1 Merge pull request #2153 from consul/social-meta-tags
Social meta tags
2017-11-29 10:54:05 +01:00
María Checa
3984d6a947 Merge pull request #2115 from wairbut-m2c/iagirre-heading-population-restriction-validation
Iagirre heading population restriction validation
2017-11-28 20:06:53 +01:00
Raimond Garcia
9e12d67f3f Merge pull request #2114 from wairbut-m2c/iagirre-booth-assignment-removal
Iagirre booth assignment removal
2017-11-28 19:59:20 +01:00
Raimond Garcia
778ddbee0f Merge pull request #2131 from wairbut-m2c/iagirre-budget-pagination-bug
Iagirre budget pagination bug
2017-11-27 16:49:27 +01:00
Bertocq
8bef6d81c8 Fix value for metatag, and use twitter_handle settings value 2017-11-27 13:23:47 +01:00
decabeza
fe987dd7e9 removes unnecessary blank spaces 🙈 2017-11-24 14:29:40 +01:00
decabeza
ccbd99f88b improves social media meta tags partial with settings 2017-11-24 14:13:45 +01:00
decabeza
7fcbd99311 adds social media meta tags to welcome index page 2017-11-24 14:13:19 +01:00
decabeza
69625b7d34 fixes url images on social meta tags partial 2017-11-24 10:58:16 +01:00
BertoCQ
104a26db35 Merge pull request #2110 from wairbut-m2c/aperez-remove-valuator-role
Add option to unassign Valuator role
2017-11-21 16:34:16 +01:00
Juanjo Bazán
21b2a11339 adds poll comments to API 2017-11-21 14:31:03 +01:00
BertoCQ
ae71f4960b Merge pull request #2068 from ortegacmanuel/add-investment-user-tags-admin-interface
Add investment user tags admin interface
2017-11-19 14:42:01 +01:00
Bertocq
b2c03192bb Fix kaminari path url helper function 2017-11-19 13:33:49 +01:00
Bertocq
b2e59272cc Use kaminari url path helper on kaminari partials 2017-11-18 10:44:52 +01:00
Bertocq
f4af87f8a1 Add kaminari url path helper function 2017-11-18 10:44:30 +01:00
Angel Perez
db86cc5216 Enable 'destroy' action for Valuator on controller 2017-11-17 13:12:26 -04:00
Angel Perez
4e086de493 Add 'Delete' button to Valuators index/search views 2017-11-17 13:12:26 -04:00
Bertocq
bb1e5e4608 Fixed output 2017-11-17 00:21:16 +01:00
Manuel Ortega
0a2dae8672 Fixed link back from moderation dashboard to root_path
Passing the organization name to the locale yml file
2017-11-15 19:23:03 +01:00
iagirre
87f6f14d48 Bigger random seed range. Tests added to check the randomness between browsers 2017-11-15 11:50:06 +01:00
iagirre
fbb02095bb Some fixes to new code to make the test pass 2017-11-15 09:02:19 +01:00
iagirre
f3527b1311 Test added to check the repetition of elements between pages when random order used. Scope variable initialized to 1 2017-11-15 09:01:35 +01:00
iagirre
7f0e447e0f One aproach to make the randomness work with kaminari 2017-11-15 08:56:31 +01:00
Bertocq
ceb6786b7c Style correction on method call without parenthesis 2017-11-13 02:35:17 +01:00
Bertocq
f45cfc108a Fix Style/AccessorMethodName rubocop issue 2017-11-13 02:34:00 +01:00
Bertocq
db54273dad Replace == 0 comparisions for .zero? 2017-11-13 02:27:38 +01:00
Bertocq
bfd1a75af7 Fix Lint/RequireParentheses rubocop issue 2017-11-13 02:24:37 +01:00
Bertocq
a34118dbb0 Fix Lint/ShadowingOuterLocalVariable rubocop issue 2017-11-13 02:23:49 +01:00
Bertocq
cd66ba5d54 Rubocop autocorrections 2017-11-13 02:22:00 +01:00
Raimond Garcia
0e5c8d6aaf Merge pull request #2100 from deivid-rodriguez/fix/direct_messages_max_per_day
Fix `direct_messages_max_per_day` set to nil
2017-11-09 19:14:29 +01:00
rgarcia
644ea9629f uses correct order for permitted params 2017-11-08 12:05:02 +01:00
rgarcia
f3831de31c fixes typo introduced while fixing conflicts 2017-11-08 11:56:49 +01:00
Raimond Garcia
ad37606129 Merge branch 'master' into legislation-processes-documents 2017-11-08 11:31:09 +01:00