Commit Graph

676 Commits

Author SHA1 Message Date
kikito
42b441a866 fixes specs by using the correct capthca helper instead of deactivating it 2015-08-17 12:29:42 +02:00
kikito
8ca546a431 merges master and fixes conflicts 2015-08-17 02:40:11 +02:00
kikito
e84873d875 Modifies devise shared link to include organisations sometimes 2015-08-17 01:16:08 +02:00
kikito
9af1f2f4a9 Adds registration controller for organizations 2015-08-17 01:16:07 +02:00
kikito
9343952d52 Adds User.organization_attributes 2015-08-17 01:16:07 +02:00
rgarcia
bea38226fe fixes spacing 2015-08-16 22:45:43 +02:00
rgarcia
a81612b226 improves consistency of error messages [#110] 2015-08-16 15:57:09 +02:00
Juanjo Bazán
7cc7efb2c7 uses timezone aware method instead of Date 2015-08-16 00:22:17 +02:00
Juanjo Bazán
e2e1783418 adds spec
checks failed debate create/update and inclusion of featured tags
2015-08-16 00:01:30 +02:00
Juanjo Bazán
aeceaf9ea8 fixes bug: edit Debate was not validating captcha 2015-08-15 23:51:30 +02:00
Juanjo Bazán
b62729aac6 removes spanish fixed text from test factory 2015-08-15 22:19:01 +02:00
Juanjo Bazán
8cb654092b Merge pull request #176 from dgilperez/issue-172
Adds CRUD for tags to admin section and featured tags support for debates
2015-08-15 22:00:37 +02:00
David Gil
a4ec38d752 adds create and destroy to the tags CRUD 2015-08-15 20:01:52 +02:00
David Gil
664f656fe3 tests featured tags administration and adding featured tags to debates 2015-08-15 19:38:42 +02:00
rgarcia
9f2d60c4ce refactors voted debates 2015-08-15 14:57:41 +02:00
rgarcia
4751954377 refactors debate search 2015-08-15 14:57:04 +02:00
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
kikito
60a1cc2267 Adds User.is_organization and User.organization_name 2015-08-14 20:24:19 +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
kikito
976c88177d Updates User model, moving org stuff to Organisation model 2015-08-13 20:04:57 +02:00
kikito
bdf462c16b Adds new Organization model 2015-08-13 20:04:21 +02:00
kikito
b4b69d89e7 Updates abilities for the new organisations
Note that unverified organisations can now create debates and comments
- that is a change over the initial request
2015-08-13 20:03:38 +02:00
kikito
19db7f9dda Updates factories to use the new organization table structure 2015-08-13 20:02:29 +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
kikito
cb301c4426 adds organization factory and refactors ability_spec 2015-08-12 18:24:57 +02:00
kikito
450b0098c6 Adds abilities for verifying/rejecting organizations 2015-08-12 17:48:25 +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
a3550a55a5 create spec/models/comment_spec and add a few tests for children count 2015-08-12 14:59:54 +02:00
David Gil
9a2ef8366e change background by let since model tests do not know about background 2015-08-12 14:59:54 +02:00
David Gil
6176e148f0 fix non working migration 2015-08-12 14:59:54 +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
kikito
5cef152c37 Adds organization rejection & tests 2015-08-12 13:47:47 +02:00
Juanjo Bazán
e880cb4f1a removes unused line from spec 2015-08-12 12:00:06 +02:00
kikito
523e69fb02 Adds validations for organizations 2015-08-11 19:48:11 +02:00
kikito
9ee1e5dbc5 Adds Abilities for Organizations 2015-08-11 19:34:18 +02:00
David Gil
9d2bece0b3 Fixes #142 2015-08-11 19:33:55 +02:00
kikito
83e3dd1c6f Implements User#organization? and User#verified_organization? 2015-08-11 19:15:00 +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