Commit Graph

12754 Commits

Author SHA1 Message Date
decabeza
83e8d6035a Remove questions link on admin polls menu 2019-03-13 13:33:49 +01:00
decabeza
74958fab02 Always show create question button on admin proposal show 2019-03-13 13:28:12 +01:00
decabeza
e7dd63e264 Fix hound warnigns on seeds 2019-03-13 13:19:17 +01:00
decabeza
e520a51d57 Replace default feature proposals to nil 2019-03-13 13:18:53 +01:00
decabeza
528a4b6e8e Add default colours to admin banners 2019-03-13 13:17:42 +01:00
Alberto
1f9ebbc749 Merge pull request #3340 from consul/unfeasible-investment
[Backport] Show unfeasible budget investment messages only when valuation finished
2019-03-12 11:09:44 +01:00
Javier Martín
f9e4c86871 Merge pull request #3342 from consul/backport-cumulative_totals
Add cumulative totals to admin poll recounts list
2019-03-07 19:01:22 +01:00
Javi Martín
db6229e38e Add specs for cumulative recounts totals 2019-03-07 02:09:17 +01:00
Juanjo Bazán
26d1024cfc Add cumulative totals to admin poll recounts list
This commit backports commit AyuntamientoMadrid@90638672 and the changes
that code has been through:

* AyuntamientoMadrid@03371a71 removed daily recounts in the controller
* AyuntamientoMadrid@fe3492a7 removed daily recounts in the view
* AyuntamientoMadrid@aa59d995 replaced FinalRecount with TotalResult
* AyuntamientoMadrid@c40e8d79 replaced TotalResult with Recount
2019-03-07 02:09:17 +01:00
Javier Martín
b96e2d4510 Merge pull request #3343 from consul/backport-budget_poll_menu
Display 'Validate document' menu item only when applicable
2019-03-06 19:12:35 +01:00
rgarcia
151239924b Display 'validate document' menu item only when applicable
We are trying to avoid Officers from forgetting to click the “Confirm
vote” button, which is necessary to keep track of who has voted a Poll

To do that, we are not displaying the menu item to go back to the next
person that wants to vote, until the Officer clicks the “Confirm Vote”
button or the “The user has decided not to vote” button

Note: Due to mobile version we have duplicate ids, so using classes for
the menu items to hide them without errors

Note2: We are only hidding the menu item, if there are votable polls,
otherwise the “Confirm vote” button does not appear, and there is no
way of going back to help the next person that wants to vote
2019-03-06 18:33:07 +01:00
rgarcia
8125d470de Add methods to obtain polls votable by a user 2019-03-06 17:42:46 +01:00
decabeza
05e4c344f2 Improve feed image styles and move image to right 2019-03-06 13:08:35 +01:00
decabeza
0e1bf2188c Remove unused verification offices url setting 2019-03-06 13:08:35 +01:00
decabeza
4641314bda Reorder admin menu 2019-03-06 13:08:35 +01:00
decabeza
c553f373a1 Update i18n for admin custom categories description 2019-03-06 13:08:35 +01:00
Javier Martín
d80d270e69 Merge pull request #3339 from consul/backport-coffeescript_quotes
Use double quotes in CoffeeScript files
2019-03-06 12:36:39 +01:00
Javi Martín
b27855c1cf Use double quotes in CoffeeScript files
As we do in the rest of the application.

