consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,377 Commits 1 Branch 0 Tags
10efcb20298d50804e72c1de529fd73ea85fac42
Commit Graph

9377 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angel Perez
10efcb2029 Change I18n strings for warning when dismissing recommendations 2018-07-15 21:28:59 -04:00
Angel Perez
e194240a0a Add rake task to enable recommendations for existing users 2018-07-15 21:28:59 -04:00
Angel Perez
31c16406c0 Move disable recommendations permissions to Abilities::Common model 2018-07-15 21:28:58 -04:00
Angel Perez
54853745f0 Fix typos for Settings locales (English) 2018-07-15 21:28:58 -04:00
Angel Perez
a143fa447b Ensure recommendations are only shown when enabled 2018-07-15 21:28:58 -04:00
Angel Perez
463c753880 Recommendations are automatically disabled if dismissed by user 2018-07-15 21:28:58 -04:00
Angel Perez
0b7967440f Recommendations for users are enabled by default 2018-07-15 21:28:58 -04:00
decabeza
137078054e Fixes padding bottom on recommended index 2018-07-15 21:28:58 -04:00
decabeza
8cbc709601 Fixes margin top on recommended index 2018-07-15 21:28:58 -04:00
Angel Perez
e32387ed5b Improve CSS styles for recommendations partial 2018-07-15 21:28:58 -04:00
Angel Perez
054bc1397b Wrap recommendations settings checkboxes with label helper to improve A11y 2018-07-15 21:28:58 -04:00
Angel Perez
0ac6033ff6 Refactor recommendations specs to improve DRYness 2018-07-15 21:28:57 -04:00
Angel Perez
251441e109 Users can now hide recommendations 2018-07-15 21:28:57 -04:00
Angel Perez
fefa225f8a Add new settings for dev seeds for Debates and Proposals recommendations 2018-07-15 21:28:57 -04:00
Angel Perez
4275069a1e Include tests for recommendations feature 2018-07-15 21:28:57 -04:00
Angel Perez
a58f6a2662 Enable 'Recommended proposals' setting for users 2018-07-15 21:28:57 -04:00
Angel Perez
522c206f6d Enable 'Recommended debates' setting for users 2018-07-15 21:28:57 -04:00
decabeza
bdb3f30e40 Adds recommendations on proposals index 2018-07-15 21:28:57 -04:00
decabeza
36a5ff39b8 Adds recommendations on debates index 2018-07-15 21:28:57 -04:00
decabeza
ecb0041b7f Adds recommended index partial and styles 2018-07-15 21:28:56 -04:00
Raimond Garcia
0695c2038c Merge pull request #2734 from javierv/2713-fix_flaky_update_votes_spec 
Fix flaky specs: Votes Debates and Voting comments Update
 2018-07-15 14:35:18 +02:00
rgarcia
225166a5eb Remove focus from specs 2018-07-15 13:58:32 +02:00
Javier Martín
32504b8840 Make Capybara check the page between votes. 
As pointed out in PR #2734:

"After clicking the first link, there's an AJAX request which replaces
the existing `.in-favor a` and `.against a` links with new elements. So
if Capybara tries to click the existing `.against a` link at the same
moment it's being replaced, clicking the link won't generate a new
request".

Making Capybara check the page for new content before clicking the
second link solves the problem, in the same way 4ddc869 solved the same
problem in the comments section.
 2018-07-13 22:58:12 +02:00
Angel Perez
4ddc869441 Mitigate recurrent flaky specs for voting comments 2018-07-13 22:42:41 +02:00
Alberto
38916deb0b Merge pull request #2765 from consul/budgets-polls-ui 
Polls UI
 2018-07-13 20:01:40 +02:00
Alberto
66020a8902 Merge pull request #2766 from consul/budget-winner-project 
Budgets investment show messages
 2018-07-13 19:39:46 +02:00
