Commit Graph

5383 Commits

Author SHA1 Message Date
Juanjo Bazán
a8e991eea2 Merge pull request #690 from AyuntamientoMadrid/featured_debates
Featured debates
2015-11-13 12:27:31 +01:00
Alberto Garcia Cabeza
ca55b43e7c Deletes text-transform for debates titles 2015-11-13 12:24:50 +01:00
Juanjo Bazán
e087d1f817 moves all static featured debates code to partial 2015-11-13 12:09:24 +01:00
Alberto Garcia Cabeza
3037eb5dc3 Adds static featured debates 2015-11-13 12:00:46 +01:00
Alberto Garcia Cabeza
859dfc09e0 Adds featured debates 2015-11-13 11:39:49 +01:00
Juanjo Bazán
a881ced801 adds user's email to activity page for admins 2015-11-12 12:04:34 +01:00
Alberto Garcia Cabeza
5050712e5c Fixes footer logos and change en title 2015-11-10 12:15:55 +01:00
Juanjo Bazán
0614629d35 adds info about deleted items on comments activity 2015-11-09 13:12:44 +01:00
Raimond Garcia
dc3ecf5fab Merge pull request #675 from AyuntamientoMadrid/avatar-bug
Avatar bug
2015-11-09 11:16:44 +01:00
Juanjo Bazán
09a1a2bd2a changes header in admin, moderation & management 2015-11-09 09:53:45 +01:00
Juanjo Bazán
c65ef9c02b better title for management 2015-11-09 09:50:28 +01:00
Juanjo Bazán
40d28355ea adds style to i18n text 2015-11-09 09:50:10 +01:00
Juanjo Bazán
b0e9297b28 changes web main header to 'Madrid Decide' 2015-11-09 09:37:46 +01:00
Juanjo Bazán
cc5babe764 hides comment's author avatar for erased users 2015-11-08 13:21:08 +01:00
Juanjo Bazán
057563d37a shows author avatar in prop/deb only if not hidden 2015-11-08 13:20:36 +01:00
Juanjo Bazán
e38a74d73f adds simple format to comments 2015-11-07 20:38:43 +01:00
Raimond Garcia
6df3cab2f1 Merge pull request #669 from AyuntamientoMadrid/user-page
User page
2015-11-06 13:15:55 +01:00
Alberto Garcia Cabeza
ca8f410319 Adds styles for user's activity page 2015-11-06 12:28:04 +01:00
Juanjo Bazán
2671b25ba6 makes author name a link to activity page
in debates/proposals/comments
2015-11-04 14:09:16 +01:00
Juanjo Bazán
3465b00e89 adds 'My activity' link 2015-11-04 13:51:57 +01:00
Juanjo Bazán
f57eef4929 makes public activity toggleable 2015-11-04 13:51:31 +01:00
Lucas Andión Montáns
2569e18e08 Update "More information" links to use PagesController
Paths were hardcoded instead of using PagesController actions and defined routes under routes.rb
2015-11-04 09:47:24 +01:00
Juanjo Bazán
fe0618e2c1 restyling user's page 2015-11-03 19:54:57 +01:00
Juanjo Bazán
e8232f296e adds comments to user's page 2015-11-03 19:40:02 +01:00
Juanjo Bazán
7b2e09d54d adds debates to user's page 2015-11-03 19:29:35 +01:00
Juanjo Bazán
15e2ca815d adds activity page with user's proposals 2015-11-03 19:29:35 +01:00
Juanjo Bazán
7f1fe034a3 adds user's public show page 2015-11-03 19:29:35 +01:00
Juanjo Bazán
628cbd9e20 removes hardcoding of proposal's supports
makes it dynamic based on Proposal.votes_needed_for_success
2015-11-03 19:20:13 +01:00
Juanjo Bazán
8dd60b47f6 removes duplicated file 2015-11-01 15:24:55 +01:00
kikito
2fab210ac8 merges with master and fixes conflicts 2015-10-31 17:09:52 +01:00
kikito
60b3c65b05 Refactor comment tree calculation using a PORO 2015-10-30 17:00:32 +01:00
Alberto Garcia Cabeza
716a5acd1f Removes highlights link 2015-10-30 14:47:49 +01:00
kikito
bfd89ed15a Adds current order to the comments cache in proposals and debates 2015-10-29 17:36:50 +01:00
Alberto Garcia Cabeza
2e421ff760 Improves styles for print_proposals 2015-10-28 20:06:04 +01:00
kikito
b2918621ab Refactors in children count when rendering comments 2015-10-28 17:33:24 +01:00
kikito
e4bfc72649 Refactors design of comments order selector into a partial with i18n 2015-10-28 15:48:48 +01:00
Alberto Garcia Cabeza
82eb0bd902 Adds comments filter for debates and proposals 2015-10-28 13:28:37 +01:00
Juanjo Bazán
f917c21c2a Merge pull request #644 from Serabe/feature/refactor-comment-body-classes
Refactor comment body
2015-10-28 10:06:49 +01:00
Sergio Arbeo
12ec1fe6f6 Update comments count when commenting on a debate or proposal 2015-10-27 01:02:39 +01:00
Sergio Arbeo
4e7493c75c Refactor comment body
Refactor the body of the comment to use a couple of helpers instead of a long
list of `if`s in the html.
2015-10-26 14:51:34 +01:00
Sergio Arbeo
3013d13b38 Add paragraphs to comments
Fix #600
2015-10-26 01:25:53 +01:00
Raimond Garcia
3ef5562f1a Merge pull request #641 from AyuntamientoMadrid/management-polishing
Management polishing
2015-10-24 15:02:58 +02:00
Juanjo Bazán
2a286c6b33 shows proposal view inside management layout 2015-10-23 12:56:09 +02:00
Alberto Garcia Cabeza
2cbfde8f66 Changes texts on error verification and faqs page 2015-10-23 12:47:04 +02:00
Juanjo Bazán
f4e9572464 shows 'choose options' text only when needed 2015-10-23 11:08:29 +02:00
Raimond Garcia
beeb396537 Merge pull request #637 from AyuntamientoMadrid/improvements_proposals
Changes link on welcome page
2015-10-22 14:18:59 +02:00
Alberto Garcia Cabeza
18eb03654d Changes link on welcome page 2015-10-22 14:06:53 +02:00
Raimond Garcia
8b1ce2e773 Merge pull request #636 from AyuntamientoMadrid/improvements_proposals
Improves featured proposals styles
2015-10-22 14:03:23 +02:00
Alberto Garcia Cabeza
2d0fbe113b Improves featured proposals styles 2015-10-22 13:27:33 +02:00
Lucas Andión Montáns
72b2c44b67 Typo on privacy.html.erb
Deleted some hidden characters that made making the sentence "darse de alta y proporcionar" look like "darse de alta yproporcionar"
2015-10-22 13:19:23 +02:00