Commit Graph

5457 Commits

Author SHA1 Message Date
decabeza
9663582124 fixes color contrast on officials levels labels 2017-05-29 13:19:28 +02:00
Juanjo Bazán
7f703cdcb1 Merge pull request #1570 from bertocq/fix/missing_data-equalizer-watch
Fix Missing data-equalizer-watch attribute (and all failing JS tests with it)
2017-05-29 10:50:05 +02:00
Bertocq
41fb640f92 Add missing data-equalizer-watch attribute
Why:

* There is a data-equalizer attribute on the parent div, and a data-equalizer-watch on a sibiling div, and that breakes both the purpose of those values (Resize child elements of data-equalizer to have the same height. Ref: http://foundation.zurb.com/sites/docs/equalizer.html)

* That lack of attribute was breaking many specs consistently on localhost with phantomjs 2.1.1 on macos sierra (and ubuntu as reported by @amaia)

How:

* Just adding the missing 'data-equalizer-watch' attribute on the div child of the one using 'data-equalizer'
2017-05-29 09:58:37 +02:00
Bertocq
db68353937 Merge remote-tracking branch 'consul/master' 2017-05-29 01:43:47 +02:00
Juanjo Bazán
8196d07cd6 Merge pull request #1567 from bertocq/fix/officing_recount_spec_flaky_test
Use a random word on the Poll factory name attribute
2017-05-26 17:46:19 +02:00
Juanjo Bazán
667bb3b2d0 Merge pull request #1568 from consul/budgets-message
Budgets message
2017-05-26 17:45:53 +02:00
decabeza
75841a71be updates texts on specs 2017-05-26 17:28:04 +02:00
decabeza
0e581896c0 improves message when not enough money 2017-05-26 17:12:21 +02:00
decabeza
a49b206b42 adds help message to how change ballot 2017-05-26 14:55:27 +02:00
decabeza
e31a1ea39e fixes height of participation not allowed message 2017-05-26 14:40:25 +02:00
Bertocq
6cda0d52d5 Use a random word on the Poll factory name attribute to avoid flaky tests 2017-05-25 12:28:53 +02:00
Juanjo Bazán
04c9aeedac Merge pull request #1564 from consul/admin-geozones
fixes admin geozones tables
2017-05-25 11:52:59 +02:00
decabeza
9dca1940ab fixes admin geozones tables 2017-05-25 11:12:09 +02:00
Juanjo Bazán
26b186a740 Merge pull request #1557 from bertocq/feature/newsletter_users_emails_zip
Allow admins to download Newsletter's users emails list in zip
2017-05-24 13:13:34 +02:00
Bertocq
4ab92731b6 Add expectations for newsletter users and non-newsletter users on email zip download scenario 2017-05-24 12:56:03 +02:00
Bertocq
9ba29fef8c Add feature scenario for Newsletter admin section, including email zip download 2017-05-24 12:23:05 +02:00
Juanjo Bazán
0209875516 fixes flaky specs in admin stats 2017-05-24 12:08:29 +02:00
Juanjo Bazán
cf8d973384 Merge pull request #1561 from bertocq/chore/update_dev_test_setup_doc
Update Dev Test Setup Doc
2017-05-24 10:27:44 +02:00
Juanjo Bazán
0aff980a73 Merge pull request #1562 from bertocq/fix/time_always_with_zone
Always use Time with zone
2017-05-24 10:25:35 +02:00
Bertocq
9e74249b02 Always use Time.current (aliases internally to Time.zone.now)
Some specs where breaking close to midnight because 30.years.ago uses zone.now and Time.now.utc.to_date doesn't.
Also this will make all codebase consistent in the way time is deal with
2017-05-24 07:54:57 +02:00
Bertocq
cafb6837d6 Fix trailing single quote on admin english translations 2017-05-23 23:29:12 +02:00
Bertocq
879f57396d Add missing spanish guide for dev test setup on Linux 2017-05-23 23:28:54 +02:00
Bertocq
d10e5ad01d Add missing Imagemagick brew install command on dev test setup for osx 2017-05-23 23:27:55 +02:00
Bertocq
6b89bdd17d Revert Gemfile.lock changes by mistake, also remove Gemfile gem version specification 2017-05-23 20:26:39 +02:00
Bertocq
d922d093ee Add specifiy version to multiple gems that didn't had one at the Gemfile 2017-05-23 19:52:14 +02:00
rgarcia
a05a20b2b6 creates zip file in tmp folder 2017-05-23 16:49:27 +02:00
Alberto Garcia Cabeza
04c33d1327 Improves styles for admin newsletters 2017-05-23 16:49:11 +02:00
rgarcia
9110fdad3a adds translations 2017-05-23 16:46:16 +02:00
rgarcia
80be0c6b65 refactors zip file creation 2017-05-23 16:46:10 +02:00
rgarcia
8f4eec2b8e zips all users with newsletter activated 2017-05-23 16:46:05 +02:00
rgarcia
2a7ff2270e sends zip file with test data 2017-05-23 16:45:34 +02:00
Bertocq
72facb8e65 Merge remote-tracking branch 'upstream/master' 2017-05-23 13:58:18 +02:00
Juanjo Bazán
bf8651febc Merge pull request #1555 from consul/budgets-results
Budget Results
2017-05-22 17:11:22 +02:00
decabeza
5e276175f1 updates texts on specs 2017-05-19 18:49:00 +02:00
decabeza
b42533062e Improves styles and i18n for budget results 2017-05-19 17:32:10 +02:00
Raimond Garcia
f8bac08e54 Merge pull request #1554 from consul/missing-management-investment-fields
Adds allowed fields in management investment creation
2017-05-19 14:21:55 +02:00
rgarcia
0b68f3c619 cleans up 2017-05-19 14:07:30 +02:00
rgarcia
48a22a0edc updates dev seeds with budget results 2017-05-19 14:04:46 +02:00
rgarcia
65eb2bb160 adds budget result specs 2017-05-19 14:04:46 +02:00
rgarcia
e7d92fda43 links results from budget's show 2017-05-19 14:04:46 +02:00
rgarcia
ed5a1cecbb adds budget results 2017-05-19 14:04:46 +02:00
Juanjo Bazán
6de0a45aa2 adds expectations for tag_list and organization_name fields 2017-05-19 12:38:28 +02:00
Juanjo Bazán
e922a11aa3 permits fields in management investment creation 2017-05-19 11:32:14 +02:00
Juanjo Bazán
f0d7acd087 Merge pull request #1550 from consul/budgets-unfeasible
Investments reclassified as unfeasible
2017-05-18 14:37:32 +02:00
rgarcia
a63ca9649e cleans up 2017-05-17 20:32:05 +02:00
Alberto
8167203e6e Merge pull request #1546 from consul/no-money-error
Fix no money error
2017-05-17 17:36:20 +02:00
Juanjo Bazán
cb889e620a Merge pull request #1548 from consul/seo-canonical
SEO canonical & nofollow
2017-05-17 17:33:39 +02:00
decabeza
edaf420f50 adds more disallow urls on robots.txt 2017-05-17 17:07:53 +02:00
decabeza
2b4a50c56b changes rel canonical if budget heading is not present 2017-05-17 16:58:50 +02:00
Raimond Garcia
fcd7ffcb9b Merge pull request #1549 from consul/unselected
Unselected scope should include investments with undecided feasibility
2017-05-17 16:03:05 +02:00