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 |
|
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 |
|
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
|
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 |
|
rgarcia
|
09b0f799b9
|
updates schema
|
2015-11-18 18:03:39 +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 |
|
rgarcia
|
5223ec664c
|
adds physical_votes to vote counter
|
2015-10-30 19:26:25 +01:00 |
|
Alberto Garcia Cabeza
|
716a5acd1f
|
Removes highlights link
|
2015-10-30 14:47:49 +01:00 |
|
rgarcia
|
246e49c561
|
adds postgres extension for local use
|
2015-10-29 14:26:41 +01:00 |
|
Juanjo Bazán
|
1e0ac137bb
|
removes beta testers functionality
|
2015-10-29 13:19:00 +01:00 |
|
kikito
|
094ec09576
|
Adds migration for comment.confidence_score
|
2015-10-28 16:00:34 +01:00 |
|
Alberto Garcia Cabeza
|
2bf6603207
|
Merges master and fixes conflicts
|
2015-10-28 12:51:23 +01:00 |
|
rgarcia
|
c71bf4c876
|
tracks visits from different email templates
|
2015-10-22 12:23:15 +02:00 |
|
kikito
|
3d4e82f94f
|
Adds erased_at to user via a migration
|
2015-10-21 13:34:37 +02:00 |
|
kikito
|
3ab579999e
|
merges with master and fixes conflicts
|
2015-10-20 16:28:22 +02:00 |
|
kikito
|
faf29e81b7
|
removes user.letter_sent from the database
|
2015-10-20 13:31:52 +02:00 |
|
kikito
|
e32e4491f0
|
merges with master
|
2015-10-19 20:16:58 +02:00 |
|
kikito
|
5cdf298738
|
Make user.email nullable in the db
|
2015-10-19 20:09:38 +02:00 |
|