Commit Graph

15242 Commits

Author SHA1 Message Date
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
Juanjo Bazán
912deb38b2 Merge pull request #643 from Serabe/feature/paragraphs-in-comments
Add paragraphs to comments
2015-10-26 11:44:56 +01:00
Juanjo Bazán
301c03aa95 updates dependencies 2015-10-26 11:39:14 +01:00
Sergio Arbeo
fe55c0bdc2 Fix feature tests 2015-10-26 01:35:21 +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
f9bc89f953 adds spec for management localization 2015-10-23 14:22:08 +02:00
Juanjo Bazán
510d85cf97 unifies session key 2015-10-23 14:05:23 +02:00
Juanjo Bazán
bdb9e1a45e adds spec for managed user info in management 2015-10-23 14:00:00 +02:00
Juanjo Bazán
97dcd02750 adds spec for management's managed user logout 2015-10-23 13:48:50 +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
b5c1f4f237 removes uri parsing in favor of current_path 2015-10-23 13:19:03 +02:00
Juanjo Bazán
5ee95a7b5b adds spec for managed_user 2015-10-23 13:17:03 +02:00
Enrique García
103afc9dc2 Merge pull request #640 from AyuntamientoMadrid/fix-random-test-fails
deactivating randomly failing scenario which required clicking twice in the same button
2015-10-23 13:11:53 +02:00
kikito
314dabc2e4 deactivating randomly failing scenario which required clicking twice in the same button 2015-10-23 13:06:00 +02:00
Enrique García
dc93866a77 Merge pull request #638 from AyuntamientoMadrid/fix-random-test-fails
fixes some random test failures
2015-10-23 12:58:46 +02:00
Juanjo Bazán
2a286c6b33 shows proposal view inside management layout 2015-10-23 12:56:09 +02:00
kikito
2bfd012369 fixes some random test failures 2015-10-23 12:49:51 +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
Raimond Garcia
a3f56906db Merge pull request #635 from andion/patch-1
Typo on privacy.html.erb
2015-10-22 13:24:39 +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
654f96dbfa removes unused rake task 2015-10-22 12:24:19 +02:00
rgarcia
c71bf4c876 tracks visits from different email templates 2015-10-22 12:23:15 +02:00
Raimond Garcia
87aa44de5a Merge pull request #633 from AyuntamientoMadrid/add-featured-proposals
Adds featured proposals
2015-10-22 12:20:17 +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
Raimond Garcia
257398f872 Merge pull request #628 from AyuntamientoMadrid/update-dependencies
Update dependencies
2015-10-21 16:36:31 +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
3d4e82f94f Adds erased_at to user via a migration 2015-10-21 13:34:37 +02:00
Enrique García
ebbddf27f4 Merge pull request #629 from AyuntamientoMadrid/letter-verification-fix
fixes an issue where users which requested a letter did not get the verification code set up
2015-10-21 12:18:09 +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