Commit Graph

15211 Commits

Author SHA1 Message Date
Javi Martín
a64a290392 Extract commentable_path to an initializer
By doing so and including it in ActionDispatch::Routing::UrlFor, we make
it available in controllers, helpers and specs, and so we can remove the
duplication we had there with methods dealing with the same problem.

Even if monkey-patching is ugly, using a different module and executing
ActionDispatch::Routing::UrlFor.send(:include, MyModule) wouldn't make
the method available in the controller.
2018-09-17 20:28:55 +02:00
Juan Salvador Pérez García
e8e01b184f Fixed issue accumulating supports 2018-09-17 19:49:33 +02:00
Juan Salvador Pérez García
a658536142 Fixed issue when filling holes in grouped supports query 2018-09-17 19:37:29 +02:00
dependabot[bot]
641421959e Bump savon from 2.11.2 to 2.12.0
Bumps [savon](https://github.com/savonrb/savon) from 2.11.2 to 2.12.0.
- [Release notes](https://github.com/savonrb/savon/releases)
- [Changelog](https://github.com/savonrb/savon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/savonrb/savon/compare/v2.11.2...v2.12.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-09-17 17:15:34 +00:00
Raimond Garcia
b49b3ade68 Merge pull request #2881 from consul/dependabot/bundler/autoprefixer-rails-9.1.4
Bump autoprefixer-rails from 8.2.0 to 9.1.4
2018-09-17 19:09:20 +02:00
Raimond Garcia
34589443e3 Merge pull request #2884 from consul/dependabot/bundler/capistrano-rails-1.4.0
Bump capistrano-rails from 1.3.1 to 1.4.0
2018-09-17 19:08:58 +02:00
Raimond Garcia
14edf4b603 Merge pull request #2892 from consul/dependabot/bundler/mdl-0.5.0
Bump mdl from 0.4.0 to 0.5.0
2018-09-17 19:08:22 +02:00
Raimond Garcia
5aa84c139e Merge pull request #2894 from consul/dependabot/bundler/unicorn-5.4.1
Bump unicorn from 5.4.0 to 5.4.1
2018-09-17 19:08:04 +02:00
Raimond Garcia
a160a9e694 Merge pull request #2895 from consul/dependabot/bundler/scss_lint-0.55.0
Bump scss_lint from 0.54.0 to 0.55.0
2018-09-17 19:07:39 +02:00
Raimond Garcia
cae210c155 Merge pull request #2887 from wairbut-m2c/backport/db_queries
[Backport] Replace `.all.each` with `.find_each` to reduce memory usage
2018-09-17 19:06:46 +02:00
Raimond Garcia
eb435930db Merge pull request #2888 from wairbut-m2c/backport/test-suite-maintenance
[Backport] Test suite maintenance
2018-09-17 19:06:07 +02:00
Raimond Garcia
0b7eb35b22 Merge pull request #2896 from javierm/backport-refactor-translatable-shared-code
[Backport] Refactor code shared by admin-translatable resources
2018-09-17 18:26:55 +02:00
Raimond Garcia
b6602348e2 Merge pull request #2852 from tiagozini/fix-issue-2848
Fix bug in facebook share link
2018-09-17 18:23:29 +02:00
Juan Salvador Pérez García
42d448248c Routes have been refactored
Dashboard routes have been refactored. Now instead of having resources
for dashboard and routes inside a dashboard namespace the proposal
routes contain a dashboar singleton containing everything related to it.
2018-09-17 15:44:45 +02:00
Juan Salvador Pérez García
6f1a866878 Dashboard graph shows achievents again
label has been moved to the bottom to improve its readability
2018-09-17 09:40:21 +02:00
Juan Salvador Pérez García
d6919155c8 Added comments regarding tests for dashboard graph
Added comment regarding tests for dashboard graph. This feature should
be migrated to Ecma6 and had its own tests once Consul reaches
compatibility with Rails 5.1.
2018-09-17 09:12:36 +02:00
Juan Salvador Pérez García
7c3213a55d Refactored complex scope
Complex scope has been refactored into an static method. Added tests to
validate this new method.
2018-09-17 09:11:51 +02:00
Juan Salvador Pérez García
e61eba4e97 locale key containing html has been renamed
locale key containing html has been renamed. Now it has the preffix:
_html.
2018-09-17 09:11:09 +02:00
Juan Salvador Pérez García
6412f95e56 Added comments
Added comment to clarify obscure method
2018-09-17 09:10:31 +02:00
Juan Salvador Pérez García
22907ad1fc Fixed failing specs 2018-09-17 09:10:12 +02:00
Raimond Garcia
12755b6446 Merge pull request #2900 from consul/smtp-configuration
Add placeholder configuration for SMTP
2018-09-14 18:13:41 +02:00
Juan Salvador Pérez García
091e1d492c Enhacements in navigation
Proposal menu will appear highlighted when the voting shown is related
to a proposal. The voting menu entry will appear disabled.
2018-09-14 16:52:30 +02:00
Juan Salvador Pérez García
2ca9a38915 Dashboard navigation enhancements
Dashboard links that bring the user outside the dashboard will be open
in a separate tab
2018-09-14 16:45:02 +02:00
Juan Salvador Pérez García
c763ca2f99 Fixed bug in x axis labels in dashboard
Dashboard progress graph was not showing all labels in x axis when there
were less than 12 samples.
2018-09-14 16:43:42 +02:00
Juan Salvador Pérez García
4d0359f334 Changed defaults for new proposed action/resource.
Previously, action as requesting some action from administrators by
default. Now this flag is false by default when a new proposed
action/resource is created.
2018-09-14 16:36:47 +02:00
Juan Salvador Pérez García
826ce8af25 Enhancements in proposal progress graph
x axis legend now show less labels in order to improve its readability.
2018-09-14 16:28:20 +02:00
Juan Salvador Pérez García
7143e10201 Graph enhancements
Y axis have received the following enhancement:

It won't show labels for each value in order to improve its readability.

Maximum value will be set according to the maximum number of supports
received for the current proposal.

In case no supports are received it will use the number of supports
required for a successful proposal.
2018-09-14 12:20:03 +02:00
Juan Salvador Pérez García
38472cb670 Fixed colours in the progress graphic
progress graph will be shown in blue
successful graph will be shown in orange
2018-09-14 11:54:57 +02:00
Juan Salvador Pérez García
0bd381aa5e Enhancements and bugfixing
FIxed issue in last commit: supports controller were not correctly
filling the holes without data.

Fixed duplication in supports and successful supports controller using a
concer.

Successfull supports controller will fill the holes without data in the
same way that supports controller does.
2018-09-14 11:30:59 +02:00
Juan Salvador Pérez García
3590657777 Enhancements on supports controller
Supports controller now fill the holes in the results: When there are no
supports collected for one interval it takes the accumulated value from the
previous one.

Data starts in the publication date.
2018-09-14 10:49:29 +02:00
Papaya Labs
357b3406ed Hide Featured section on Home Page if there are no cards 2018-09-13 15:33:24 -05:00
voodoorai2000
2892d0e1d5 Add placeholder configuration for SMTP 2018-09-13 20:38:42 +02:00
Juan Salvador Pérez García
f875ded0be Bugfixing and enhancements
* Fixed common ability: Retired draft proposal can't be published.
* Fixed proposal dashboard view: progress graph is not available for
draft proposals.
2018-09-13 18:22:59 +02:00
Javi Martín
f2bebca6be Bring back and fix deleted test
It was removed in 755be96 because some tags were allowed, but we can
just update it to check it doesn't remove those tags.
2018-09-12 12:35:28 +02:00
Javi Martín
9cfa07ff1d Remove unrelated schema changes 2018-09-12 12:35:28 +02:00
Javi Martín
f917f5eed9 Filter image tags everywhere except in custom pages
Allowing image tags everywhere makes us vulnerable to CSRF attacks.
2018-09-12 12:35:28 +02:00
Javi Martín
5faeefab2c Show the image button only if editing admin pages
That's the only place where we need to attach images so far.
2018-09-12 12:35:28 +02:00
Javi Martín
43e83889ff Simplify CKEditor authorization
We can use the `config.authorize_with` option, so we don't need to copy
the controller in order to load and authorize resource.

Besides, only administrators can upload images, so we don't need to
track the image's user id.
2018-09-12 12:35:28 +02:00
Javi Martín
7347874f4b Remove inaccurate comment
It was automatically added by `rails g ckeditor:install`.
2018-09-12 12:35:28 +02:00
Javi Martín
531750cf6f Restore commented lines
Not sure if they were supposed to be removed. For now I'll assume they
were commented accidentally.
2018-09-12 12:35:28 +02:00
Javi Martín
71ce7acc10 Restore deleted CKEditor config
Just so we can navigate throught git history faster:

* Introduced in 345e34d to avoid precompiling all CKEditor assets.
* Modified in 54c82a5 to avoid compiling assets during tests.
* Overwritten by `rails g ckeditor:install` in c0d6c0b.
2018-09-12 12:35:28 +02:00
Javi Martín
27155dd7d7 Fix typo 2018-09-12 12:35:28 +02:00
Javi Martín
9705360d98 Enable only a few headings in CKEditor
Allowing every format is way more than what we initially intended.

I've only added h2 and h3 because h1 is set somewhere else in the page
(like the title), and h4, h5 and h6 are usually not necessary.
2018-09-12 12:35:28 +02:00
Javi Martín
b6855b7140 Restore allowedContent line
We're not sure why it was removed, and we're using server-side
sanitizers to remove dangerous HTML.
2018-09-12 12:35:28 +02:00
Javi Martín
471061f475 Allow only admins to attach CKEditor images
Right now allowing regular users to attach images would make us
vulnerable to CSRF attacks.
2018-09-12 12:35:28 +02:00
Javi Martín
116bdebc96 Don't add CKEditor attachments to version control 2018-09-12 12:35:28 +02:00
Raúl Fuentes
bf0472fd58 Fix test
now the <a> tag is permited, also the list of allowed tags is in
the configuration of ckeditor4
2018-09-12 12:35:28 +02:00
Raúl Fuentes
d574657b77 Fixes for the review made by @javierm
this commit will be merged with the others when the chages
are accepted
2018-09-12 12:35:28 +02:00
Raúl Fuentes
88f0f14eab Modify the configuration of ckeditor 4
add links, headers and images
2018-09-12 12:35:28 +02:00
Raúl Fuentes
8e68f4bbd0 Update abilities for ckeditor4 images
Add the image controller to use the obsolete load_and_authorize_resource
and authorize_resource methods in the gem
2018-09-12 12:35:28 +02:00