Commit Graph

2118 Commits

Author SHA1 Message Date
rgarcia
d983f9e26d adds question and external link to show spec 2015-09-13 10:31:38 +02:00
Juanjo Bazán
c8d4a0088a removes url parsing in favor of current_path 2015-09-12 21:46:38 +02:00
Juanjo Bazán
dbdd149c06 redirects user to sms if no verified data
Fixes #433
2015-09-12 21:42:17 +02:00
kikito
5903ebe857 merges master and fix conflicts 2015-09-12 19:54:15 +02:00
Enrique García
f97fc56bb7 Merge pull request #479 from AyuntamientoMadrid/orgs-responsible
Orgs responsible
2015-09-12 19:36:11 +02:00
kikito
934b8f481e Fixes styling in organizations/registrations/success 2015-09-12 19:30:59 +02:00
kikito
08cf75fb95 Fixes bug: users were creating new organisations instead of updating existing ones 2015-09-12 19:30:26 +02:00
Enrique García
ab1f502e2f Merge pull request #478 from AyuntamientoMadrid/mobile
Mobile
2015-09-12 18:50:41 +02:00
Juanjo Bazán
d814baaf10 shows responsible person in admin/organizations 2015-09-12 18:47:11 +02:00
Juanjo Bazán
eb8d8f4766 changes migration to update invalid orgs 2015-09-12 18:41:34 +02:00
kikito
07b99fcf19 fixes kaminari inability to pluralize spanish names 2015-09-12 18:39:29 +02:00
kikito
849a2c83a8 Implements searching in proposals 2015-09-12 18:35:45 +02:00
kikito
c44e709f24 Refactors search form
It only appears when the page asks for it.
Also, the i18n namespace and the path used for the form are parameters
now
2015-09-12 18:32:13 +02:00
Juanjo Bazán
40840f74c6 updates dev_seeds 2015-09-12 18:28:00 +02:00
Juanjo Bazán
d8c9974d1a adds responsible_name to org's account page 2015-09-12 18:16:40 +02:00
Juanjo Bazán
6b0edac6fc adds responsible_name to organizations 2015-09-12 18:16:14 +02:00
Alberto Garcia Cabeza
120b1a65c2 Changes tests for new texts 2015-09-12 18:13:52 +02:00
Juanjo Bazán
d6c52ec866 puts organizations out of verification process 2015-09-12 18:05:51 +02:00
Alberto Garcia Cabeza
417757c4b0 Fixes add flags on mobile devices 2015-09-12 18:05:33 +02:00
Alberto Garcia Cabeza
747c604127 Fixes styles for mobile version 2015-09-12 18:05:15 +02:00
kikito
3bcea097c6 Moves model concerns from lib to app/models/concerns 2015-09-12 16:53:35 +02:00
kikito
d300bb6bcb Refactors order_selector
Moves the information about the current order to the selector, not to
the container
2015-09-12 16:48:41 +02:00
kikito
a2163c068a Fixes error in view: proposals have no likes 2015-09-12 16:48:41 +02:00
kikito
390b5bb5f1 Adds order specs to proposals feature 2015-09-12 16:48:41 +02:00
kikito
1caf6348a9 Extract HasOrders + partial from DebatesController 2015-09-12 16:48:41 +02:00
Juanjo Bazán
7aaf16a683 updates i18n for proposals 2015-09-12 16:41:13 +02:00
Juanjo Bazán
1d16f788e6 adds proposals text to info page 2015-09-12 16:33:08 +02:00
Juanjo Bazán
2681eb5caa adds button to proposals' index 2015-09-12 16:32:52 +02:00
Juanjo Bazán
815ee0ad62 saves a query 2015-09-12 16:19:17 +02:00
Juanjo Bazán
6fc7a4a62a adds proposals to header 2015-09-12 16:19:08 +02:00
Juanjo Bazán
82cb67f3f2 Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals 2015-09-12 14:29:45 +02:00
Juanjo Bazán
d11a6a039a refactors method to keep consistency in sync 2015-09-12 14:29:26 +02:00
kikito
3da68c0a92 fixes typo which printed Debate#123213 when rendering the tags 2015-09-12 14:29:24 +02:00
kikito
22e8d615aa fixes abilities: level 3 users can vote proposals, not just level 2 2015-09-12 14:13:40 +02:00
Juanjo Bazán
6e27917d6e moves comments out of commentables routes scopes 2015-09-12 14:12:37 +02:00
Juanjo Bazán
48b3e8c450 removes commentable dependency from comment form 2015-09-12 14:12:37 +02:00
Juanjo Bazán
65d86d8b5f makes comments controller commentable agnostic 2015-09-12 14:12:37 +02:00
kikito
fca2662923 adds proposals to dev_seeds 2015-09-12 14:05:25 +02:00
kikito
231665020e Allows commenting Proposals in Comment validation 2015-09-12 14:05:24 +02:00
kikito
f80d7771a1 Adds paranoia & Flammable to proposal 2015-09-12 14:05:24 +02:00
kikito
d57d538f3b Extracts Flammable module from comment & debate 2015-09-12 14:05:24 +02:00
kikito
800fa7c47f Adds some methods to to Verification module 2015-09-12 14:05:24 +02:00
Juanjo Bazán
2acf23c1b2 fixes i18n missing keys 2015-09-12 13:56:26 +02:00
Juanjo Bazán
ea52402691 adds initial proposal's feature spec 2015-09-12 13:42:23 +02:00
Juanjo Bazán
1a18895760 changes proposal/new info text 2015-09-12 13:33:56 +02:00
rgarcia
4aeb2a69ad adds question to show and spaces out external link 2015-09-12 13:32:02 +02:00
rgarcia
7d3a5d14bb Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals 2015-09-12 13:18:44 +02:00
rgarcia
b46d23c46b proposal translations 2015-09-12 13:18:33 +02:00
Juanjo Bazán
e407173e4b adds code to proposals 2015-09-12 13:14:59 +02:00
Juanjo Bazán
3889184432 adds proposal_code_prefix to Settings 2015-09-12 13:14:45 +02:00