consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,364 Commits 1 Branch 0 Tags
b7c1b4aceebe84b72e901b0bc60f7f7de3414d35
Commit Graph

290 Commits

Author SHA1 Message Date
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
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
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
Alberto Garcia Cabeza
9cd2297b67 Updates tests for social sign up 2015-08-26 20:36:52 +02:00
kikito
6110284356 removes all references to "review" (replaced by "archive") 2015-08-26 13:48:57 +02:00
kikito
015fe704e4 Fixes flagging specs by making them id-based instead of text-based 2015-08-26 13:14:42 +02:00
kikito
5eeb89584b Fixes a couple specs which fail with the new words (ArchiveD vs Archive) 2015-08-26 13:14:07 +02:00
kikito
c183cf2cc6 merges master and fix conflicts 2015-08-25 19:31:25 +02:00
Alberto Garcia Cabeza
8bdf03c50d Changes some test for moderation 2015-08-25 16:02:36 +02:00
David Gil
de15bbe911 adds feature tests for sign up and sign using OAuth 2015-08-25 14:15:04 +02:00
Jose Manuel
4c71577da6 Fixes moderators tests after merge 2015-08-25 01:14:55 +01:00
Jose Manuel
d84e80c379 Merge branch '134_create_moderator' 2015-08-25 00:07:42 +01:00
Jose Manuel
84e0e8f990 Adds testing for moderator´s admin consol 2015-08-24 23:04:10 +01:00
Juanjo Bazán
6d93f975e3 Merge branch 'master' into moderator_comments 2015-08-24 19:01:49 +02:00
Raimond Garcia
26433b6a9a Merge pull request #237 from AyuntamientoMadrid/cache 
configures the null cache store in all environments
 2015-08-24 18:56:43 +02:00
Juanjo Bazán
7edb45b0d7 configures the null cache store in all environments 
This commit allows us to use caching and Rails.cache.
Temporarily we configure the null store in all environments,
but those will probably be memcached in the future.

References #235
 2015-08-24 18:51:28 +02:00
kikito
be6a5f4f1d Adds test for not showing moderator actions in own debate 2015-08-24 18:45:47 +02:00
kikito
c6976b0905 Adds test for not using moderation links in my own comments 2015-08-24 18:36:56 +02:00
Juanjo Bazán
030fd49120 allows comment as moderator/administrator 
Ref: #170
 2015-08-24 18:17:04 +02:00
Jose Manuel
982dc180cc Adds moderators config to admin console 2015-08-24 01:50:01 +01:00
kikito
c88f7c1f30 merges master and fixes conflicts 2015-08-23 20:27:11 +02:00
kikito
5eeaa7d189 implements /moderation/debates 2015-08-22 23:20:55 +02:00
kikito
47842cb1cc Refactors spec/features/moderation/comments_spec 2015-08-22 20:56:05 +02:00
kikito
169809496e Adds filters & refactors to comment moderation 2015-08-22 20:28:48 +02:00
kikito
9785749057 Refactors organization factories & admin controller 2015-08-22 19:46:28 +02:00