Commit Graph

4083 Commits

Author SHA1 Message Date
Amaia Castro
04b23cfc7b Merge branch 'master' into legislation-module-stable 2016-12-27 16:43:43 +01:00
Juanjo Bazán
4e1bb62654 Merge pull request #1307 from consul/signature-sheets-polish
creates users with email nil to avoid index constraint
2016-12-26 14:40:11 +01:00
rgarcia
316f9a0370 creates users with email nil to avoid index constraint 2016-12-26 14:28:45 +01:00
Juanjo Bazán
ab70f25519 Merge pull request #1300 from consul/signature-sheets
Signature sheets
2016-12-26 13:18:56 +01:00
rgarcia
5281bb8181 fixes typo 2016-12-26 12:59:23 +01:00
rgarcia
c1b06b6501 creates user without email nor username 2016-12-26 12:45:48 +01:00
rgarcia
b8e175d306 adds formatting to document numbers 2016-12-26 12:18:36 +01:00
rgarcia
ba88f4d7cd takes into account asincronos processing 2016-12-26 12:04:14 +01:00
rgarcia
1bb307580f makes translations aware of pluralisation 2016-12-26 12:03:39 +01:00
rgarcia
42b0ff2696 optimize census call to return after finding a valid element 2016-12-26 11:51:28 +01:00
rgarcia
af7d71ccfd Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets 2016-12-26 11:14:56 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
rgarcia
ddeca6f06d fixes specs 2016-12-23 19:05:25 +01:00
rgarcia
37462b79cd removes unused translations 2016-12-23 18:37:39 +01:00
Fernando Blat
704dffe7c5 Merge pull request #39 from medialab-prado/28-question-page-comments
Comments in legislation question page
2016-12-23 18:20:27 +01:00
Juanjo Bazán
08049db169 Merge pull request #1303 from ferblape/extract-mailer-from-to-setting
Extract mailer from name and address to a setting
2016-12-23 16:08:06 +01:00
Amaia Castro
33266e41fe Merge branch 'master' into legislation-module-stable 2016-12-23 16:00:55 +01:00
Fernando Blat
8c8b273de0 Settings translation 2016-12-23 15:51:20 +01:00
Fernando Blat
05a00df8ed Set the default from address as consul.dev 2016-12-23 15:46:39 +01:00
Fernando Blat
85ce7d7227 Devise won't read mail from Settings in test environment 2016-12-23 15:45:20 +01:00
Amaia Castro
de5df61359 Legislation question comments spec 2016-12-23 15:40:52 +01:00
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +01:00
Amaia Castro
55eb03531c Comments in legislation question page 2016-12-23 09:35:02 +01:00
Fernando Blat
b2aa83ae4d Merge pull request #38 from medialab-prado/36-question-page-details
Question title for page and share links
2016-12-23 09:32:31 +01:00
Juanjo Bazán
d0f6db97d8 Merge pull request #1301 from amiedes/patch
Remove duplicated code in Admin::BannersController
2016-12-22 21:50:59 +01:00
Amaia Castro
243429aa41 Set title for process and draft versions pages 2016-12-22 17:34:47 +01:00
Amaia Castro
f68b6a2f32 Question title for page and share links 2016-12-22 17:27:59 +01:00
Alberto Miedes Garcés
d83c370c6a Remove duplicated code in Admin::BannersController 2016-12-22 17:18:27 +01:00
Fernando Blat
aefa875ae2 Merge pull request #35 from medialab-prado/30-legislation-question-page-details
Legislation Question page
2016-12-22 16:42:55 +01:00
Amaia Castro
dee971fcc3 Merge branch 'master' into legislation-module-stable 2016-12-22 16:36:10 +01:00
Amaia Castro
59d68264cf Force order in query 2016-12-22 16:22:43 +01:00
Amaia Castro
368430d914 Legislation Question page 2016-12-22 16:00:28 +01:00
Fernando Blat
96d000ae62 Merge pull request #34 from medialab-prado/32-legislation-process-page
Legislation Process page
2016-12-22 15:39:35 +01:00
Amaia Castro
959b36caa8 Add more specs for process page (phases) 2016-12-22 13:21:44 +01:00
Amaia Castro
898a10b0a5 Fix abilities to see the draft publication section 2016-12-22 13:09:17 +01:00
Amaia Castro
36399277ec Legislation Process page 2016-12-22 11:23:49 +01:00
rgarcia
25729ac259 cleans up 2016-12-21 18:55:28 +01:00
rgarcia
0deba76db1 adds specs 2016-12-21 18:46:38 +01:00
rgarcia
675081141c refactors signatures 2016-12-21 18:46:31 +01:00
Amaia Castro
4eb6b19f90 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 18:24:51 +01:00
Martín González
2c3539cf33 Refactor legislation process navigation 2016-12-21 17:54:57 +01:00
Amaia Castro
fe92752069 Merge branch 'sandbox-html' into legislation-module-stable 2016-12-21 15:49:37 +01:00
Juanjo Bazán
76126dd9ee Merge pull request #1299 from consul/accessibility-menu
Accessibility menu
2016-12-21 13:25:38 +01:00
Alberto Garcia Cabeza
5d96a75657 adds icon rel on apple-touch-icon image 2016-12-21 12:51:59 +01:00
Alberto Garcia Cabeza
6afe594e75 adds missing i18n 2016-12-21 12:45:57 +01:00
Alberto Garcia Cabeza
a8b32e509c moves more information link to top-links partial 2016-12-21 12:36:11 +01:00
Alberto Garcia Cabeza
4e7589f406 improves accessibility on subnavigation menu 2016-12-21 12:35:48 +01:00
Fernando Blat
e872f2d626 Merge pull request #33 from medialab-prado/25-legislation-questions
Legislation Questions model and basic admin
2016-12-21 08:50:28 +01:00
Amaia Castro
92a13b0f77 Merge branch 'master' into legislation-module-stable 2016-12-20 20:03:04 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00