Commit Graph

688 Commits

Author SHA1 Message Date
kikito
3c8416e863 Adds responsible_name to spending_proposals 2016-04-06 19:18:10 +02:00
Juanjo Bazán
c71d09d3df adds verified and level 2 users to dev_seeds 2016-04-06 12:29:50 +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
Juanjo Bazán
cb681883f8 adds pg_search to spending proposals 2016-03-30 10:59:27 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
rgarcia
467c06c3ca allows unfeasible emails only to be send out once 2016-03-28 18:06:43 +02:00
MaiteHdezRivas
69bd24d2c8 merge with consul 2016-03-21 18:28:20 +01:00
MaiteHdezRivas
68f9a76cea Mark debates as featured 2016-03-20 13:56:05 +01:00
Juanjo Bazán
57fba7c0df adds description to valuators 2016-03-15 15:30:19 +01:00
Juanjo Bazán
0a0eb00f97 changes price fields type to bigint 2016-03-08 20:07:00 +01:00
Juanjo Bazán
6e28ae790c changes price columns type: float to integer 2016-03-08 11:46:16 +01:00
Juanjo Bazán
0e0ebc71d0 adds time scope to spending proposals 2016-03-07 16:09:03 +01:00
Juanjo Bazán
6929b7863d adds price_first_year to spending proposals 2016-03-05 12:46:16 +01:00
Juanjo Bazán
96e5be60a3 adds counter cache for assignments 2016-02-25 18:23:17 +01:00
Juanjo Bazán
34239d8478 creates new fields and assignments for spending_ps 2016-02-24 18:52:15 +01:00
kikito
49dec60615 adds a redeemable code to users. It can be filled up when signing up from /cuentasegura 2016-02-22 17:41:08 +01:00
rgarcia
d68ed5228c adds association name to spending proposals 2016-02-20 19:21:30 +01:00
rgarcia
d4cb89689d removes duplicate foreign_key 2016-02-19 19:20:58 +01:00
rgarcia
f82a590e1e reverts debate links 2016-02-19 19:08:35 +01:00
kikito
a8def9d010 Adds two codes to residence & failed_census_call 2016-02-19 18:29:13 +01:00
kikito
c8096efa73 adds geozone reference to users 2016-02-19 18:29:13 +01:00
Juanjo Bazán
11d6d0b6d6 adds spending proposal show for valuator and admin 2016-02-18 19:00:24 +01:00
Juanjo Bazán
009733a43b adds Valuator 2016-02-17 17:46:59 +01:00
Juanjo Bazán
cbad816795 adds reporting info to spending proposals 2016-02-16 13:24:32 +01:00
palomahnhp
2ee90ac76e share links to debate 2016-02-08 10:32:57 +01:00
kikito
014852665d refactors the way debate searches are done 2016-02-04 17:26:49 +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
kikito
a606c7aa8d Renames confirmed_oauth_email to oauth_email
Refactors the way oauth_email is used to cover more cases (fixes pending specs)
2016-01-26 18:15:40 +01:00
kikito
98f99954e7 Corrects the logic dealing with confirmations of users via oauth 2016-01-26 18:15:39 +01:00
kikito
c6c01fc9f2 Adds 'registering_with_oauth' boolean to users
Conflicts:
	db/schema.rb

Changes title in finish_signup page

Conflicts:
	config/locales/en.yml
	config/locales/es.yml
2016-01-26 18:11:04 +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
Josep Jaume Rey Peroy
cf00f12ec7 Store locale in a user's field and switch locale on mailers 2016-01-22 18:10:28 +01:00
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +01:00
Antonio Tapiador del Dujo
9610a6a933 Adds Tolk gem for i18n web interface
Closes #793
2016-01-14 14:57:06 +01:00
nachogomez
326dd04ae7 merge with master 2016-01-14 13:03:48 +01:00
Juanjo Bazán
facf6183d7 adds resolution to spending proposals 2016-01-11 12:18:45 +01:00
Juanjo Bazán
bc8c14e4a1 adds geozone to spending_proposals 2016-01-11 12:18:23 +01:00
Juanjo Bazán
d6abf44477 adds Geozones 🗺 2016-01-11 12:18:01 +01:00
Juanjo Bazán
ca50983938 adds index for author_id 2016-01-11 12:17:10 +01:00
Juanjo Bazán
a6f8c79268 adds SpendingProposal model 2016-01-11 12:15:42 +01:00
Juanjo Bazán
432e9e0d5b adds counter cache for user's notifications 2016-01-08 14:39:34 +01:00
Juanjo Bazán
704a038795 groups notifications 2016-01-08 14:32:16 +01:00
nachogomez
51d9d186af Add Thematic structure and Districts - Iss685 2016-01-08 13:49:23 +01:00
rgarcia
b5e9113718 merges activities into notifications 2016-01-06 12:33:37 +01:00
Julian Herrero
d9ba3edc2a mostrar notificaciones a los usuarios cuando alguien comenta en su
debate o responde a su comentario
2016-01-05 17:43:44 +01:00
Julian Herrero
ba0ce4e14b añadir track_activity para mostrar futuras notificaciones a los usuarios 2016-01-05 17:42:10 +01:00