Commit Graph

1277 Commits

Author SHA1 Message Date
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
bac19ffebd makes seeds generic 2016-01-26 12:29:19 +01:00
rgarcia
dbc19090ed cleans up 2016-01-26 12:13:29 +01:00
rgarcia
328f5b4472 updates seeds 2016-01-25 22:28:46 +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
Juanjo Bazán
0772150426 adds values for new settings to dev_seeds 2016-01-20 13:16:21 +01:00
nachogomez
d16f1ccd08 merge with master two 2016-01-19 11:09:47 +01:00
Josep Jaume Rey Peroy
57f5296e49 Feature flag spending proposals 2016-01-18 13:05:00 +01:00
Josep Jaume Rey Peroy
2d45828cad Feature-flag debates 2016-01-18 13:05:00 +01:00
Josep Jaume Rey Peroy
ba74542c3d Parameterize social links 2016-01-18 12:43:36 +01:00
Josep Jaume Rey Peroy
5de3d700e4 Simplify Settings API 2016-01-18 12:43:34 +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
abe5085040 adds geozone info to admin spending proposal index 2016-01-11 14:04:41 +01:00
Juanjo Bazán
0510d211b3 adds spending resolutions to dev_seeds 2016-01-11 13:45:15 +01:00
Juanjo Bazán
facf6183d7 adds resolution to spending proposals 2016-01-11 12:18:45 +01:00
Juanjo Bazán
af0ef726fb includes geozones in dev_seeds 2016-01-11 12:18:23 +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
0cf677b8c3 adds spending_proposals counter to Tag 2016-01-11 12:16:31 +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
Julian Herrero
b64dc3a7cb Merge branch 'master' of https://github.com/consul/consul 2015-12-24 12:58:51 +01:00
Julian Herrero
2049eb0455 rename column name to newsletter 2015-12-24 12:53:03 +01:00
kikito
1df5bf582f Renames per_page_javascript to per_page_code 2015-12-22 16:21:37 +01:00
kikito
1c71358abe adds a setting allowing including custom javascript on each page header 2015-12-22 13:29:41 +01:00
Julian Herrero
e7314ac380 add option to subscribe/unsubscribe to website newsletter 2015-12-16 16:14:35 +01:00
rgarcia
60d6f1c41b annotates legislations instead of proposals 2015-12-16 11:45:47 +01:00
rgarcia
f2c14968f3 adds legislation seed 2015-12-16 11:45:47 +01:00
rgarcia
996e87cb13 adds legislations 2015-12-16 11:45:46 +01:00
Abigail Sosa
bb5da1af7f Se agrega usuario autor a cada anotacion 2015-12-16 11:45:46 +01:00
Abigail Sosa
189a6426b1 Se agregan anotaciones a propuestas existentes 2015-12-16 11:45:46 +01:00
Jakub
da490a4661 Officials level 1 is auto-assigned on email confirmation. Settings option is now optional. Also working on subdomains 2015-11-30 20:48:12 +01:00
Jakub
b4be4259b7 Level 1 officials are now auto-assigned. Rake user:check_email_domains created. 2015-11-29 00:55:15 +01:00
rgarcia
09b0f799b9 updates schema 2015-11-18 18:03:39 +01:00
rgarcia
a34369be43 typo 2015-11-18 18:03:32 +01:00
rgarcia
25184666a5 uses tsvector column to search 2015-11-18 17:57:56 +01:00
Alberto Garcia Cabeza
ca8f410319 Adds styles for user's activity page 2015-11-06 12:28:04 +01:00
Juanjo Bazán
f57eef4929 makes public activity toggleable 2015-11-04 13:51:31 +01:00
kikito
acbdf895f3 makes confidence score non-nullable and default to 0 in comments 2015-11-03 18:59:17 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00