Julian Herrero
|
c44745e0b4
|
add feature test for management proposals friendly urls
|
2016-03-02 16:01:57 +01:00 |
|
Julian Herrero
|
80edc4f613
|
add feature test for debates friendly urls
|
2016-03-02 16:01:34 +01:00 |
|
Julian Herrero
|
adbf2f40e4
|
remove controller test for management proposals friendly urls
|
2016-03-02 16:01:07 +01:00 |
|
Julian Herrero
|
c4a14dfd07
|
remove controller test for proposals friendly urls
|
2016-03-02 16:00:44 +01:00 |
|
Julian Herrero
|
50b76a6894
|
remove controller test for debates friendly urls
|
2016-03-02 16:00:03 +01:00 |
|
Julian Herrero
|
8ef9e69f71
|
Update from upstream
|
2016-01-10 15:26:19 +01:00 |
|
Julian Herrero
|
7c65b8555c
|
redirect to frendly url for debates and proposals if needed
|
2016-01-10 13:38:22 +01:00 |
|
Julian Herrero
|
083772aa62
|
add frendly urls for debates and proposals (specs)
|
2016-01-08 17:32:16 +01:00 |
|
Juanjo Bazán
|
c8ad7a8fb2
|
pluralizes notifications alert
|
2016-01-08 17:28:27 +01:00 |
|
Julian Herrero
|
bf302be879
|
add frendly urls for debates and proposals
|
2016-01-08 17:24:49 +01:00 |
|
Raimond Garcia
|
a389f6bef1
|
Merge pull request #811 from consul/notifications
Notifications
|
2016-01-08 16:21:04 +01:00 |
|
Juanjo Bazán
|
fb7550c7de
|
fixes build
|
2016-01-08 15:12:10 +01:00 |
|
Juanjo Bazán
|
307b29736d
|
Merge branch 'master' into notifications
|
2016-01-08 15:07:16 +01:00 |
|
Raimond Garcia
|
3fa8ab18c6
|
Merge pull request #815 from consul/notifications-tweaks
Notifications plus
|
2016-01-08 14:59:06 +01:00 |
|
Juanjo Bazán
|
1c801a7398
|
adds ignore_unused i18n keys
|
2016-01-08 14:44:22 +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 |
|
Alberto García Cabeza
|
2f6aa834d1
|
Merge pull request #810 from consul/comment-show
Comment show
|
2016-01-08 14:13:19 +01:00 |
|
Alberto Garcia Cabeza
|
9db19a3049
|
Merge branch 'master' into comment-show
|
2016-01-08 13:41:25 +01:00 |
|
Alberto Garcia Cabeza
|
5ef9f4de87
|
Improves styles for comments show
|
2016-01-08 13:41:18 +01:00 |
|
Juanjo Bazán
|
a976e16ef3
|
redirects notification show to notifiable
|
2016-01-08 13:06:00 +01:00 |
|
Juanjo Bazán
|
790d8de5b6
|
removes unused method
|
2016-01-08 13:06:00 +01:00 |
|
Juanjo Bazán
|
ab74bd58fa
|
avoids queries when creating a notification
|
2016-01-08 13:06:00 +01:00 |
|
Alberto Garcia Cabeza
|
de51bb0f79
|
Merge branch 'master' into notifications
|
2016-01-08 12:46:28 +01:00 |
|
Alberto Garcia Cabeza
|
40ffeeaeb0
|
Removes unused method
|
2016-01-08 12:46:02 +01:00 |
|
Alberto Garcia Cabeza
|
e008d1f642
|
Adds new styles for notifications
|
2016-01-08 12:45:37 +01:00 |
|
Alberto Garcia Cabeza
|
09120b6129
|
Updates icons font
|
2016-01-08 12:44:40 +01:00 |
|
Enrique García
|
017bfe9146
|
Merge pull request #813 from consul/gitignore
Ignores byebug history
|
2016-01-07 18:16:49 +01:00 |
|
rgarcia
|
90ee85ecdf
|
ignores byebug history
|
2016-01-07 17:51:06 +01:00 |
|
Raimond Garcia
|
bcf8c18143
|
Merge pull request #812 from consul/design_layout
Design layout
|
2016-01-07 17:42:20 +01:00 |
|
Alberto Garcia Cabeza
|
14e0cf29da
|
Updates test
|
2016-01-07 17:21:51 +01:00 |
|
Alberto Garcia Cabeza
|
4ff27d3d16
|
Moves featured debates and proposals
|
2016-01-07 17:05:21 +01:00 |
|
Alberto Garcia Cabeza
|
b84730aac0
|
Merge branch 'master' into design_layout
|
2016-01-07 16:21:00 +01:00 |
|
rgarcia
|
9c2b576431
|
fixes specs
|
2016-01-07 15:30:48 +01:00 |
|
rgarcia
|
35704f2be9
|
refactors comment tree
|
2016-01-07 15:18:45 +01:00 |
|
rgarcia
|
816a95b7b7
|
adds comment show view
|
2016-01-07 15:18:28 +01:00 |
|
Juanjo Bazán
|
5e635d7cfc
|
Merge pull request #809 from consul/selects-to-links
Selects to links (needs style)
|
2016-01-07 14:12:56 +01:00 |
|
Alberto Garcia Cabeza
|
c9f9433f96
|
Improves styles for submenu links
|
2016-01-07 13:49:42 +01:00 |
|
Alberto Garcia Cabeza
|
9b2ab35b98
|
Improves styles for tags
|
2016-01-07 12:47:21 +01:00 |
|
kikito
|
2467ee4a54
|
removes unused i18n keys
|
2016-01-07 12:37:16 +01:00 |
|
Alberto Garcia Cabeza
|
2948a2ebe4
|
Improves search form of header
|
2016-01-07 12:05:05 +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 |
|
kikito
|
8a594e673a
|
modifies i18n for the new orders
|
2016-01-05 19:39:59 +01:00 |
|
kikito
|
9898353d99
|
Fixes specs for debates and proposals
|
2016-01-05 19:38:36 +01:00 |
|
kikito
|
b89f39bfef
|
Removes unused orders from debates controller
|
2016-01-05 19:37:56 +01:00 |
|
kikito
|
7eda0b2889
|
Uses order_links in proposals/index and debates/index
|
2016-01-05 19:37:40 +01:00 |
|
Julian Herrero
|
7a8ffe2d4a
|
cleanup
|
2016-01-05 17:43:44 +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 |
|