Commit Graph

210 Commits

Author SHA1 Message Date
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
Ana
4d3e3f2e09 Advanced search - except author type 2016-01-13 19:25:46 +01:00
nachogomez
51d9d186af Add Thematic structure and Districts - Iss685 2016-01-08 13:49:23 +01:00
pardoam
b2686cc6d1 five_last_week 2015-12-02 14:48:41 +00:00
rgarcia
40ea3fcc58 displays relevance order in searches 2015-11-23 13:39:32 +01:00
kikito
60b3c65b05 Refactor comment tree calculation using a PORO 2015-10-30 17:00:32 +01:00
kikito
50fdd005a4 Implements comment sorting in proposals and debates 2015-10-28 18:40:32 +01:00
Juanjo Bazán
65ed1f45ab define method for extra customization 2015-10-22 11:53:19 +02:00
Juanjo Bazán
c65db493f3 Merge pull request #596 from AyuntamientoMadrid/refactors_moderate_actions
Refactors moderate actions
2015-10-16 13:33:43 +02:00
rgarcia
dc93ea6dba displays proposal created within management layout 2015-10-13 15:00:23 +02:00
rgarcia
3edc23abe5 refactors moderator actions 2015-10-11 13:57:19 +02:00
rgarcia
b4adca0559 refactors concern's polymorphic helpers 2015-10-11 13:40:31 +02:00
rgarcia
e1a2c0f523 changes commentable concern for commentable_actions concern 2015-09-29 15:56:55 +02:00
rgarcia
1360d07df1 removes unnecessary singularize call 2015-09-29 12:03:37 +02:00
rgarcia
b7f115b710 users resource_model instead of controller_name 2015-09-29 12:03:19 +02:00
rgarcia
25c38f942e refactors resource_class into resource_model 2015-09-29 12:01:46 +02:00
rgarcia
ac88ea98e9 fixes typo 2015-09-29 11:58:29 +02:00
rgarcia
22222bcf4c uses resource instead of commentable 2015-09-28 21:16:47 +02:00