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 |
|
rgarcia
|
570f67195c
|
adds email verification
|
2015-08-27 23:57:04 +02:00 |
|
rgarcia
|
3fc8d830f1
|
adds verified users concept
|
2015-08-27 23:56:10 +02:00 |
|
rgarcia
|
671399bb89
|
adds sms verification
|
2015-08-27 23:54:57 +02:00 |
|
rgarcia
|
07180bcd04
|
adds residence verification
|
2015-08-27 23:53:49 +02:00 |
|
kikito
|
76c2f2f021
|
Merge branch 'master' into flag-renaming
|
2015-08-27 19:06:29 +02:00 |
|
kikito
|
fb9d3097cc
|
Finishes admin interface for debates
|
2015-08-27 19:05:27 +02:00 |
|
Marko Lovic
|
b6df3be8c0
|
Change Debate.sort_by method for individual scopes
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
6f32801a88
|
Change names of debate order filters
* 'news' to 'created_at'
* 'votes' to 'total_votes'
* 'rated' to 'likes'
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
2d48966de3
|
Change variable name and references from "filter" to "order"
|
2015-08-27 15:24:59 +02:00 |
|