consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,671 Commits 1 Branch 0 Tags
b463fc40b55173f76871aba2f814d16eba700b7b
Commit Graph

6270 Commits

Author SHA1 Message Date
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
Alberto
eacf740087 Merge pull request #3290 from consul/budget-heading-alert 
[Backport] Include heading names in "headings limit reached" alert
 2019-02-13 17:10:38 +01:00
Julian Herrero
a963a99c55 Use correct scope to sort headings by name 2019-02-13 13:35:09 +01:00
Julian Herrero
29a704bd60 Show headings in budgets landing page when translations are missing 2019-02-13 13:35:09 +01:00
Julian Herrero
1ba50c76c4 Use method from Globalizable module 
Since we have a method defined inside the Globalizable
module we don't need to create the same method in every model
 2019-02-13 13:35:09 +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
f38c4e3a0c Highlight budgets menu when editing budget phases 2019-02-13 11:44:46 +01:00
Julian Herrero
d76782f150 Make budgets translatable 2019-02-13 11:41:58 +01:00
Alberto
938d5eba43 Merge pull request #3191 from consul/ui-i18n-details 
Fix i18n and UI minor details
 2019-02-13 10:55:03 +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
6b62ba0e91 Show cached_votes_score on admin legislation proposals 2019-02-12 18:42:44 +01:00
decabeza
0ae1cdfc8c Replace total votes to cached_votes_score on legislation proposals 
This show votes_score as result of votes_up minus votes_down
 2019-02-12 18:42:41 +01:00
decabeza
4e4804e180 Replace total votes to cached_votes_score on debates 
This show votes_score as result of votes_up minus votes_down
 2019-02-12 18:42:35 +01:00
decabeza
73a0f999ad Add order to voted headings names 2019-02-12 17:19:36 +01:00
voodoorai2000
f4b8099703 Simplify sql query 2019-02-12 17:18:38 +01:00
Marko Lovic
264c4e747b Improve User#headings_supported_within_group performance 
Performs a single DB call instead of 3
 2019-02-12 17:16:49 +01:00
Marko Lovic
4a2fae5e90 Add headings to "headings limit reached" alert msg 2019-02-12 17:16:40 +01:00
Marko Lovic
e47cbe2a10 Extract "supported headings" logic to User method 
In preparation to use this method from views where
it doesn't make sense for it to be associated with
a specific investment.
 2019-02-12 17:16:29 +01:00
Alberto
e76f483850 Merge pull request #3281 from consul/scss-lint 
Replace sccs lint string quotes to double quotes
 2019-02-11 20:44:04 +01:00
Alberto
f9b18667e6 Merge pull request #3280 from consul/next-filters 
[Backport] Removes next/incoming filters
 2019-02-11 20:43:09 +01:00
decabeza
acc7cf65e3 Replace single quotes to double quotes on scss files 2019-02-11 17:42:58 +01:00
decabeza
6df471d082 Change layout on admin settings to prevent broken buttons 2019-02-11 15:41:52 +01:00
decabeza
bce8b8b0a3 Change locale switcher background color 2019-02-11 15:41:44 +01:00
decabeza
b4ecd07f1f Refactor social share messages 2019-02-11 15:41:35 +01:00
Julian Nicolas Herrero
5a50992773 Merge pull request #3275 from consul/legacy_legislation_cleanup 
LegacyLegislation migration cleanup
 2019-02-08 20:04:19 +01:00
Alberto
73ecdb13ea Merge pull request #3278 from consul/budget-alert 
[Backport] Do not display alert when supporting in a group with a single heading
 2019-02-08 15:36:33 +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
decabeza
dfe7126ca0 Synchronize color inputs 2019-02-08 12:32:13 +01:00
decabeza
e68f5c0b77 Use labels for type text inputs 2019-02-08 12:29:00 +01:00
decabeza
8b295b14a3 Improve legislation processes form colors layout and add help text 2019-02-08 12:19:41 +01:00
rgarcia
55fb14ac14 do not display alert when supporting for whole city 2019-02-07 16:55:24 +01:00
Julian Herrero
54e59a8a58 LegacyLegislation migration cleanup 
These legacy models are not used anymore.
 2019-02-06 17:07:38 +01:00
Julian Nicolas Herrero
9da2783814 Merge pull request #3272 from consul/backport_show_unfeasible_and_unselected_investments 
[Backport] Show unfeasible and unselected investments for finished budgets
 2019-02-06 14:44:43 +01:00
Alberto
14e73e9086 Merge pull request #3269 from consul/homepage-feeds 
[Backport] Change layout on homepage if feed debates and proposals are enabled
 2019-02-06 14:32:46 +01:00
Alberto
6a7fcde9a6 Merge pull request #3268 from consul/budget-polish 
[Backport] Budgets UI minor fixes
 2019-02-06 14:31:26 +01:00
Julian Herrero
c9522b424b Show unfeasible and unselected investments for finished budgets 
We were filtering by winners investments for finished budget without
having in consideration other filters.
We want the default filter to be `winners` for finished budgets.
 2019-02-06 13:50:50 +01:00
decabeza
eb169ca435 Add models tag spec with 160 chars 2019-02-05 17:41:00 +01:00
decabeza
4d71a70e1e Set tags max length to 160 2019-02-05 17:40:27 +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
decabeza
218c8e1ae7 Change layout on homepage if feed debates and proposals are enabled 2019-02-05 17:28:57 +01:00
decabeza
5c7cc5a20f Improve space for links on budget index 2019-02-05 17:16:10 +01:00
decabeza
a2161f3ace Hide voted group css class if current filter is unfeasible 2019-02-05 17:16:04 +01:00
decabeza
025bcedce9 Show project winner label only if budget is finished 2019-02-05 17:15:40 +01:00
decabeza
556a72347e Hide hover background color on budget index if there is no heading link 2019-02-05 17:15:35 +01:00