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
kikito
00b51bbc23
Adds first version of comment moderation
...
Missing:
* Ensure removing a flag updates the flagged_at attribute correctly
* Showing the debate when the comment is not a “root”
* Filter (pending / reviewed / all)
* Order
* Same for debates
2015-08-21 22:01:47 +02:00
Raimond Garcia
a9a8359bc7
Merge pull request #216 from AyuntamientoMadrid/design_improvements
...
Design improvements
2015-08-21 20:17:34 +02:00
kikito
5328355c3e
Add tests for visible admin links and fix bug
2015-08-21 19:09:26 +02:00
Alberto Garcia Cabeza
fbc1817f81
Modifies test for not logged users
2015-08-21 19:03:43 +02:00
Juanjo Bazán
b396a3b415
refactors user's registration
...
Simplifies process and fields:
* In: username
* Out: first_name, last_name, phone, nickname, use_nickname?
Closes #213
2015-08-21 16:41:08 +02:00
kikito
12e8cf2056
Allows flagging debates as inappropriate
2015-08-20 19:26:36 +02:00
kikito
ee881230ba
merges master and fixes conflicts
2015-08-20 18:50:10 +02:00
kikito
e7effbf77c
Allows flagging comments as inappropriate
2015-08-20 18:47:16 +02:00
Juanjo Bazán
f0a6926710
adds restore user action for administrators
2015-08-20 16:06:23 +02:00
Juanjo Bazán
a269750c49
improves moderation users spec to include comments
2015-08-20 13:47:45 +02:00
Juanjo Bazán
8bb0a13f3f
removes unused :js from spec
2015-08-20 13:30:40 +02:00
Juanjo Bazán
b340d7741a
adds hiding users by moderators
2015-08-20 13:16:37 +02:00
Alberto Garcia Cabeza
0d54cca910
Changes test for pagination
2015-08-20 12:55:31 +02:00
Enrique García
307fb05e09
Merge pull request #201 from AyuntamientoMadrid/pagination
...
Adds Pagination
2015-08-20 00:54:06 +02:00
kikito
5c3f664da4
Fixes links in Admin::Organizations to handle filters + pages
2015-08-20 00:50:50 +02:00
Juanjo Bazán
b2f29215ee
unifies localization specs
2015-08-19 22:51:58 +02:00
kikito
710e83fb22
Adds locale switcher js code + feature tests
2015-08-19 21:40:17 +02:00
Juanjo Bazán
3732b7f420
adds pagination to 1st level comments in debate
...
Ref: #80
2015-08-19 16:32:39 +02:00
Juanjo Bazán
947514fbfc
adds pagination to debates#index
...
Ref: #80
2015-08-19 16:30:25 +02:00
kikito
b28f63b016
merges master and fixes conflicts
2015-08-18 09:35:13 +02:00
rgarcia
cf4495e17c
adds spec for error messages on registration signup [ #99 ]
2015-08-17 19:25:40 +02:00
Raimond Garcia
a9a24befb8
Merge pull request #192 from AyuntamientoMadrid/official-position
...
Official positions
2015-08-17 18:49:22 +02:00
Juanjo Bazán
5c630ac41d
adds settings area to admin
2015-08-17 18:38:57 +02:00
kikito
66c8931ae9
adds account tests to increase test coverage
2015-08-17 18:31:04 +02:00
rgarcia
ce05826a92
adds robustness to spec
2015-08-17 18:30:04 +02:00
kikito
9e1581656a
merges master and fixes conflicts
2015-08-17 17:38:34 +02:00
