consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

9884 Commits

Author SHA1 Message Date
Juanjo Bazán
cf4f9945e8 checks letter verification code as integers 2015-10-27 19:15:01 +01:00
Juanjo Bazán
5a866740a1 Merge pull request #647 from Serabe/feature/update-comment-count 
Update comments count when commenting on a debate or proposal
 2015-10-27 13:44:17 +01:00
Juanjo Bazán
bd4168ef75 changes generation of letter verification code 
to keep generating six digit numbers but avoid starting with zero because can led to errors when sent to users.
 2015-10-27 13:32:38 +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
510d85cf97 unifies session key 2015-10-23 14:05:23 +02:00
Juanjo Bazán
f1bc7af462 makes manager logout to remove session user data 2015-10-23 13:37:19 +02:00
Juanjo Bazán
854499b135 adds localization to management 2015-10-23 13:36:43 +02:00
Juanjo Bazán
b672f32604 Merge pull request #639 from AyuntamientoMadrid/changes_text 
Changes texts on error verification and faqs page
 2015-10-23 13:19:32 +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
kikito
ac1507e85e Fixes error when signing up new users. Fixes #624 2015-10-23 12:09:45 +02:00
Juanjo Bazán
3802bc78b5 removes comments 
This controller is no longer used in /management
 2015-10-23 11:22:23 +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
8e955b6a01 Merge pull request #626 from AyuntamientoMadrid/email-campaign 
tracks visits from different email templates
 2015-10-22 12:33:19 +02:00
Raimond Garcia
5582e1016d Merge pull request #632 from AyuntamientoMadrid/faq_page 
Adds faq page
 2015-10-22 12:24:40 +02:00
rgarcia
c71bf4c876 tracks visits from different email templates 2015-10-22 12:23:15 +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
Juanjo Bazán
c896fc3eef adds ability for featured_votes of proposals 2015-10-22 11:53:32 +02:00
Juanjo Bazán
65ed1f45ab define method for extra customization 2015-10-22 11:53:19 +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
Enrique García
a8d98c5426 Merge pull request #630 from AyuntamientoMadrid/fix-erase 
Fix erase
 2015-10-21 15:31:45 +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
f08cf591b6 fixes an issue where users which requested a letter did not get the verification code set up 2015-10-21 12:08:56 +02:00
Enrique García
3897af6b71 Merge pull request #627 from AyuntamientoMadrid/refactor-votes-spec 
refactors votes_spec
 2015-10-20 19:51:21 +02:00
kikito
b27c91f40b disallow voting debates or proposals when user is nil in some tests 2015-10-20 18:59:35 +02:00
kikito
f596beaaf5 removes unnecessary conditions from before_actions in verification/letter_controller 2015-10-20 17:33:16 +02:00
kikito
18db6482f9 makes sure verifications only happen for signed in users when doing a letter verification 2015-10-20 17:18:28 +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
Juanjo Bazán
0ff9429b52 adds for_render to preload tags 2015-10-20 15:02:41 +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
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
d54abb5dfe simplifies erase action 2015-10-20 12:57:12 +02:00
Alberto Garcia Cabeza
6af6a63e15 Adds new styles for erase account 2015-10-20 12:37:01 +02:00
rgarcia
8904748ae2 fixes specs 2015-10-19 23:23:09 +02:00