consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,635 Commits 1 Branch 0 Tags
72c6b05c646f49d56341d40b7ed2c931c1f4059c
Commit Graph

13635 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Herrero
7b4b4b716c Use double quotes in app/views/admin/legislation 2019-03-19 12:16:50 +01:00
Julian Herrero
5bfc9add78 Use double quotes in app/views/admin/budget 2019-03-19 12:16:50 +01:00
Julian Nicolas Herrero
4d6ddd2bb3 Merge pull request #3362 from consul/double_quotes_for_models 
Change single quotes to double quotes for models
 2019-03-19 12:14:31 +01:00
Julian Nicolas Herrero
af55366e57 Merge pull request #3360 from consul/double_quotes_for_controllers 
Change single quotes to double quotes for controllers
 2019-03-19 12:13:07 +01:00
Julian Nicolas Herrero
1c71e01646 Merge pull request #3341 from consul/improvement_for_options_display_results_polls 
Improvements about displaying results for voted polls
 2019-03-18 10:51:03 +01:00
Julian Nicolas Herrero
542c744a6a Merge pull request #3367 from consul/keep_images_uploaded_with_ckeditor 
Keep images uploaded with CKEditor when deploying
 2019-03-18 10:47:59 +01:00
Julian Herrero
6d281affa5 Use double quotes 2019-03-15 10:29:07 +01:00
Julian Herrero
002e16ce30 Use double quotes in lib/ 2019-03-15 10:29:07 +01:00
Julian Herrero
c9cdc72537 Use double quotes in config/ 2019-03-15 10:29:07 +01:00
Julian Herrero
8510624692 Use double quotes in config/routes 2019-03-15 10:29:07 +01:00
Julian Herrero
a8d8d2cdf9 Use double quotes in config/initializers 2019-03-15 10:29:03 +01:00
Julian Herrero
9f9b1ed100 Assign officer assignment when creating voter from booth 
If `officer_assigment' is not set the model cannot be validated,
because it cannot be blank.
 2019-03-15 09:58:16 +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
18bd2c7de8 Refactor (improve readability) 2019-03-15 09:55:12 +01:00
Julian Herrero
92979b84b5 Set correct origin for booth poll votes 2019-03-15 09:55:12 +01:00
Julian Herrero
9f21d9c64e Use double quotes in app/mailers 2019-03-15 09:27:01 +01:00
Julian Herrero
b460c024f3 Use double quotes in app/helpers 2019-03-15 09:26:49 +01:00
Julian Herrero
d9eaea4ea0 Use double quotes in app/assets 2019-03-15 09:26:00 +01:00
Julian Nicolas Herrero
6012638597 Merge pull request #3353 from consul/default_custom_pages 
[Backport] Default site customization pages
 2019-03-14 18:36:38 +01:00
Julian Herrero
1e04643576 Adjust spec after changing welcome pages 
Welcome pages no longer have classes or `span' tags.
They still have the 4 `li' tags, so we check for them.
 2019-03-14 18:35:51 +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
Julian Herrero
a0b8d076b7 Remove extra space 2019-03-14 18:34:55 +01:00
Julian Herrero
3ba961a2d7 Use double quotes in models 2019-03-14 17:25:43 +01:00
Julian Herrero
63182569f4 Keep images uploaded with CKEditor when deploying 
Images uploaded with CKEditor go to a folder that was not linked, so
every new deploy with capistrano the reference to those images was
lost.

By linking the directory the references to the images remain after a
new deploy.
 2019-03-14 15:57:26 +01:00
Alberto
f99a92a9ff Merge pull request #3366 from consul/a11y-fixes 
[Backport] Fix accessibility and HTML warnings
 2019-03-14 14:08:00 +01:00
decabeza
88cae1424e Add missing mobile social share message 2019-03-14 11:32:14 +01:00
decabeza
2d166cdeca Replace spaces to %20 on whatsapp share url 
This avoid have an invalid href with spaces.
 2019-03-14 11:31:40 +01:00
decabeza
e2e29cd9bc Replace summary to title on proposals social share message 2019-03-14 11:31:37 +01:00
decabeza
be8f2dca88 Remove unnecessary anchor link for finished budgets 2019-03-14 11:31:33 +01:00
decabeza
df68822111 Improve color contrast on leaflet map 2019-03-14 11:31:28 +01:00
decabeza
f7e327af09 Change label for search text 
Label wraps input field to prevent error on missing label (hidden by CSS).
 2019-03-14 11:31:21 +01:00
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