consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
18,723 Commits 1 Branch 0 Tags
68285aae06c6b4fb1a4cb15b4534a3af4ae6fcc3
Commit Graph

895 Commits

Author SHA1 Message Date
rgarcia
1077a632cb permits parameters in urls 2019-04-16 17:28:07 +02:00
alejandro
4c5d58448e fixes deprecation warning for uniq 2019-04-16 17:28:07 +02:00
Javier Martín
3ccdf039e4 Merge pull request #3344 from consul/backport-budget_ballots 
Allow voting Budget Investments in booths
 2019-04-09 13:54:00 +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
decabeza
fcbb11b26e Hides question menu on budget poll and changes redirect when create 2019-04-03 22:23:32 +02:00
rgarcia
6fa7562181 Automatically create a budget poll if it does not exist 2019-04-03 22:23:22 +02:00
María Checa
acb0a6070e Hides budget polls in polls admin index 2019-04-03 22:20:10 +02:00
rgarcia
7dd314c699 Do not display polls associated to a budget in admin poll questions 
This section is used to select to which poll a question belongs to.

Budget polls are not meant to include questions that come from Citizen
Proposals or Government Questions, thus we do not display them
 2019-04-03 22:20:01 +02:00
decabeza
91be3cf775 Fix more hound warnings 2019-03-27 15:22:14 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +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
Julian Herrero
4df9a1a1b4 Move HTML settings to content blocks settings page 
- Rename html settings keys
- Show html settings next to content blocks page
- Hide html settings from configuration tab
 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
c0d2776e8d Refactor Admin settings tabs 
- Rename partial views for tabs.
- Extract tables settings to reuse across the tabs.
 2019-03-19 18:14:55 +01:00
Julian Herrero
d24376f6ad Use double quotes in controllers/ 2019-03-13 22:19:49 +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
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
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
8066b96fe3 Remove legacy banner images and banner styles settings 2019-02-25 14:59:38 +01:00
Julian Herrero
00bd7008bb Show all system emails in Admin section 2019-02-22 16:13:49 +01:00
Julian Herrero
df08e42c3b Use preferred format for array of strings 2019-02-21 15:18:34 +01:00
Alberto
f9476eaa6a Merge pull request #3323 from consul/ui-fixes 
[Backport] Fix UI details for a better UX and design
 2019-02-20 14:37:46 +01:00
Javier Martín
ea0bec3574 Merge pull request #3319 from consul/backport-image_attributes 
Reuse image attributes in legislation processes
 2019-02-20 13:46:40 +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
Javi Martín
af9a2179eb Reuse image attributes in legislation processes 
It wasn't originally added because at the time legislation processes
didn't have images.
 2019-02-19 19:57:27 +01:00
Julian Herrero
884274c4ad Add a description for open polls 2019-02-18 13:34:07 +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
Javier Martín
a0fb19f0b4 Merge branch 'master' into feature/3153 2019-02-15 16:25:50 +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 Herrero
922600252c Make budget headings translatable 2019-02-13 13:35:07 +01:00
Julian Herrero
1c35ec99c1 Make budget groups translatable 2019-02-13 12:30:37 +01:00
Julian Herrero
90d0a6e416 Make budget phases translatable 2019-02-13 11:44:56 +01:00
Julian Herrero
d76782f150 Make budgets translatable 2019-02-13 11:41:58 +01:00
Julian Herrero
5f4a369606 Deleting a booth shift with recounts or partial results. 
Show a flash message that it's not possible to delete booth shifts
when they have associated recounts or partial results. Before an
execption was raised.
 2019-02-12 18:59:51 +01:00
decabeza
33fabe18b8 Remove admin legislation processes past filter 2019-02-08 14:30:08 +01:00
decabeza
060a4c684f Remove legislation processes next filter 2019-02-08 14:29:43 +01:00
decabeza
bc1679550b Remove incoming polls filter 2019-02-08 14:28:19 +01:00
Alberto
282ae61139 Merge pull request #3252 from consul/custom-pages-cards 
Allow select column width for widget cards
 2019-02-05 17:37:46 +01:00
taitus
082cc41a1e Allow admin set published_proposal field 2019-02-02 17:45:55 +01:00
decabeza
dfd4f60e15 Order admin poll list by starts_at date 2019-01-31 18:49:24 +01:00
decabeza
64cbed838a Fix hound warnings 2019-01-31 17:23:45 +01:00
decabeza
e7fcf2ce35 Add select on cards form to select the number of columns 2019-01-31 17:06:01 +01:00
Julian Nicolas Herrero
81b65ec821 Merge pull request #3202 from consul/sort_legislation_processes_by_start_date 
Sort Legislation Processes by descending start date
 2019-01-29 17:30:02 +01:00
Alberto
41fe1e3922 Merge pull request #3152 from NahiaSolutions/add_image_to_legislation_processes 
Add image to legislation processes and banner colors
 2019-01-29 16:06:54 +01:00
Alberto
bd4826b25e Merge branch 'master' into add_cards_to_custom_pages 2019-01-28 14:49:39 +01:00
Alberto
c297595e49 Merge branch 'master' into add_image_to_legislation_processes 2019-01-28 14:49:19 +01:00
Julian Herrero
33d6f6c18d Sort Legislation Processes by descending start date 2019-01-22 18:51:22 +01:00