Julian Herrero
|
8ef9e69f71
|
Update from upstream
|
2016-01-10 15:26:19 +01:00 |
|
Julian Herrero
|
083772aa62
|
add frendly urls for debates and proposals (specs)
|
2016-01-08 17:32:16 +01:00 |
|
Juanjo Bazán
|
307b29736d
|
Merge branch 'master' into notifications
|
2016-01-08 15:07:16 +01:00 |
|
Juanjo Bazán
|
704a038795
|
groups notifications
|
2016-01-08 14:32:16 +01:00 |
|
Juanjo Bazán
|
790d8de5b6
|
removes unused method
|
2016-01-08 13:06:00 +01:00 |
|
rgarcia
|
816a95b7b7
|
adds comment show view
|
2016-01-07 15:18:28 +01:00 |
|
rgarcia
|
e2f419e625
|
destroy notifications when marked as read
|
2016-01-07 12:02:01 +01:00 |
|
rgarcia
|
b5e9113718
|
merges activities into notifications
|
2016-01-06 12:33:37 +01:00 |
|
Julian Herrero
|
9a5f525dc9
|
marcar notificaciones como leidas despues de ser vistas
|
2016-01-05 17:43:44 +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
|
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 |
|
Abigail Sosa
|
189a6426b1
|
Se agregan anotaciones a propuestas existentes
|
2015-12-16 11:45:46 +01:00 |
|
Jakub
|
e4b31cfe29
|
Move automatic official_level assignment to the controller.
|
2015-12-01 23:18:23 +01:00 |
|
Jakub
|
ea9a2b3be6
|
Better names for the official email methods
|
2015-11-30 21:52:48 +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
|
a1e4c1526b
|
Spec: test email_domain_for_officials
|
2015-11-29 14:23:50 +01:00 |
|
rgarcia
|
3f68c6726a
|
maintains responsible name when user is erased
|
2015-11-23 19:12:57 +01:00 |
|
rgarcia
|
dffc5f5eae
|
adds specs
|
2015-11-23 13:43:48 +01:00 |
|
rgarcia
|
4d3a9d1908
|
rearranges specs
|
2015-11-20 16:48:06 +01:00 |
|
rgarcia
|
1429728368
|
improves search order
|
2015-11-18 21:30:12 +01:00 |
|
rgarcia
|
c212aa3afd
|
fixes specs
|
2015-11-18 21:04:16 +01:00 |
|
rgarcia
|
0277106a08
|
fixes specs
|
2015-11-17 10:14:11 +01:00 |
|
Juanjo Bazán
|
c258a4f3b4
|
adds scope for only normal user comments
|
2015-11-12 12:15:36 +01:00 |
|
Juanjo Bazán
|
6d26901f9f
|
adds specs for user's page
|
2015-11-03 20:26:13 +01:00 |
|
kikito
|
f0e9005332
|
Adds missing spec to comment
|
2015-11-02 14:01:55 +01:00 |
|
kikito
|
2fab210ac8
|
merges with master and fixes conflicts
|
2015-10-31 17:09:52 +01:00 |
|
rgarcia
|
84610db830
|
marking debates search specs as pending
|
2015-10-30 22:04:07 +01:00 |
|
rgarcia
|
593ed551d4
|
adds search specs
|
2015-10-29 14:29:52 +01:00 |
|
kikito
|
f5d9ea4357
|
adds confidence_score capacity to the comment model
|
2015-10-28 16:25:35 +01:00 |
|
Alberto Garcia Cabeza
|
2bf6603207
|
Merges master and fixes conflicts
|
2015-10-28 12:51:23 +01:00 |
|
Alberto Garcia Cabeza
|
abad54d01a
|
Updates tests with new texts
|
2015-10-28 12:47:51 +01:00 |
|
Juanjo Bazán
|
cf4f9945e8
|
checks letter verification code as integers
|
2015-10-27 19:15:01 +01:00 |
|
Juanjo Bazán
|
c896fc3eef
|
adds ability for featured_votes of proposals
|
2015-10-22 11:53:32 +02:00 |
|
kikito
|
6c5d1faa90
|
Uses the new field, erased_at, for erased users
|
2015-10-21 14:28:21 +02:00 |
|
kikito
|
3ab579999e
|
merges with master and fixes conflicts
|
2015-10-20 16:28:22 +02:00 |
|
kikito
|
0d0806c9ae
|
improvements in the letter verification error messages
|
2015-10-20 16:19:17 +02:00 |
|
kikito
|
20aee99bbf
|
remove letter_sent verification
|
2015-10-20 13:16:40 +02:00 |
|
rgarcia
|
aface2c89e
|
tests that user has been hidden
|
2015-10-20 13:07:47 +02:00 |
|
rgarcia
|
17bb633567
|
adds specs
|
2015-10-19 22:58:54 +02:00 |
|
kikito
|
e32e4491f0
|
merges with master
|
2015-10-19 20:16:58 +02:00 |
|
kikito
|
9267948a99
|
Nullifies instead of emptying user
|
2015-10-19 20:13:42 +02:00 |
|
rgarcia
|
79503a2a29
|
Merge branch 'stable' of github.com:AyuntamientoMadrid/participacion into stable
|
2015-10-19 13:34:14 +02:00 |
|
Juanjo Bazán
|
07117f4a49
|
includes all date in document age verification
|
2015-10-19 12:18:42 +02:00 |
|
kikito
|
1511f811fd
|
implements first version of user.erase
|
2015-10-16 14:25:05 +02:00 |
|
Juanjo Bazán
|
df14e979ca
|
deletes Manager
|
2015-10-15 16:02:45 +02:00 |
|
rgarcia
|
e08ed41e98
|
fixes conflicts with master
|
2015-10-14 15:48:55 +02:00 |
|
Juanjo Bazán
|
4783d28bf4
|
fix test
|
2015-10-14 12:49:18 +02:00 |
|
kikito
|
050971c459
|
modifies email controllers: management email makes users level two verified, and sets their document number permanently. Fixes failing test
|
2015-10-13 17:20:39 +02:00 |
|