consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,576 Commits 1 Branch 0 Tags
739b88c05171237189fdbdadbd5614d0318ebd92
Commit Graph

3424 Commits

Author SHA1 Message Date
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 Nicolas Herrero
8156152e0f Merge pull request #3303 from consul/description_for_open_polls 
[Backport] Add a description for open polls
 2019-02-18 16:51:21 +01:00
Julian Nicolas Herrero
d821848add Merge pull request #3307 from consul/return_string_in_method_pluralize 
[Backport] Return a String in I18n method 'pluralize'
 2019-02-18 15:25:40 +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
366505f886 Return a String in I18n method 'pluralize' 
If a translation was missing returning a Fixnum was raising an
exception 'undefined method X for Fixnum'.
 2019-02-15 11:59:57 +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
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
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
7b8f8f0f74 Add spec helper to fill translatable ckeditor fields 2019-02-13 11:44:34 +01:00
Julian Herrero
60ce72f3a0 Make possible to check for more than one ckeditor in the same form. 
When more than one ckeditor field this line was raising the error:
"Ambiguous match, found 2 elements matching visible css"
 2019-02-13 11:42:27 +01:00
Julian Herrero
dbdbcd662a Remove extra check 
Sometimes when updating a resource you are not redirected to the same
resource, you are maybe redirected to the parent resource and the
translations can be different. This condition will be checked after
visiting the edit_path again.
 2019-02-13 11:42:18 +01:00
Julian Herrero
d76782f150 Make budgets translatable 2019-02-13 11:41:58 +01:00
Julian Herrero
2eb2839ab0 Reload path for sluggable models 
Sluggable models can update the slug when updating new translations,
so we make sure the path is correct before using it.
 2019-02-13 11:29:43 +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
decabeza
3471cbb979 Fix hound warnings 2019-02-12 17:19:26 +01:00
Marko Lovic
3c9953e9e0 Make content assertion order-independent 2019-02-12 17:16:46 +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
f9b18667e6 Merge pull request #3280 from consul/next-filters 
[Backport] Removes next/incoming filters
 2019-02-11 20:43:09 +01:00
decabeza
e8ad9f749e Fix hound warnings 2019-02-11 17:33:51 +01:00
decabeza
e7eade2b33 Add spec to legislatiorn processses with past filter 
This filter was removed from admin view but keep existing on front views.
 2019-02-11 17:28:18 +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
Julian Nicolas Herrero
f89948136c Merge pull request #3274 from consul/backport_send_newsletter_emails_in_order 
[Backport] Send newsletter emails in order
 2019-02-08 20:00:09 +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
2d2633e14b Update related specs 2019-02-08 11:56:49 +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 Herrero
fc69c21ebb Send newsletter emails in order 
The list of emails for sending newsletters will always be ordered by
user creation date, so it will be easier to debug and to know for
which users the email has been sent.
 2019-02-06 15:06:29 +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 Nicolas Herrero
75c0d98d47 Merge pull request #3251 from consul/mail_intercept 
Configurable email interceptor by environment
 2019-02-06 14:15:33 +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