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 |
|
Juanjo Bazán
|
4fc738a42f
|
updates capistrano-rails
last version removes deploy:cleanup_assets task, we are not using it.
|
2015-10-21 12:06:27 +02:00 |
|
Juanjo Bazán
|
1e1bd25841
|
updates dependencies
|
2015-10-21 12:05:09 +02:00 |
|
Juanjo Bazán
|
bf8fea1586
|
typo
|
2015-10-21 11:45:47 +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
|
49e1204140
|
refactors votes_spec
|
2015-10-20 19:44:46 +02:00 |
|
kikito
|
1e08217b91
|
adds another refactor to votes
|
2015-10-20 19:20:48 +02:00 |
|
kikito
|
b6af10a91f
|
refactors localization spec using expect instead of global state
|
2015-10-20 19:08:52 +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
|
b4c4bda8a7
|
refactors votes_spec
|
2015-10-20 18:46:47 +02:00 |
|
Enrique García
|
3aa50db29e
|
Merge pull request #623 from AyuntamientoMadrid/letter-verification
Letter verification
|
2015-10-20 18:18:12 +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 |
|
Juanjo Bazán
|
80f4471593
|
Merge pull request #625 from AyuntamientoMadrid/management-print-proposals
Management print proposals
|
2015-10-20 15:01:08 +02:00 |
|
rgarcia
|
786986053b
|
tests print button present
|
2015-10-20 14:50:26 +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 |
|
Raimond Garcia
|
b70af57243
|
Merge pull request #621 from AyuntamientoMadrid/erase-account
Erase account
|
2015-10-20 13:52:40 +02:00 |
|
kikito
|
faf29e81b7
|
removes user.letter_sent from the database
|
2015-10-20 13:31:52 +02:00 |
|
rgarcia
|
76c8688d30
|
ignores devise missing translation
|
2015-10-20 13:31:18 +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 |
|