Commit Graph

7804 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
7fefcb692e Changes and updates texts 2015-09-02 23:43:08 +02:00
Alberto Garcia Cabeza
a8cbc60b02 Adds new pages, includes new texts 2015-09-02 23:42:06 +02:00
rgarcia
137ca75055 adds favicon to other layouts 2015-09-02 22:34:16 +02:00
rgarcia
4d97063887 removes unused spec 2015-09-02 21:59:51 +02:00
rgarcia
99d779bcec adds letter code verification 2015-09-02 21:57:03 +02:00
Juanjo Bazán
dee2d0196b ancestries
moves to ancestry from acts_as_commentable_with_threading
2015-09-02 19:23:09 +02:00
Raimond Garcia
faf1b32cf5 Merge pull request #329 from AyuntamientoMadrid/verification
Verification
2015-09-02 18:58:25 +02:00
Juanjo Bazán
eb689d7c7e refactors comment form 2015-09-02 17:22:21 +02:00
Juanjo Bazán
df5ef2dc29 makes helper independent of commentable class 2015-09-02 17:06:11 +02:00
Juanjo Bazán
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
2015-09-02 14:24:06 +02:00
Juanjo Bazán
274ddb2589 changes rules for allowing debate votes
first 100 votes are allowed for unverified users
2015-09-02 13:40:38 +02:00
kikito
79febe7bb8 Adds shared/filter_subnav partial to DRY filters 2015-09-02 13:39:27 +02:00
kikito
ebacc8c9c7 Uses has_filters in all controllers with filters & renames @filter to @current_filter 2015-09-02 13:21:46 +02:00
kikito
83d08b0017 Implements the HasFilters controller concern 2015-09-02 13:21:05 +02:00
Juanjo Bazán
31a8c15344 removes redundant condition 2015-09-02 12:57:09 +02:00
Juanjo Bazán
0c7ce4b6cf includes organizations in the cache key helper 2015-09-02 12:39:31 +02:00
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
Juanjo Bazán
5c10435064 disables voting on comments for not allowed users 2015-09-02 12:23:56 +02:00
Juanjo Bazán
8915ce7ffd adds interface to disallow organizations votes
on debates
2015-09-02 12:16:55 +02:00
rgarcia
abfc93ea78 hot fix to take into account preproduction 2015-09-02 11:36:30 +02:00
rgarcia
587749782d hot fix for anonymous votes 2015-09-01 22:56:27 +02:00
Juanjo Bazán
e604ca656a Merge pull request #316 from AyuntamientoMadrid/secrets
Secrets
2015-09-01 21:25:45 +02:00
Raimond Garcia
085c2920c0 Merge pull request #314 from AyuntamientoMadrid/setting
Settings improvements
2015-09-01 21:15:57 +02:00
Raimond Garcia
3974ee1870 Merge pull request #315 from AyuntamientoMadrid/dev-seed
rake db:dev_seed
2015-09-01 21:12:19 +02:00
kikito
62415991c0 Fixes an issue found on comments using the dev_seed 2015-09-01 20:11:45 +02:00
rgarcia
c1e85d7894 updates http_basic keys 2015-09-01 20:05:47 +02:00
Juanjo Bazán
c6c32a0795 adds translation for admin settings' keys names 2015-09-01 20:00:41 +02:00
Juanjo Bazán
174bd73b89 removes official_level_0_name setting 2015-09-01 20:00:41 +02:00
Juanjo Bazán
2ed0486423 toggles layer on votes via js 2015-09-01 17:49:03 +02:00
Juanjo Bazán
ac7ad1d863 hides 'too many anonymous votes' layer 2015-09-01 17:49:03 +02:00
Juanjo Bazán
9f4a98d3a0 moves translation keys 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
bcc58ab0c4 Adds styles for too much anonymous votes 2015-09-01 17:49:02 +02:00
Alberto Garcia Cabeza
57e373a7cf Adds styles for too much anonymous comments 2015-09-01 17:49:02 +02:00
Juanjo Bazán
872a23443b updates anonymous counter in debate when voted
refactors to move all related code to Debate model
2015-09-01 17:49:02 +02:00
Juanjo Bazán
bbf96259fc adds controller check for anonymous votes 2015-09-01 17:49:02 +02:00
Juanjo Bazán
0dca4c277b adds Setting validation 2015-09-01 17:49:01 +02:00
Juanjo Bazán
2e5b5bccb5 adds methods to decide if a user can vote a debate 2015-09-01 17:49:01 +02:00
rgarcia
9838ba86ad hides social network login 2015-09-01 16:30:12 +02:00
Raimond Garcia
3c665153d4 Merge pull request #300 from AyuntamientoMadrid/flag-helper
Flag helper
2015-09-01 15:19:16 +02:00
kikito
99fd0a917d Uses @comment_flags in everything comment-related 2015-09-01 13:10:19 +02:00
kikito
d0c7c7fe79 Adds User.comment_flags 2015-09-01 13:09:35 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
kikito
9a071d2ed7 Renames @voted_values to @debate_votes in controllers 2015-09-01 13:07:03 +02:00
Juanjo Bazán
7b946b6e78 Merge pull request #299 from AyuntamientoMadrid/social_networks
hides social network login
2015-09-01 12:59:03 +02:00
rgarcia
369fc6aef7 hides social network login 2015-09-01 12:46:02 +02:00
Juanjo Bazán
8ca3ecd36e uses assets url helpers 2015-09-01 12:40:23 +02:00
kikito
005fd4c09a Replaces can? :flag/:unflag by a helper function 2015-09-01 10:34:46 +02:00
kikito
6902d2851b Takes already-flagged-content out of Ability's concerns 2015-09-01 10:33:11 +02:00
Juanjo Bazán
5def8ba1e8 Merge pull request #296 from AyuntamientoMadrid/styling_pages
Styling pages
2015-08-31 22:01:36 +02:00
Alberto Garcia Cabeza
0235231ae6 Add first styles for verification account process 2015-08-31 21:50:41 +02:00