Raimond Garcia
16183d9909
Merge pull request #116 from AyuntamientoMadrid/admin-77
...
Administrator and Moderator basic interface
2015-08-10 16:41:47 +02:00
kikito
84d848df7e
Adapts the CommentsController to the new permissions system
2015-08-10 15:40:23 +02:00
kikito
ce27a6f2ea
Adapts AccountController to new permissions system
2015-08-10 15:10:47 +02:00
kikito
c1c1362780
Adapts debates controller to new permissions system
2015-08-10 15:00:14 +02:00
kikito
a9a4f4fb81
Undo user.moderator? returning true for admins
2015-08-10 13:00:26 +02:00
kikito
8b53ae6f08
Adds Abilities for Debates
2015-08-10 12:38:22 +02:00
Eloy Gomez
fe2080aff9
Display some stats
2015-08-08 14:33:44 +02:00
Juanjo Bazán
fefe5a12ba
adds spec for failed edition of user data
2015-08-08 14:04:55 +02:00
Eloy Gomez
b23ca8deb1
Create event on debate creation
2015-08-08 13:08:48 +02:00
Juanjo Bazán
f8becd1b23
Merge branch 'master' into admin-77
2015-08-08 13:00:41 +02:00
Eloy Gomez
d16b2bef28
Include devise helpers in controller specs
2015-08-08 12:58:02 +02:00
rgarcia
3eac8d0bd8
adds email specs [ #23 ]
2015-08-07 20:58:24 +02:00
rgarcia
0a55a7b6a8
changes untranslated spec to english [ #23 ]
2015-08-07 20:57:52 +02:00
rgarcia
829180a84a
adds reset password spec [ #23 ]
2015-08-07 20:57:31 +02:00
rgarcia
6803dc9d74
configures email_spec gem [ #23 ]
2015-08-07 20:48:20 +02:00
kikito
dac5b8d22a
Make /admin and /moderation only accesible to Admins & Moderators
2015-08-07 19:15:08 +02:00
kikito
9eae91c764
Makes user.moderator? return true for administrators
2015-08-07 18:52:09 +02:00
kikito
5cc9c21b8d
fixes typo in user_spec
2015-08-07 17:46:36 +02:00
kikito
c04d397e66
Implements User.administrator? & User.moderator?
2015-08-07 17:20:20 +02:00
Juanjo Bazán
af0698da35
fixes conflicts
2015-08-07 10:12:58 +02:00
Juanjo Bazán
e34ae1a805
adds tests for :js vote specs
2015-08-07 09:21:29 +02:00
kikito
a194d9584b
merges master and fixes conflicts
2015-08-06 19:25:51 +02:00
Juanjo Bazán
cdaa3e2808
favors dom_id
2015-08-06 18:53:40 +02:00
Juanjo Bazán
33489e7b0c
adds css classes to voted options in debates
...
for logged users.
Closes #88
2015-08-06 18:53:05 +02:00
kikito
b1acbeb39d
Adds i18n-tasks
2015-08-06 18:31:26 +02:00
Juanjo Bazán
6e7832957a
adds method to get user votes on specific debates
2015-08-06 18:10:14 +02:00
kikito
72c33330cf
Adds nickname-related validations & name to User
2015-08-06 16:53:18 +02:00
rgarcia
ae34be1ddd
adds link to debate description
2015-08-06 15:50:36 +02:00
rgarcia
ec6d34a49f
fixes conflicts
2015-08-06 13:42:57 +02:00
Enrique García
ca575a6f20
Merge pull request #101 from AyuntamientoMadrid/show-0-votes
...
shows "0%" when there's zero votes
2015-08-06 12:00:37 +02:00
Fernando Seror
c4eb29f99d
Merge branch 'master' into escoger_idioma_803
...
Conflicts:
app/controllers/application_controller.rb
2015-08-05 15:47:52 -05:00
Fernando Seror
a89d621d1d
Allow locale to be set through the front-end
...
* Store the last used locale in the session
* Allow home page to be identified in helpers even when containing
parameters
* Create initializer to explicitly set the available locales, the
default and the load_path
2015-08-05 15:43:39 -05:00
Juanjo Bazán
64f5c4e7f1
shows "0%" when there's zero votes
...
Closes #97
2015-08-05 17:56:14 +02:00
Juanjo Bazán
ae8068f5fd
fix conflict
2015-08-05 14:46:18 +02:00
Juanjo Bazán
d23ce151a6
Merge pull request #96 from AyuntamientoMadrid/coveralls
...
Cobertura de tests
2015-08-05 14:40:39 +02:00
rgarcia
c2091f570c
integrates coveralls in test suite
2015-08-05 14:16:58 +02:00
Juanjo Bazán
8d87a69e0f
hides comment forms from not logged users
...
Closes #66
2015-08-05 14:12:58 +02:00
rgarcia
dda5963641
adds spec for voting a featured debate [ #25 ]
2015-08-05 13:50:15 +02:00
rgarcia
fa5b678b69
fixes conflicts with master [ #25 ]
2015-08-05 13:47:23 +02:00
rgarcia
c2e7ff32b1
adds spec for voting from debate index [ #25 ]
2015-08-05 12:24:22 +02:00
kikito
fc4e67824b
Merge branch 'master' into debates_description_html
...
I removed the truncation from debates.description because
debates.description returns html
Conflicts:
app/views/debates/_debate.html.erb
app/views/debates/show.html.erb
2015-08-04 19:07:20 +02:00
kikito
87dd655d70
Make debate.description always html_safe
2015-08-04 18:42:49 +02:00
Juanjo Bazán
a2ea42d13d
adds first 3 debates as featured_debates
2015-08-04 18:41:09 +02:00
kikito
90e577c811
Adds feature for debate description
2015-08-04 18:40:58 +02:00
Juanjo Bazán
c3046ccc2b
fixes build
...
adds empty featured_debates
2015-08-04 17:56:38 +02:00
kikito
b53bc42dcd
Uses the TagSanitizer in Debate
2015-08-03 19:32:00 +02:00
kikito
99c09afb02
Adds TagSanitizer
2015-08-03 19:30:06 +02:00
Juanjo Bazán
8fa6bab454
Merge pull request #76 from AyuntamientoMadrid/sanitize-debate-desc-71
...
Sanitizes debate desc
2015-08-02 22:32:42 +02:00
rgarcia
cce6ca2fb9
adds feature specs [ #25 ]
2015-08-02 13:37:50 +02:00
rgarcia
90720457bd
moves wysiwyg sanitizer to lib [ #71 ]
2015-07-31 18:51:20 +02:00
