consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,264 Commits 1 Branch 0 Tags
628cbd9e201a9701ae070e02fdb80d9ffce40cfd
Commit Graph

806 Commits

Author SHA1 Message Date
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
Raimond Garcia
5582e1016d Merge pull request #632 from AyuntamientoMadrid/faq_page 
Adds faq page
 2015-10-22 12:24:40 +02:00
Juanjo Bazán
c5b2e47b60 show hidden author message in featured proposals 2015-10-22 11:54:25 +02:00
Juanjo Bazán
1136c5546a adds featured proposals 
via new action featured_vote
Featured proposals are never duplicated in the filtered lists
Featured are not calculated/shown in searches.
 2015-10-22 11:54:17 +02:00
Alberto Garcia Cabeza
350bd32641 Adds new styles for featured proposals 2015-10-22 11:52:46 +02:00
Alberto Garcia Cabeza
05be2f55e8 Adds faq page 2015-10-22 02:14:52 +02:00
kikito
d4bbf0d26e refactors shared part of debate & proposal views 2015-10-21 14:47:17 +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
58728102a6 merges and fixes conflicts 2015-10-20 16:23:51 +02:00
kikito
0d0806c9ae improvements in the letter verification error messages 2015-10-20 16:19:17 +02:00
Alberto Garcia Cabeza
b33553cc1d Adds new styles to verifica page 2015-10-20 15:45:08 +02:00
rgarcia
8acd119b19 displays only the first 5 proposals to print 2015-10-20 14:45:59 +02:00
Raimond Garcia
c2b9745401 Merge pull request #622 from AyuntamientoMadrid/improve_management 
Improves styles for management on IE
 2015-10-20 14:38:44 +02:00
rgarcia
aface2c89e tests that user has been hidden 2015-10-20 13:07:47 +02:00
Alberto Garcia Cabeza
6af6a63e15 Adds new styles for erase account 2015-10-20 12:37:01 +02:00
rgarcia
5fe1bb3eee verifies the letter's code 2015-10-19 22:58:44 +02:00
Alberto Garcia Cabeza
b0be8a15a8 Improves styles for management on IE 2015-10-19 22:40:21 +02:00
rgarcia
0d01f431fb simplifies verification form 2015-10-19 20:33:10 +02:00
kikito
e32e4491f0 merges with master 2015-10-19 20:16:58 +02:00
rgarcia
a6fd1fb489 moves letter verification to letter controller 2015-10-19 19:38:22 +02:00
rgarcia
fd8684e713 redirects to show after asking for letter 2015-10-19 19:32:53 +02:00
rgarcia
ce13486272 uses english for method and filenames 2015-10-19 19:27:03 +02:00
Alberto Garcia Cabeza
65e0becafc adds verify account page for letter code 2015-10-19 19:24:23 +02:00
Juanjo Bazán
99fb8e059e Merge pull request #619 from AyuntamientoMadrid/print_buttons 
Print buttons
 2015-10-19 13:41:50 +02:00
Alberto Garcia Cabeza
b24de9eaff Adds initial text on management index page 2015-10-19 13:36:32 +02:00
Alberto Garcia Cabeza
8c339b54fc Adds new styles for print buttons 2015-10-19 13:27:34 +02:00
Juanjo Bazán
b3970da270 Merge pull request #617 from AyuntamientoMadrid/document-verification-age-validation 
checks valid age
 2015-10-19 12:39:46 +02:00