Senén Rodero Rodríguez
e9c5f77368
Accept nested attributes for documents on proposals. Adapt documentable js file to allow many input files at the same page.
2017-08-25 18:34:51 +02:00
Bertocq
69f4e1c683
Fix all rubocop Metrics/LineLength issues (140+)
2017-07-10 13:22:49 +02:00
Eduardo Martinez Echevarria
8dd52110db
Use category scope instead of condition on kind on Tag
2017-06-23 17:34:55 +02:00
Raimond Garcia
05afaacf3d
Merge pull request #1635 from entantoencuanto/issue#1354-suggest_on_investments_creation
...
Issue#1354 suggest on investments creation
2017-06-12 13:09:09 +02:00
Eduardo Martinez Echevarria
fd1c61ae61
Add resource_relation to Polymorphic concern
...
This allows suggest action to send search to
a relation instead of directly the model. Doing
so, the suggested items can be previously filtered.
2017-06-11 13:19:12 +02:00
Bertocq
e14a5b2eaf
Avoid using Date.today, better to use Date.current that takes timezone into account
2017-06-11 10:41:06 +02:00
rgarcia
87dd15b7bf
includes search concern in commendable actions
2017-05-04 20:42:21 +02:00
rgarcia
37d8693049
extracts advanced search to controller concern
2017-05-04 04:23:53 +02:00
Juanjo Bazán
652aff4e19
adds validation for custom dates in advanced search
...
avoids error 500 on invalid dates
2017-03-27 12:18:45 +02:00
kikito
84418bd671
Fixes issue in has_orders concern
2016-12-25 22:58:21 +01:00
kikito
03ef20bfde
Merges orders_helper functionality inside has_orders concern
...
Both these objects where using/setting a variable called valid_orders.
As a results, some specs where becoming flacky
(features/budgets/investments_spec.rb, balloting phase). By putting
them together, there is no `valid_orders` variable any more (everything
is @valid_orders) and the flackyness is gone.
2016-12-24 14:42:46 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
Juanjo Bazán
11dbc05a80
removes archived proposals from index/search pages
2016-09-13 12:56:10 +02:00
rgarcia
3c55d66591
fixes conflicts with budget
2016-07-27 11:41:46 +02:00
Juanjo Bazán
dc7ee45766
uses before_action instead of before_filter
...
before_filter is deprecated
2016-07-18 14:50:28 +02:00
kikito
9f3b99f0a6
Allows blocks in has_orders concern
2016-06-03 18:30:47 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
kikito
dea1a28a69
purges simple_captcha
2016-04-27 16:07:47 +02:00
Juanjo Bazán
54c1c581f9
uses index_customization in debates_controller
2016-04-21 12:00:48 +02:00
MaiteHdezRivas
f771a61a50
Refactoring method on debates controller
2016-04-21 11:13:58 +02:00
Juanjo Bazán
63e8950d6c
adds scopes for feasible values to spending props
2016-03-29 13:36:40 +02:00
rgarcia
f82a590e1e
reverts debate links
2016-02-19 19:08:35 +01:00
palomahnhp
2ee90ac76e
share links to debate
2016-02-08 10:32:57 +01:00
rgarcia
e4a49f802e
removes duplication between debate and proposal suggestions
2016-02-03 19:57:37 +01:00
rgarcia
5b1b6de6cc
sorts suggested proposals by default order(relevance)
2016-02-03 16:12:02 +01:00
Raimond Garcia
f1672180a8
Merge pull request #860 from MaiteHdezRivas/suggest_before_creating
...
Suggest before creating
2016-02-01 18:41:21 +01:00
Maite
8f1431ec3f
corrections about coding style
2016-02-01 17:11:29 +01:00
rgarcia
48b5aba1c5
removes unused helper
2016-01-27 14:55:42 +01:00
rgarcia
5d4b6fae92
scopes tags by category or geozone
2016-01-27 14:15:12 +01:00
MaiteHdezRivas
5dd4633d6a
Merge branch 'suggest_before_creating'
...
Conflicts:
app/assets/javascripts/application.js
app/controllers/debates_controller.rb
app/controllers/proposals_controller.rb
config/locales/es.yml
config/routes.rb
db/schema.rb
spec/features/debates_spec.rb
spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
rgarcia
e7e5c531a0
moves tag_cloud logic to a model
2016-01-27 13:02:18 +01:00
MaiteHdezRivas
7406904c51
adding suggest with coffescript
2016-01-27 12:32:44 +01:00
rgarcia
21b9e31f11
uses geozones instead of district tags
2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a
filter by districts and categories
2016-01-25 22:28:17 +01:00
rgarcia
0505be08e8
fixes conflicts
2016-01-25 22:24:58 +01:00
Juanjo Bazán
9c6ab40623
fixes gendered translations
2016-01-21 17:09:32 +01:00
nachogomez
d16f1ccd08
merge with master two
2016-01-19 11:09:47 +01:00
Juanjo Bazán
393388de71
Merge pull request #830 from AjuntamentdeBarcelona/feature_flags
...
Feature flags
2016-01-18 15:19:09 +01:00
rgarcia
8d7984dcb3
uses case statement instead of eval
2016-01-18 15:02:18 +01:00
Josep Jaume Rey Peroy
2d45828cad
Feature-flag debates
2016-01-18 13:05:00 +01:00
Alberto Garcia Cabeza
8ef74f1e11
Merges master branch
2016-01-18 11:33:49 +01:00
rgarcia
44769d96f4
adds comprehensive specs for author type and date range searches
2016-01-16 21:45:59 +01:00
rgarcia
c68c2b9f1d
maintains search criteria
2016-01-13 19:25:49 +01:00
rgarcia
33cfd92b09
adds naming consistency
2016-01-13 19:25:48 +01:00
rgarcia
66b704b3b9
refactors filterable concern
2016-01-13 19:25:48 +01:00
rgarcia
d147cec929
moves filters to a concern
2016-01-13 19:25:48 +01:00
Ana
0993a6ec1a
Error corrected
2016-01-13 19:25:47 +01:00
Ana
d3f9920e28
Advanced search corrections
2016-01-13 19:25:47 +01:00
Ana
a7b70f50e2
Advanced search - author type finished
2016-01-13 19:25:46 +01:00