Note we cannot add a rule enforcing double quotes because CoffeeScript
Lint does not have such rule.
2019-03-06 11:41:21 +01:00
Javi Martín
9e80c75032 Use string interpolation in CoffeeScript
We use it in Ruby, and it will make it easier to change all quotes to
double quotes in CoffeeScript files.
2019-03-06 11:41:21 +01:00
Javier Martín
cbc6ce44de Merge pull request #3338 from consul/backport-coffeelint
Add CoffeeLint rules
2019-03-06 11:40:17 +01:00
Julian Nicolas Herrero
2f84d17cc9 Merge pull request #3155 from jaflutz/2824-options-display-results-polls
Enable options to show stats and results with any type of voter
2019-03-06 11:14:54 +01:00
decabeza
55a2bcb559 Show unfeasible budget investment messages only when valuation finished 2019-03-06 10:46:03 +01:00
Javi Martín
a6a6d50ac1 Remove trailing whitespaces 2019-03-05 21:50:13 +01:00
Javi Martín
5d30ea8835 Fix spacing after comma 2019-03-05 21:50:13 +01:00
Javi Martín
9deed3f39d Fix inconsistent indenation in CoffeeScript files
We always use two spaces as indentation.
2019-03-05 21:50:13 +01:00
Javi Martín
a03c68c1e5 Remove trailing newlines in CoffeeScript files 2019-03-05 21:49:32 +01:00
Javi Martín
af9dce1dcf Remove trailing semicolons in CoffeeScript files 2019-03-05 21:38:36 +01:00
Javi Martín
d963657e41 Use spaces around curly braces in CoffeeScript
Just like we do in Ruby.
2019-03-05 21:38:36 +01:00
Javi Martín
a0976d8bfd Enable CoffeeScript Lint in Hound
We already had a CoffeeScript Lint configuration file, but we weren't
using it. We're replacing it with a more basic one.
2019-03-05 21:38:36 +01:00
Alberto
cce852d303 Merge pull request #3337 from consul/generalize-i18n
Generalize i18n texts
2019-03-05 18:58:31 +01:00
decabeza
4a532bf807 Use activerecord translations on admin legislation processes 2019-03-05 17:43:39 +01:00
decabeza
c9d0411d47 Generalize some i18n texts 2019-03-05 17:42:30 +01:00
Julian Nicolas Herrero
c6fead6a72 Merge pull request #3331 from consul/release_0.19
Release 0.19
2019-02-28 14:32:15 +01:00
Julian Herrero
3eac5d25ab Update changelog for release 0.19 2019-02-28 11:07:49 +01:00
Alberto
098f4b6c5f Merge pull request #3328 from consul/admin-settings
Improve Admin settings section
2019-02-27 10:49:54 +01:00
Javier Martín
86a1f5e0ce Merge pull request #3330 from consul/backport-fix_valuation_tags
Fix valuation tags being overwritten
2019-02-26 21:42:58 +01:00
Alberto
6d763df5cb Merge pull request #3329 from consul/admin-ui
[Backport] Improve UX on admin section
2019-02-26 19:13:01 +01:00
Julian Nicolas Herrero
09d4c54c40 Merge pull request #3326 from consul/admin_system_emails
[Backport] Show all system emails in Admin section
2019-02-26 15:18:42 +01:00
Javi Martín
c5c56ad969 Use a virtual attribute to get valuation tags
It was strange to set the valuation tags using `valuation_tag_list=` but
then accessing the valuation tags using `tag_list_on(:valuation)`.
2019-02-26 14:16:10 +01:00
Javi Martín
4980819528 Fix valuation tags being overwritten
When params[:budget_investment][:valuation_tag_list] was not present,
which is the case when updating an investment using the "mark as visible
to valuators" checkbox, we were removing all valuation tags.

Using a virtual attribute to assign the tags only if the parameter is
present simplifies the code in the controller and avoids the issue.
2019-02-26 14:16:10 +01:00
Javier Martín
9fd3c4fb1c Merge pull request #3321 from consul/backport-fix_random_order
Fix random proposals order in the same session
2019-02-26 14:09:24 +01:00
decabeza
abdeafc2dd Fix hound warnings on dev_seeds 2019-02-25 15:34:15 +01:00
decabeza
8066b96fe3 Remove legacy banner images and banner styles settings 2019-02-25 14:59:38 +01:00
decabeza
6fd13c1701 Add missing settings to dev seeds 2019-02-25 14:59:03 +01:00
decabeza
840348a839 Replace legislation processes text to collaborative legislation 2019-02-25 14:22:29 +01:00
decabeza
0b61fd7827 Reorder admin menu links 2019-02-25 14:15:47 +01:00
decabeza
9bad103166 Remove budget name link on admin budgets index 2019-02-25 14:10:28 +01:00
decabeza
51d74ed7ab Replace poll name link in admin polls booth assignments 2019-02-25 14:10:25 +01:00
Julian Herrero
00bd7008bb Show all system emails in Admin section 2019-02-22 16:13:49 +01:00
Julian Herrero
bca283c35d Use double quotes to be consistent with the rest of the file 2019-02-21 15:18:54 +01:00