consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,772 Commits 1 Branch 0 Tags
3b68a6a94cae4e7980169377ae9895dab5d4c877
Commit Graph

1772 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raimond Garcia
3b68a6a94c Merge pull request #549 from AyuntamientoMadrid/fix-mailers 
Fix mailers
 2015-09-24 13:05:16 +02:00
Juanjo Bazán
b979f871dd removes unused method 2015-09-24 12:42:21 +02:00
Juanjo Bazán
74bc73b5a9 Merge pull request #548 from AyuntamientoMadrid/admin-api 
moves the admin api inside of the /admin namespace
 2015-09-24 12:41:59 +02:00
Juanjo Bazán
3f46b27371 Fixes comment notifications mailers 
It was not commendable independent so avery email related with a comment on a proposal was not being sent. Removes dependency on debates and makes it commentable independent.
 2015-09-24 12:41:11 +02:00
Juanjo Bazán
5df7917c24 moves all mailer i18n keys to one place 2015-09-24 12:39:42 +02:00
Juanjo Bazán
08a1968fd2 adds mailer helper 2015-09-24 12:38:21 +02:00
Juanjo Bazán
536b0ce3f5 makes commenting commentable independent 2015-09-24 12:37:39 +02:00
kikito
adc8275f5a moves the admin api inside of the /admin namespace 2015-09-24 12:11:51 +02:00
Enrique García
471b14835e Merge pull request #544 from AyuntamientoMadrid/js-party 
refactors stats and optimizes js
 2015-09-23 19:42:55 +02:00
Juanjo Bazán
8c99c6a5f0 refactors stats and optimizes js 
JS libraries for stats (d3, c3, etc.) only load now when needed (stats/show)
 2015-09-23 19:37:24 +02:00
Juanjo Bazán
7b9c050df2 adds has_many proposals to user 2015-09-23 17:09:41 +02:00
Juanjo Bazán
599ddbb575 updates social-share-button version 2015-09-23 17:07:33 +02:00
Juanjo Bazán
b921ac9d33 adds proposal url to social buttons 2015-09-23 16:55:44 +02:00
Enrique García
44f19085a9 Merge pull request #539 from AyuntamientoMadrid/activities 
Activities
 2015-09-23 12:40:02 +02:00
Enrique García
be092dce0d Merge pull request #543 from AyuntamientoMadrid/media-icon 
moves social media icon to public
 2015-09-23 12:33:43 +02:00
Juanjo Bazán
9969884a50 minirefactors 2015-09-23 12:32:36 +02:00
Juanjo Bazán
651c3e184f moves social media icon to public 2015-09-23 12:25:42 +02:00
Enrique García
09655fdb16 Merge pull request #542 from AyuntamientoMadrid/fix-ap-520 
uses @import for everything in application.scss
 2015-09-23 12:14:15 +02:00
kikito
9afbb4804a uses @import for everything in application.scss 2015-09-23 11:58:39 +02:00
kikito
6e185fd62e uses :back in proposals/show 2015-09-22 18:07:49 +02:00
Enrique García
4697cabbd9 Merge pull request #538 from AyuntamientoMadrid/share_proposal 
Adds social share for supported proposals
 2015-09-22 17:32:45 +02:00
Juanjo Bazán
02b1e30205 logs activity: restore admin actions 
on User/Proposal/Debate/Comment
 2015-09-22 17:24:13 +02:00
Alberto Garcia Cabeza
5dde8428cf Changes tests for new texts 2015-09-22 17:16:25 +02:00
Juanjo Bazán
6082f77ec2 logs activity: user blocking 
from users moderation screen but also from proposals/debates/comments bulk moderation screens
 2015-09-22 17:08:02 +02:00
Enrique García
ae166a6836 Merge pull request #505 from dgilperez/debates_max_votes_editable 
Adds setting to control max number of votes for a Debate to be editable
 2015-09-22 16:52:52 +02:00
Juanjo Bazán
88ddf161d6 fixes missing/unused i18n 2015-09-22 16:48:52 +02:00
Juanjo Bazán
064ff631b2 logs activity: hiding comments 2015-09-22 16:42:24 +02:00
Enrique García
3e7a8e572e Merge pull request #483 from juandefelix/user-from-omniauth 
Añadido :terms_of_service a User::first_or_create_for_oauth
 2015-09-22 16:42:14 +02:00
Enrique García
72787b6284 Merge pull request #485 from juandefelix/keep-filter 
Conservar orden de búsqueda al hacer click en "Volver"
 2015-09-22 16:41:20 +02:00
Enrique García
f3253d02d6 Merge pull request #524 from dgilperez/ie_alert_cookie 
Cookie for IE alert
 2015-09-22 16:38:31 +02:00
Juanjo Bazán
7ca3f574d8 logs activity: hiding debates 2015-09-22 16:35:38 +02:00
Juanjo Bazán
5aa5fc5b7f logs activity when bulk-hiding proposals 2015-09-22 16:30:44 +02:00
Juanjo Bazán
23eba622a2 fix bug when blocking users 2015-09-22 16:30:43 +02:00
Juanjo Bazán
1047df11a1 includes hidden relations by default 2015-09-22 16:30:43 +02:00
Juanjo Bazán
7741023e6a adds activity page to administration 2015-09-22 16:30:43 +02:00
Juanjo Bazán
05237ca1e2 adds scopes for every actionable class to activity 2015-09-22 16:30:43 +02:00
Juanjo Bazán
9e922ad080 adds activity model 2015-09-22 16:30:43 +02:00
Juanjo Bazán
5d7e0c9dc1 adds activities 2015-09-22 16:30:43 +02:00
Alberto Garcia Cabeza
34c8dd0b8a Adds social share for supported proposals 2015-09-22 16:04:54 +02:00
Juanjo Bazán
e097e800ea Merge pull request #537 from AyuntamientoMadrid/debates-moderation-530 
refactors Debates&Comments moderation
 2015-09-22 14:42:26 +02:00
kikito
3b405f3e29 changes css style name to avoid conflicts 2015-09-22 14:23:11 +02:00
kikito
343025872b changes comment moderation to be similar to proposals moderation 2015-09-22 14:20:37 +02:00
kikito
69e74c4207 Style in comment moderation 2015-09-21 16:12:55 +02:00
kikito
12f1796e7b Merge branch 'master' into debates-moderation-530 2015-09-21 15:52:25 +02:00
kikito
757205a93e Unifies bulk & debates moderation forms in a single one 2015-09-21 15:41:01 +02:00
Enrique García
efee531612 Merge pull request #536 from AyuntamientoMadrid/proposals-full-text 
Adds animation on proposals full text
 2015-09-21 14:19:41 +02:00
Alberto Garcia Cabeza
80d4d2ff7a Adds animation on proposals full text 2015-09-21 13:14:14 +02:00
Juanjo Bazán
1aec1fcd01 Merge pull request #535 from AyuntamientoMadrid/proposals-full-text 
displays the complete text of the proposal in the moderation interface
 2015-09-21 13:05:35 +02:00
kikito
1d5904d478 displays the complete text of the proposal in the moderation interface 2015-09-21 12:47:13 +02:00
Enrique García
8fc2058bd9 Merge pull request #529 from AyuntamientoMadrid/moderation-changes 
changes moderation/proposals: only show flagged except in 'All' filter
 2015-09-21 11:57:01 +02:00