consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,352 Commits 1 Branch 0 Tags
5fe56a62f16b475eed24dcb83e7ee431766a57cc
Commit Graph

14352 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
decabeza
cfe034d401 Show proposal question only if it is present 
This prevent render an empty <h4> tag.
 2019-03-14 11:31:12 +01:00
decabeza
5d62ab71ff Add missing tr tags on users views 2019-03-14 11:30:59 +01:00
Julian Herrero
d24376f6ad Use double quotes in controllers/ 2019-03-13 22:19:49 +01:00
Raimond Garcia
41ec9c94b0 Merge pull request #3358 from consul/security 
Bump Rails version to 4.2.11.1
 2019-03-13 22:09:49 +01:00
voodoorai2000
5d76d0cafa Bump Rails version to 4.2.11.1 
There are two[1] security vulnerabilities in Rails version 4.2.11.

Updating to version 4.2.11.1 fixes these issues.

[1] https://groups.google.com/forum/#!topic/rubyonrails-security/pFRKI96Sm8Q
https://groups.google.com/forum/#!topic/rubyonrails-security/GN7w9fFAQeI
 2019-03-13 21:21:09 +01:00
Alberto
3c313c9c52 Merge pull request #3334 from consul/admin-polish 
Improve UX on admin section
 2019-03-13 17:15:22 +01:00
decabeza
cfad56b872 Add rake to remove deprecated settings 2019-03-13 15:39:58 +01:00
decabeza
b31b65f246 Add link to proposal if question was created from a proposal 2019-03-13 15:35:31 +01:00
decabeza
a2eea842cb Improve i18n on admin 2019-03-13 15:34:50 +01:00
decabeza
000819e928 Move create question to admin poll questions 
Also move question actions to admin polls questions
 2019-03-13 15:33:14 +01:00
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
Raimond Garcia
087faa15e8 Merge pull request #3258 from Platoniq/dashboard-wrong-calculate-week 
Dashboard wrong calculate week
 2019-02-28 13:37:46 +01:00
Raimond Garcia
117b7c848d Merge pull request #3257 from Platoniq/dashboard-actions-attachments 
Dashboard actions attachments
 2019-02-28 13:33:38 +01:00
Raimond Garcia
273241a184 Merge pull request #3256 from Platoniq/dashboard-progress-page 
Dashboard progress page
 2019-02-28 13:31:37 +01:00
Raimond Garcia
d775d118cb Merge pull request #3255 from Platoniq/dashboard-admin-pending-tasks 
Dashboard admin pending tasks
 2019-02-28 13:30:37 +01:00
Raimond Garcia
2d04ecfb61 Merge pull request #3254 from Platoniq/dashboard-wrong-schema 
Dashboard wrong schema
 2019-02-28 13:29:03 +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