Commit Graph

5383 Commits

Author SHA1 Message Date
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
Alberto Garcia Cabeza
093ac67326 Removes duplicated labels on edit user's form 2015-08-31 21:50:17 +02:00
Alberto Garcia Cabeza
6f5707bbfa Changes links on header 2015-08-31 21:49:48 +02:00
Alberto Garcia Cabeza
da0c937983 Adds new texts for admin and moderation pages 2015-08-31 21:49:36 +02:00
Alberto Garcia Cabeza
a74f4ea030 Adds first styles for static pages 2015-08-31 21:48:50 +02:00
Alberto Garcia Cabeza
17d4e242ea Adds icon to locale switcher 2015-08-31 21:36:51 +02:00
Juanjo Bazán
8204e51ea2 adds cache to featured debates (welcome/index) 2015-08-31 20:47:11 +02:00
Juanjo Bazán
7246c181d5 adds cache to _debate view 2015-08-31 20:40:48 +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
4bd0cbe777 adds mask to verified emails and phones 2015-08-30 15:14:23 +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
jjballano
a67c0abcec #225 : Tag cloud ordered by count and name 2015-08-29 18:16:02 +01:00
Juanjo Bazán
43b333b844 admins can search officials by name or email 2015-08-29 17:02:21 +02:00
Juanjo Bazán
0f1329fa85 implements organizations search for admins 2015-08-29 16:30:32 +02:00
Juanjo Bazán
c4de2b9af5 removes nonexistent feature 2015-08-29 15:20:24 +02:00
Juanjo Bazán
943ddc60fb adds missing i18n key 2015-08-29 14:04:11 +02:00
Juanjo Bazán
99b23ba354 fixes html render of i18n text 2015-08-29 13:55:37 +02:00
Juanjo Bazán
57090cd794 updates admin texts for Tags 2015-08-29 13:49:15 +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
52f57c5b39 fixes letter new form 2015-08-29 12:21:55 +02:00
Juanjo Bazán
e6fd62189b moves Sms model to Verification namespace 2015-08-29 12:17:27 +02:00
Juanjo Bazán
1353a1c64b Merge pull request #274 from AyuntamientoMadrid/refactor-selects
Refactor selects
2015-08-29 11:36:38 +02:00
Juanjo Bazán
7fdc8e6615 adds more precise verification to specs 2015-08-29 11:30:11 +02:00
Juanjo Bazán
b6920cc3af Merge pull request #239 from jmgcrespo/master
admin management of moderator users
2015-08-29 11:25:03 +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
Alberto Garcia Cabeza
ee72096890 fixes conflicts 2015-08-29 00:40:15 +02:00
Alberto Garcia Cabeza
f75c21f40f Improve admin's styles 2015-08-29 00:35:08 +02:00
Alberto Garcia Cabeza
c0eb46288c Improves header, footer and debates mobile styles 2015-08-29 00:34:49 +02:00
Alberto Garcia Cabeza
13fe1dcb9f Changes bg images, adds favicon and alerts styles 2015-08-29 00:33:40 +02:00
kikito
a7929c607d adds a helper to simplify the way selects and filters are rendered 2015-08-28 20:07:45 +02:00
kikito
ae98ba3572 merges master and fixes conflicts 2015-08-28 19:57:28 +02:00
Raimond Garcia
7847610c19 Merge pull request #281 from AyuntamientoMadrid/hidden_comments
Estilo y ocultación de comentarios
2015-08-28 19:26:44 +02:00
kikito
b872d9a46d fixes failing specs 2015-08-28 19:19:18 +02:00
kikito
c989607b50 Merge branch 'master' into hidden_comments 2015-08-28 18:53:44 +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
Marko Lovic
c11b611b1a Combine debates topic and order filters 2015-08-28 17:23:36 +02:00
kikito
088144dcd1 Refactor debates order select using js-location-changer 2015-08-28 17:17:21 +02:00
kikito
934512ad7a made the locale switcher use less js, more ruby & html 2015-08-28 17:02:06 +02:00
kikito
57917f850c do not use js-classes for stying 2015-08-28 15:59:38 +02:00
Marko Lovic
e35550dafa Remove order_selector partial
Most of the logic was pulled out into DebatesHelper so having
the partial no longer makes sense.
2015-08-28 15:43:09 +02:00
Juanjo Bazán
fc8687a707 adds comments labels per comment
fixes #265
2015-08-28 14:30:52 +02:00