Commit Graph

280 Commits

Author SHA1 Message Date
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
Juanjo Bazán
66dd511979 Merge pull request #1041 from consul/select-featured-debates
Select featured debates
2016-04-25 18:19:40 +02:00
MaiteHdezRivas
3e7db9d1b5 Best practices code changes 2016-04-20 16:40:58 +02:00
Juanjo Bazán
87d2d74f66 updates devise & ahoy 2016-04-19 13:27:16 +02:00
Alberto Garcia Cabeza
e9bc6ff75f Improves layout for featured debates 2016-04-05 14:14:04 +02:00
Alberto Garcia Cabeza
3fd8e76a79 Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
Conflicts:
	db/schema.rb
2016-04-05 14:05:27 +02:00
Bertocq
f18a1778ff Hashtag al compartir en redes sociales #65 @AyuntamientoMadrid/consul 2016-04-04 20:56:29 +02:00
MaiteHdezRivas
69bd24d2c8 merge with consul 2016-03-21 18:28:20 +01:00
Juanjo Bazán
4eb822a73c improves styles for whatsapp sharing button 2016-03-21 11:56:08 +01:00
Juanjo Bazán
df6e3301b9 uses generic urls in whatsapp sharing button 2016-03-21 11:52:49 +01:00
Alberto García Cabeza
3f63c5af7b Merge pull request #985 from Ana06/master
Share with WhatsApp
2016-03-21 11:33:14 +01:00
MaiteHdezRivas
68f9a76cea Mark debates as featured 2016-03-20 13:56:05 +01:00
Alberto Garcia Cabeza
f6571662a2 Adds title on links with target blank 2016-03-14 19:32:49 +01:00
Alberto Garcia Cabeza
9dce52a69a Adds title on input checkboxes 2016-03-14 19:32:49 +01:00
Alberto Garcia Cabeza
6f74f8ab8a Fixes debates votes styles 2016-03-14 19:32:49 +01:00
Alberto Garcia Cabeza
3ec0971b37 Replaces icons i tags for span 2016-03-14 19:32:48 +01:00
Alberto Garcia Cabeza
97db98fd3e Removes html role attributes 2016-03-14 19:31:15 +01:00
Ana
8119df26fb Use of fontastic instead of font-awesome 2016-03-12 22:20:35 +01:00
Ana
f4b7e0c142 Share with Whatsapp improvement 2016-03-11 00:34:07 +01:00
Ana
927b1e8e5d Share with WhatsApp in debates 2016-03-11 00:21:39 +01:00
Alberto Garcia Cabeza
84f044c131 Improves website accessibility 2016-03-08 14:00:06 +01:00
Alberto Garcia Cabeza
3752f3a53b Adds foundation 6 🎉 2016-02-26 19:33:33 +01: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
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