Commit Graph

2545 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
a8cbc60b02 Adds new pages, includes new texts 2015-09-02 23:42:06 +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
04127b23f9 Merge pull request #323 from AyuntamientoMadrid/filter-dry-282
Dries filters code
2015-09-02 14:24:06 +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
Alberto Garcia Cabeza
da86c5d6e0 Adds styles for verification account process 2015-09-02 12:34:08 +02:00
rgarcia
abfc93ea78 hot fix to take into account preproduction 2015-09-02 11:36:30 +02:00
Juanjo Bazán
e604ca656a Merge pull request #316 from AyuntamientoMadrid/secrets
Secrets
2015-09-01 21:25:45 +02:00
rgarcia
c1e85d7894 updates http_basic keys 2015-09-01 20:05:47 +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
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
9a071d2ed7 Renames @voted_values to @debate_votes in controllers 2015-09-01 13:07:03 +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
a74f4ea030 Adds first styles for static pages 2015-08-31 21:48:50 +02:00
kikito
27ece220f6 Transform Flag.flag! & unflag! into non-raising methods
They now return false and do nothing instead
2015-08-31 19:02:50 +02:00
rgarcia
f6294a6450 hot fixes parsing of beta testers file 2015-08-31 13:32:49 +02:00
Juanjo Bazán
3217d262b4 Merge pull request #292 from AyuntamientoMadrid/mask_user_data
Mask user data
2015-08-30 15:22:25 +02:00
rgarcia
76daee1fb0 removes unmasked emails and phones in forms 2015-08-30 15:16:33 +02:00
rgarcia
9abd794133 validates acceptance of census terms of service 2015-08-30 12:50:17 +02:00
rgarcia
92940c9f91 adds census terms of service page 2015-08-30 12:49:47 +02:00
Raimond Garcia
a9dedbd2b6 Merge pull request #290 from AyuntamientoMadrid/pages
adds pages controller for static pages
2015-08-29 20:07:33 +02:00
Juanjo Bazán
62f170b402 Merge pull request #289 from jjballano/225-reorder-tags
#225 : Tag cloud ordered by count and name
2015-08-29 19:47:19 +02:00
jjballano
46f334f38c #225 : refactor 2015-08-29 18:43:23 +01:00
Juanjo Bazán
84feeba085 adds pages controller for static pages 2015-08-29 19:32:08 +02:00
Juanjo Bazán
43b333b844 admins can search officials by name or email 2015-08-29 17:02:21 +02:00
Raimond Garcia
c64bb88e12 Merge pull request #287 from AyuntamientoMadrid/admin-improvements
Admin improvements
2015-08-29 16:59:53 +02:00
Juanjo Bazán
0f1329fa85 implements organizations search for admins 2015-08-29 16:30:32 +02:00
rgarcia
092dbb56c9 adds translations 2015-08-29 16:06:30 +02:00
rgarcia
171150bcf5 displays email sent flash after sign up 2015-08-29 15:48:03 +02:00
rgarcia
f92b6de22d authenticates beta testers in beta site 2015-08-29 15:48:03 +02:00
Juanjo Bazán
e8463d1372 moves Residence model to Verification namespace 2015-08-29 12:38:07 +02:00
Juanjo Bazán
e33723635b moves Email model to Verification namespace 2015-08-29 12:26:20 +02:00
Juanjo Bazán
e6fd62189b moves Sms model to Verification namespace 2015-08-29 12:17:27 +02:00
Juanjo Bazán
50dcbcdf9b moves Letter to Verification namespace 2015-08-29 12:07:43 +02:00
Juanjo Bazán
1353a1c64b Merge pull request #274 from AyuntamientoMadrid/refactor-selects
Refactor selects
2015-08-29 11:36:38 +02:00
Jose Manuel
ef1f89ab84 Merge branch 'refactored_moderator' into master 2015-08-29 02:15:26 +01:00
Jose Manuel
e21336aeff Refactored admin´s moderator controller 2015-08-29 01:39:46 +01:00
kikito
ae98ba3572 merges master and fixes conflicts 2015-08-28 19:57:28 +02:00
Raimond Garcia
b1117dd1af Merge pull request #275 from mlovic/filter-topic
Allow debates to be filtered by topic
2015-08-28 17:41:38 +02:00
rgarcia
fe9586bc29 adds password protection for staging and production servers 2015-08-28 17:27:14 +02:00
kikito
cb99996317 merges master and fix conflicts 2015-08-28 13:23:30 +02:00
Marko Lovic
4285ba4bb3 Add tag filter to debates page 2015-08-28 12:41:10 +02:00
kikito
9328e1401f Adds user admin capabilities and missing i18n entries 2015-08-28 12:00:18 +02:00
kikito
a5e48693fe Implements admin interface for Comments incl. filters 2015-08-28 10:56:43 +02:00
rgarcia
f7d22f64b6 adds letter verification 2015-08-27 23:58:31 +02:00