consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,666 Commits 1 Branch 0 Tags
da8e51aed781fe72a126ed762f5672e6a6f3c7a9
Commit Graph

305 Commits

Author SHA1 Message Date
Maite
8f1431ec3f corrections about coding style 2016-02-01 17:11:29 +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
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
rgarcia
dbc19090ed cleans up 2016-01-26 12:13:29 +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
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +01:00
Alberto Garcia Cabeza
f135bae082 Improves styles for search results page 2016-01-18 12:31:51 +01:00
Alberto Garcia Cabeza
4737f2be1b Improves styles for advanced search 2016-01-18 12:13:38 +01:00
Alberto Garcia Cabeza
8ef74f1e11 Merges master branch 2016-01-18 11:33:49 +01:00
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00
rgarcia
92de6546b7 removes obsolete order select 2016-01-13 19:25:49 +01:00
rgarcia
9ff3b1dd2f removes duplicate search form partial 2016-01-13 19:25:48 +01:00
rgarcia
33cfd92b09 adds naming consistency 2016-01-13 19:25:48 +01:00
Ana
48d6a76491 Advanced search added to debates 2016-01-13 19:25:47 +01:00
Alberto Garcia Cabeza
0f5237b52f Removes unused code for filters 2016-01-12 18:38:31 +01:00
Alberto Garcia Cabeza
edc20e9a0c Improves styles for featured debates 2016-01-12 15:51:13 +01:00
nachogomez
51d9d186af Add Thematic structure and Districts - Iss685 2016-01-08 13:49:23 +01:00
Alberto Garcia Cabeza
4ff27d3d16 Moves featured debates and proposals 2016-01-07 17:05:21 +01:00
kikito
7eda0b2889 Uses order_links in proposals/index and debates/index 2016-01-05 19:37:40 +01:00
Alberto Garcia Cabeza
66acbdbb66 Removes unused classes 2015-12-16 11:58:36 +01:00
kikito
16928d4e39 changes the debates static front 2015-11-17 13:02:21 +01:00
rgarcia
285105fd1f adds Manuela's featured debate 2015-11-16 12:26:21 +01:00
Alberto Garcia Cabeza
981b9fc637 Updates some texts 2015-11-15 21:08:52 +01:00
Juanjo Bazán
c4671ee960 hides featured debates in search & tag pages 2015-11-13 12:45:25 +01:00
Alberto Garcia Cabeza
ca55b43e7c Deletes text-transform for debates titles 2015-11-13 12:24:50 +01:00
Juanjo Bazán
e087d1f817 moves all static featured debates code to partial 2015-11-13 12:09:24 +01:00
Alberto Garcia Cabeza
3037eb5dc3 Adds static featured debates 2015-11-13 12:00:46 +01:00
Alberto Garcia Cabeza
859dfc09e0 Adds featured debates 2015-11-13 11:39:49 +01:00
kikito
60b3c65b05 Refactor comment tree calculation using a PORO 2015-10-30 17:00:32 +01:00
kikito
bfd89ed15a Adds current order to the comments cache in proposals and debates 2015-10-29 17:36:50 +01:00
kikito
e4bfc72649 Refactors design of comments order selector into a partial with i18n 2015-10-28 15:48:48 +01:00
Alberto Garcia Cabeza
82eb0bd902 Adds comments filter for debates and proposals 2015-10-28 13:28:37 +01:00
Sergio Arbeo
12ec1fe6f6 Update comments count when commenting on a debate or proposal 2015-10-27 01:02:39 +01:00
kikito
d4bbf0d26e refactors shared part of debate & proposal views 2015-10-21 14:47:17 +02:00
kikito
6c5d1faa90 Uses the new field, erased_at, for erased users 2015-10-21 14:28:21 +02:00
rgarcia
aface2c89e tests that user has been hidden 2015-10-20 13:07:47 +02:00
Juanjo Bazán
0c394b0953 adds title to debates#index 2015-09-28 13:59:16 +02:00
Alberto Garcia Cabeza
dd7f429104 Changes notes tag on forms 2015-09-28 13:46:54 +02:00
Enrique García
72787b6284 Merge pull request #485 from juandefelix/keep-filter 
Conservar orden de búsqueda al hacer click en "Volver"
 2015-09-22 16:41:20 +02:00
juandefelix
09b751bda9 "Back" link directs to previous page 2015-09-19 19:00:11 -05:00
Juanjo Bazán
a60fdc8ccd sets debate's title as title page in debate/show 2015-09-18 12:34:14 +02:00
Juanjo Bazán
2ffb22a249 Merge pull request #519 from AyuntamientoMadrid/fix-tagcloud-488 
Fix tagcloud
 2015-09-17 17:24:39 +02:00
Alberto Garcia Cabeza
efe1e58318 Improves styles for moderator actions 2015-09-17 13:38:49 +02:00
Alberto Garcia Cabeza
56a72b9118 Adds author name and level on lists 2015-09-16 20:45:02 +02:00
kikito
3490f0fa70 Merge branch 'master' into fix-tagcloud-488 2015-09-15 17:13:48 +02:00
kikito
d324c061b3 Refactors shared/_tags view to always take a param called taggable 2015-09-15 15:28:14 +02:00
Juanjo Bazán
1c5f77def2 makes percentage votes to sum 100 2015-09-15 14:11:12 +02:00
Juanjo Bazán
b0b8d4126d adds cache to highlights 2015-09-14 18:00:26 +02:00