Commit Graph

8448 Commits

Author SHA1 Message Date
Raimond Garcia
22a8157165 Merge branch 'master' into aperez-email-specs-for-commentables 2017-12-07 13:05:25 +01:00
Raimond Garcia
9a6eb7f0b1 Merge pull request #2165 from ArturT/knapsack_pro
Knapsack Pro gem
2017-12-07 12:17:31 +01:00
decabeza
e9ad4b49fb improves styles for follow button 2017-12-07 11:12:46 +01:00
decabeza
04e9ef6230 fixes i18n for new topic form 2017-12-06 21:05:35 +01:00
decabeza
39def428b5 improves layout for items list with images 2017-12-06 21:00:34 +01:00
decabeza
1d6877b797 adds setting allow_images to specs 2017-12-06 20:59:34 +01:00
decabeza
cbaf1ae6c1 adds setting to allow images for proposals and investment projects 2017-12-06 20:44:43 +01:00
decabeza
83c23c35c4 changes title text for public interests list 2017-12-06 15:40:50 +01:00
decabeza
864c022b08 adds margin to maps on show views 2017-12-06 15:37:46 +01:00
decabeza
f92a7ade55 adds partial for related content 2017-12-06 13:22:19 +01:00
ArturT
79e684e68e Use latest version of knapsack_pro 0.53.0 2017-12-05 20:10:40 +01:00
ArturT
27f46c9239 Allow forked version of repo to run tests with knapsack_pro gem without
needed API key KNAPSACK_PRO_TEST_SUITE_TOKEN_RSPEC.

Based on:
https://github.com/KnapsackPro/knapsack_pro-ruby#how-to-make-knapsack_pr
o-works-for-forked-repositories-of-my-project
2017-12-05 20:10:40 +01:00
rgarcia
b1c785408c brings back knapsackpro binding 2017-12-05 20:10:40 +01:00
rgarcia
834bbf4be3 removes unnecessary binding 2017-12-05 20:10:40 +01:00
rgarcia
d238889dec dynamically allocate RSpec tests across CI nodes 2017-12-05 20:10:40 +01:00
rgarcia
e2d4fbd9ce knapsack_pro setup 2017-12-05 20:10:40 +01:00
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
eb28726c82 Prepare CHANGELOG for v0.11 release 2017-12-04 23:05:12 +01:00
BertoCQ
099a6b1e97 Merge pull request #2164 from consul/feature/consul_installation_details
Consul installation details
2017-12-04 22:21:30 +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
516081d109 Describe with a request spec the consul.json install details route 2017-12-04 18:17:10 +01:00
Bertocq
88d098242c Add missing public_stats feature flag on dev seeds 2017-12-04 18:03:35 +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
Bertocq
9e0d2c403a Update unreleased section of changelog 2017-11-29 23:21:52 +01:00
Bertocq
7a1ec54e35 Preparing next release 2017-11-29 23:21:52 +01:00
BertoCQ
5b014a6536 Merge pull request #2157 from consul/polls-translations
Updates spanish translation for polls
2017-11-29 21:12:21 +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
f0dca7147b Add basic RelatedContent model spec to check multiple models can be related 2017-11-29 19:01:04 +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
rgarcia
a7df59985b Updates spanish translation for polls 2017-11-28 21:07:48 +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
7a2fc7fbff Add links to version diffs on changelog 2017-11-27 16:22:14 +01:00
Bertocq
897f7da774 Add missing 0.10.0 release to Changelog 2017-11-27 16:00:20 +01:00
Bertocq
20ae7cd6cb Improve changelog using keepachangelog format 2017-11-27 15:58:38 +01:00
Bertocq
33f47e7a63 Increase social media meta tags spec 2017-11-27 13:28:37 +01:00