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 |
|
Juanjo Bazán
|
d814baaf10
|
shows responsible person in admin/organizations
|
2015-09-12 18:47:11 +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
|
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 |
|
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
|
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
|
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
|
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 |
|
Juanjo Bazán
|
ea52402691
|
adds initial proposal's feature spec
|
2015-09-12 13:42:23 +02:00 |
|
rgarcia
|
4aeb2a69ad
|
adds question to show and spaces out external link
|
2015-09-12 13:32:02 +02:00 |
|
Juanjo Bazán
|
e407173e4b
|
adds code to proposals
|
2015-09-12 13:14:59 +02:00 |
|
rgarcia
|
481e7fe19a
|
Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals
|
2015-09-12 13:02:50 +02:00 |
|
rgarcia
|
90744e6588
|
adds external link
|
2015-09-12 13:02:37 +02:00 |
|
Juanjo Bazán
|
26113cac96
|
adds setting value check in Proposal#editable?
|
2015-09-12 12:53:22 +02:00 |
|
kikito
|
68790ac8e5
|
adds abilities for proposals
|
2015-09-12 12:48:47 +02:00 |
|
rgarcia
|
3fc4cf0c1b
|
adds proposal's index
|
2015-09-12 12:47:28 +02:00 |
|
rgarcia
|
845ca22152
|
adds proposal edit
|
2015-09-12 12:35:54 +02:00 |
|
rgarcia
|
f2b917d486
|
adds proposal show
|
2015-09-12 12:30:20 +02:00 |
|
rgarcia
|
3f7338a6ae
|
adds proposal new and create
|
2015-09-12 11:38:22 +02:00 |
|
Juanjo Bazán
|
104900d343
|
adds proposal model
|
2015-09-11 19:25:26 +02:00 |
|
kikito
|
e454e5300e
|
makes the comment in application.scss longer
|
2015-09-11 18:49:08 +02:00 |
|
Raimond Garcia
|
942b27100b
|
Merge pull request #472 from AyuntamientoMadrid/verification-path
Verification path
|
2015-09-11 16:52:02 +02:00 |
|
Juanjo Bazán
|
f517d7f410
|
adds before action for verified users
|
2015-09-11 16:44:52 +02:00 |
|
Juanjo Bazán
|
1296668606
|
changes links to verification process
|
2015-09-11 16:44:00 +02:00 |
|
Raimond Garcia
|
050ae1265c
|
Merge pull request #470 from AyuntamientoMadrid/filter-to-first-page-445
filters reset to page 1. Fixes #445
|
2015-09-11 16:41:58 +02:00 |
|
Raimond Garcia
|
3901b25df7
|
Merge pull request #471 from AyuntamientoMadrid/improve_design
Fixes styles for search results and filters
|
2015-09-11 16:41:38 +02:00 |
|
rgarcia
|
58a780bac5
|
reverts postgres extension until permissions enabled at server level
|
2015-09-11 16:31:24 +02:00 |
|
Juanjo Bazán
|
eb276b917a
|
changes link in account page to verification path
|
2015-09-11 14:41:51 +02:00 |
|