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 |
|
rgarcia
|
fe9586bc29
|
adds password protection for staging and production servers
|
2015-08-28 17:27:14 +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 |
|
Enrique García
|
9664dbb975
|
Merge pull request #272 from AyuntamientoMadrid/fix-replies
adds comments labels per comment
|
2015-08-28 15:46:08 +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 |
|
kikito
|
ffad7fbc86
|
Rename UserApi to CensusApi. Fixes #271
|
2015-08-28 15:38:22 +02:00 |
|
Juanjo Bazán
|
fc8687a707
|
adds comments labels per comment
fixes #265
|
2015-08-28 14:30:52 +02:00 |
|
kikito
|
538501d1b1
|
replaces hard-coded strings by i18n calls
|
2015-08-28 13:42:22 +02:00 |
|
kikito
|
3720551e78
|
fixes badly done merge
|
2015-08-28 13:41:51 +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 |
|
rgarcia
|
7053297f09
|
adds missing digest to images
|
2015-08-28 12:30:36 +02:00 |
|
kikito
|
a0dafc68e8
|
Merge branch 'master' into flag-renaming
|
2015-08-28 12:00:32 +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 |
|
Raimond Garcia
|
b8fe857ab1
|
Merge pull request #263 from AyuntamientoMadrid/include_texts
Include texts
|
2015-08-28 10:07:33 +02:00 |
|
rgarcia
|
3ee68fd5d7
|
adds translations
|
2015-08-28 00:03:08 +02:00 |
|
rgarcia
|
974d004bc4
|
fixes ambiguous db query
|
2015-08-28 00:01:26 +02:00 |
|
rgarcia
|
5ced63b639
|
adds views changes for verified accounts
|
2015-08-28 00:00:59 +02:00 |
|
rgarcia
|
e83b423fd4
|
adds user verification extensions
|
2015-08-27 23:59:47 +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 |
|
Alberto Garcia Cabeza
|
413a034e23
|
Adds styles for deleted comments
|
2015-08-27 20:21:26 +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 |
|
Juanjo Bazán
|
1d997d4929
|
fixes build, changes i18n ignored keys and specs
ref: #254
|
2015-08-27 18:08:56 +02:00 |
|
Juanjo Bazán
|
caf3e5ee74
|
Merge pull request #254 from mlovic/filter-debates
Add filters to specify order of debates on /debates page
|
2015-08-27 17:41:31 +02:00 |
|
Marko Lovic
|
e8004ca1d3
|
Add to javascript to handle debates order change
|
2015-08-27 17:18:07 +02:00 |
|
Alberto Garcia Cabeza
|
42a0cffefc
|
Adds new texts on header, debates and footer
|
2015-08-27 17:11:01 +02:00 |
|
Alberto Garcia Cabeza
|
900f00b443
|
Adds new texts on header, debates and footer
|
2015-08-27 16:46:47 +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 |
|
Marko Lovic
|
ccaca54816
|
Add filters to specify order of debates#index
|
2015-08-27 15:24:59 +02:00 |
|
kikito
|
1770dfd3f6
|
adds ability to confirm the hiding of comments, debates or users
|
2015-08-27 13:20:12 +02:00 |
|