decabeza
230f1b1fde Removes unused i18n keys 2018-07-13 19:15:52 +02:00
decabeza
6738582029 Removes unused i18n keys 2018-07-13 19:15:13 +02:00
decabeza
bbaec57c8a Adds message in budget investment show if project is winner 2018-07-13 18:37:16 +02:00
decabeza
1116340f99 Removes participate in other polls button 2018-07-13 18:27:32 +02:00
Alberto
a10cade451 Merge pull request #2319 from wairbut-m2c/iagirre-admin-banner 
Improves admin banners section
 2018-07-13 18:01:54 +02:00
Angel Perez
15f9a52035 Correct typo on English locale for banners 2018-07-12 10:17:25 -04:00
Angel Perez
306b6d8967 Fix failing admin/banners scenario 2018-07-12 10:17:25 -04:00
iagirre
0d9da5398b Fix banners in user pages 
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
 2018-07-12 10:17:25 -04:00
iagirre
5ce08532cb Update PR with master 
Rebase master branch so that this PR can
be updated with the latest changes.
Conflicts has been solved. dev_seeds
has been also adapted to the new format
(it all separated to be easier to manage).
Some specs has been updated to work with
selenium-webkit.
 2018-07-12 10:17:25 -04:00
iagirre
82cb8d4c52 Changes suggested in PR: 
* Delete all things related to banner images and styles (in code)
* Add a new test to check that the banner is showing correctly
* Update the specs accordingly to match the changes

Update dev_seed to set a random background_color and a font_color for banners (and remove everything about image and style)
Add a rake task to migrate the banner style to backgroun_color and font_color (so that the banners have the same colors than before)
 2018-07-12 10:17:24 -04:00
iagirre
5d1b06a3cb New and fresh DB schema 2018-07-12 10:16:48 -04:00
iagirre
58caf167f6 Make color-pickers smaller 2018-07-12 10:16:47 -04:00
iagirre
bf69a7bba7 Specs added to test the change of background and font color with color-picker and text-field 2018-07-12 10:16:47 -04:00
iagirre
3690cae458 Apply banner style to the new banners 
Banner sections can be saved (one banner can appear in several sections)
If the hex color is changed in the textfield, the color of the color picker changes.
 2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner 
Add migrations to store the information in the database
 2018-07-12 10:16:47 -04:00
Raimond Garcia
3e4d095e6f Merge pull request #2719 from javierv/2718-fix_flaky_milestone_spec 
Fix flaky spec: Budget Investments Show milestones
 2018-07-12 16:07:48 +02:00
Raimond Garcia
046b620848 Merge pull request #2712 from javierv/2520_and_2521-fix_flaky_results_specs 
Fix flaky specs: Officing Results Add/Edit results
 2018-07-12 16:06:30 +02:00
Raimond Garcia
e370069804 Merge pull request #2708 from javierv/fix_suggestions_keyup 
Fix suggestions being requested with every keystroke
 2018-07-12 16:05:09 +02:00
Raimond Garcia
06689d9cc6 Merge pull request #2697 from javierv/2558-fix_flay_spec_supporting_proposals 
Fix flaky spec: Proposals Voting Voting proposals on behalf of someone in show view
 2018-07-12 16:04:41 +02:00
Raimond Garcia
a3a5971cbf Merge pull request #2696 from javierv/2573-fix_flaky_budgets_spec 
Fix flaky spec: Admin budgets Manage groups and headings Create group
 2018-07-12 16:04:06 +02:00
Raimond Garcia
eb13c83a95 Merge pull request #2695 from javierv/2446_and_2519-fix_flaky_emails_spec 
Fix flaky specs: Emails Budgets Selected/Unselected investment
 2018-07-12 16:02:28 +02:00
Raimond Garcia
00c7c0a5b5 Merge pull request #2758 from consul/sec-fix 
Update Sprockets to fix vulnerability
 2018-07-12 00:54:20 +02:00
Juanjo Bazán
17b139e141 updates sprockets 
address vulnerability in sprockets CVE-2018-3760.  https://groups.google.com/forum/#!topic/ruby-security-ann/2S9Pwz2i16k
 2018-07-11 19:03:33 +02:00
Alberto
c5c611837d Merge pull request #2732 from consul/legislation-help-gif 
Legislation help gif
 2018-07-11 17:44:12 +02:00