Commit Graph

121 Commits

Author SHA1 Message Date
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
Juanjo Bazán
fabcb42328 adds edition/management of officials to admin zone 2015-08-17 17:04:29 +02:00
kikito
1c435eacbe adds filters to admin/organizations 2015-08-17 14:25:43 +02:00
rgarcia
d9a31b7158 adds specs for moderation [#136] 2015-08-17 13:39:58 +02:00
kikito
3096a73892 Moves organization verification to Admin from Moderation 2015-08-17 13:22:38 +02:00
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
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
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
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