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 |
|
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 |
|
rgarcia
|
062445339e
|
removes spec focus
|
2015-08-29 17:08:20 +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 |
|
Juanjo Bazán
|
59c2fdb596
|
adds search method to Organization
|
2015-08-29 16:29:55 +02:00 |
|
rgarcia
|
bf0234ff44
|
adds specs for beta testers
|
2015-08-29 15:54:17 +02:00 |
|
Juanjo Bazán
|
29f4976a07
|
fix specs
|
2015-08-29 14:17:41 +02:00 |
|
Juanjo Bazán
|
e8463d1372
|
moves Residence model to Verification namespace
|
2015-08-29 12:38:07 +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 |
|
Juanjo Bazán
|
7fdc8e6615
|
adds more precise verification to specs
|
2015-08-29 11:30:11 +02:00 |
|
Jose Manuel
|
ef1f89ab84
|
Merge branch 'refactored_moderator' into master
|
2015-08-29 02:15:26 +01: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 |
|
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
|
934512ad7a
|
made the locale switcher use less js, more ruby & html
|
2015-08-28 17:02:06 +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 |
|
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
|
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
|
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
|
9cce254c8d
|
adds specs
|
2015-08-28 00:03:16 +02:00 |
|
kikito
|
76c2f2f021
|
Merge branch 'master' into flag-renaming
|
2015-08-27 19:06:29 +02:00 |
|
kikito
|
e07ae71fff
|
Refactors query-parameter-related tests
|
2015-08-27 19:05:50 +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 |
|
Marko Lovic
|
bfeff8d241
|
Implement custom rspec matcher appear_before
|
2015-08-27 15:24:59 +02:00 |
|
Marko Lovic
|
f5622b3425
|
Assign each test debate to one variable
|
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 |
|
kikito
|
cd982768f2
|
Renames the "archive" action to "ignore_flag" (+)
* archived_at -> ignored_flag_at
* archived? -> ignored_flag?
* archive -> ignore_flag
* pending -> pending_flag_review
* archived (scope) -> with_ignored_flag
* I18n changes
|
2015-08-27 11:43:58 +02:00 |
|
Raimond Garcia
|
c806547c1a
|
Merge pull request #257 from AyuntamientoMadrid/social_networks
Social networks
|
2015-08-27 10:52:10 +02:00 |
|
kikito
|
909dfb4ce3
|
Several renamings
InappropiateFlag -> Flag
x.flag_as_inappropiate -> x.flag
x.undo_flag_as_inappropiate -> x.unflag
X.flagged_as_inappropiate -> x.flagged
flag-as-inappropiate-actions views & css -> flag-actions views & css
|
2015-08-27 10:48:49 +02:00 |
|
Jose Manuel
|
3baef4ae79
|
Merge branch 'master' of github.com:AyuntamientoMadrid/participacion
|
2015-08-26 21:40:44 +01:00 |
|