Commit Graph

2349 Commits

Author SHA1 Message Date
David Gil
f835154233 adds a helper for avatars in specs 2015-08-14 21:18:35 +02:00
David Gil
c6154fe48d testing avatar presence 2015-08-14 21:16:53 +02:00
rgarcia
88defaa455 adds admin layout and access links [#163] 2015-08-14 12:37:44 +02:00
kikito
4e5d53f2f1 Updates the Moderation Organisation controller 2015-08-13 20:05:32 +02:00
Juanjo Bazán
f2ea7fd95e fixes bug that hides comment form after reply
Closes #160
2015-08-13 18:27:48 +02:00
Enrique García
d832d41209 Merge pull request #157 from AyuntamientoMadrid/tags
Adds styles for tag cloud
2015-08-13 12:24:32 +02:00
kikito
83c96b1f32 Fixes tags spec 2015-08-13 12:14:04 +02:00
kikito
a59ef10e44 adds organization controller, with views and tests 2015-08-12 18:26:12 +02:00
David Gil
9a1bdb7aca move tags helper to view, fix case when less than 5 tags were present, tag list was showing a + link 2015-08-12 16:26:41 +02:00
David Gil
41e5496d2b add a couple of tests for the tag limit feature 2015-08-12 16:26:41 +02:00
David Gil
d70d417c87 using explicit texts instead of I18n calls in tests 2015-08-12 15:02:59 +02:00
David Gil
d134284774 background is the new before(:each) 2015-08-12 14:59:54 +02:00
David Gil
1ee3378768 adding a few tests 2015-08-12 14:59:54 +02:00
David Gil
caa0c3eaab change background by before(:each) in tests - background is evil! 2015-08-12 14:59:22 +02:00
David Gil
19ef481917 adding counter_cache to comments children and WIPing on the issue 2015-08-12 14:58:36 +02:00
Juanjo Bazán
e880cb4f1a removes unused line from spec 2015-08-12 12:00:06 +02:00
David Gil
9d2bece0b3 Fixes #142 2015-08-11 19:33:55 +02:00
rgarcia
4dd7e14ac4 moves featured debates to home page 2015-08-11 17:26:25 +02:00
rgarcia
4839081ad2 uses simple_captcha instead of recaptcha [#51] 2015-08-10 20:24:56 +02:00
Fernando Seror
6d20972f34 Share in social networks
* Add the social buttons gem to the Gemfile

* Initializer and translations for the social buttons

* Add the social buttons assets to the sprockets require

* Add the social buttons in the show debate view

* Spec to lock down the amount of social share buttons to three
2015-08-10 11:00:39 -05:00
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
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
Juanjo Bazán
fefe5a12ba adds spec for failed edition of user data 2015-08-08 14:04:55 +02:00
Juanjo Bazán
f8becd1b23 Merge branch 'master' into admin-77 2015-08-08 13:00:41 +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
kikito
dac5b8d22a Make /admin and /moderation only accesible to Admins & Moderators 2015-08-07 19:15:08 +02:00
Juanjo Bazán
e34ae1a805 adds tests for :js vote specs 2015-08-07 09:21:29 +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
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
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
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
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