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

952 Commits

Author SHA1 Message Date
decabeza
cb22e6cbfb Merge branch 'master' into proposal-dashboard 2019-04-23 17:12:47 +02:00
rgarcia
d8fdc10ed6 fixes activity specs 2019-04-16 17:28:07 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
lalo
237a03552f Move admin budget investments tabs filters to advanced filters component 2019-04-03 22:27:48 +02:00
lalo
0a5057a0a8 Add max support advanced filter for admin budget investments 2019-04-02 19:46:16 +02:00
decabeza
2af154d539 Merge branch 'master' into proposal-dashboard 2019-03-28 01:26:04 +01:00
decabeza
91be3cf775 Fix more hound warnings 2019-03-27 15:22:14 +01:00
decabeza
f47ec9d7dc Fix hound warnings 2019-03-26 18:21:19 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Javi Martín
d894d24bff Use double quotes in config/locales 2019-03-25 14:58:54 +01:00
Senén Rodero Rodríguez
9d9ad5003b Add given_order to related poll question answers forms 
Since given order is no longer being generated automatically we need
to add it to related forms and to strong parameters methods
 2019-03-21 14:51:17 +01:00
Javier Martín
0fd9570ea8 Merge pull request #3384 from consul/backport-simplify_poll_factories 
Simplify poll factories
 2019-03-20 14:32:47 +01:00
Julian Herrero
89d4ea5aa3 Remove homepage widget settings from configuration tab 
- Rename homepage widget settings keys
 2019-03-19 19:45:34 +01:00
Julian Herrero
c82b2a975a Add new settings tab for participation processes 
- Rename setting keys
- New tab por participation processes
- Hide these settings from features tab
 2019-03-19 19:45:32 +01:00
Julian Herrero
dbac4bc222 Change admin settings tab for maps 
- Rename map settings keys
- Add fields for latitude, longitude and zoom
- Add a callout message on how to enable map feature
 2019-03-19 18:14:57 +01:00
Julian Herrero
8ae80cd1a1 Cleanup (remove unnecessary code) 2019-03-19 15:11:50 +01:00
Javi Martín
d69adbccb7 Avoid creating extra poll records in tests 
The line:

create(:poll_voter, booth_assignment: booth_assignment_final_recounted)

Creates a new poll for the poll voter. Not only it wastes time by
creating new database records, but it doesn't make sense to have a poll
voter for a poll which isn't the same as its booth assignment's poll.
 2019-03-19 13:29:45 +01:00
Javi Martín
8118926ba7 Simplify tests creating poll voters 2019-03-19 13:29:43 +01:00
Julian Herrero
58f22915e9 Use double quotes 2019-03-15 09:57:09 +01:00
Julian Herrero
da04f6caa7 Add test for booth votes case 2019-03-15 09:55:12 +01:00
Julian Herrero
ddca825f9f Update spec after adding default pages 
The spec was assuming there was only 1 custom page created in the
DB. With this change the spec will pass no matter how many  custom
pages there are in the DB.
 2019-03-14 18:35:51 +01:00
Julian Herrero
87be6f302c Add default site customization pages 
From now on these static pages:

`/privacy'
`/conditions'
`/accesibility'
`/help/faq'
`/welcome'

have been moved to the DB and can be modified easily by any
administrator in `/admin/site_customization/pages'
 2019-03-14 18:35:51 +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
b31b65f246 Add link to proposal if question was created from a proposal 2019-03-13 15:35:31 +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
528a4b6e8e Add default colours to admin banners 2019-03-13 13:17:42 +01:00
Javi Martín
db6229e38e Add specs for cumulative recounts totals 2019-03-07 02:09: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
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
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
decabeza
840348a839 Replace legislation processes text to collaborative legislation 2019-02-25 14:22:29 +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
Javier Martín
a1c5dad4ff Merge pull request #3324 from consul/backport-sorting_icons 
Add sorting icons to sortable tables
 2019-02-20 17:56:49 +01:00
decabeza
26741d9560 Fix hound warnings 2019-02-20 13:56:58 +01:00
decabeza
32d4495a88 Replace created at date to start and end date on admin legislation processes 2019-02-20 13:32:22 +01:00
decabeza
0d834744fd Replace open to active filter on admin legislation processes index 
Now active filter show open processes and the next ones, processes with a start date greather than current date.
 2019-02-20 13:32:09 +01:00
decabeza
9e9eb1359b Add icon to sortable table 2019-02-20 13:07:08 +01:00
Javier Martín
7c61f621e2 Merge pull request #3314 from consul/backport-without_valuator 
Consider having valuator group as having valuator
 2019-02-19 18:59:15 +01:00
Julian Herrero
884274c4ad Add a description for open polls 2019-02-18 13:34:07 +01:00
Julian Nicolas Herrero
53530ba99b Merge pull request #3287 from consul/use_double_quotes_in_specs 
Change single quotes to double quotes in folder /spec
 2019-02-18 13:26:49 +01:00
Javi Martín
bd67fcb9cf Consider having valuator group as having valuator 
So under the tab "without valuator" we don't show investments assigned
to a valuator group, just as expected by administrators.

There was a conflict while applying this commit to the CONSUL repo. I've
decided to re-introduce the test which was deleted in commit dddf026a,
which hadn't been deleted in AyuntamientoMadrid@192f1182.
 2019-02-15 21:11:24 +01:00
Javier Martín
b330de01f6 Merge pull request #3148 from matisnape/budget_investments_sorting_columns 
Add sort links to admin tables
 2019-02-15 19:19:11 +01:00
Julian Herrero
31ac8b7f55 Change single quotes to double quotes 2019-02-15 11:40:39 +01:00
Julian Nicolas Herrero
4a12425987 Merge pull request #3296 from consul/make_budgets_translatable 
[Backport] Make budgets translatable
 2019-02-13 19:01:13 +01:00
Julian Nicolas Herrero
e8c77f58a6 Merge pull request #3292 from consul/backport_delete_officer_assignment_with_associated_data 
[Backport] Delete Booth Shifts with associated data
 2019-02-13 18:56:43 +01:00
Alberto
fad65b621a Merge pull request #3291 from consul/total-votes 
[Backport] Use votes score instead of total votes on debates and legislation proposals
 2019-02-13 17:15:39 +01:00