Commit Graph

4052 Commits

Author SHA1 Message Date
Juanjo Bazán
ff1dc631f1 Merge pull request #1317 from consul/delayed-jobs-config
sets only one server to run delayed jobs
2016-12-28 21:55:22 +01:00
rgarcia
d0b0782c46 sets only one server to run delayed jobs 2016-12-28 21:24:56 +01:00
Juanjo Bazán
7ec6c76298 Merge pull request #1316 from consul/signature-sheets-polish
Only stores alphanumeric characters of a signature's document number
2016-12-28 20:50:28 +01:00
rgarcia
25f34cdab9 Only stores alphanumeric characters of a signature's document number 2016-12-28 20:01:17 +01:00
Juanjo Bazán
c1a6f7d445 Merge pull request #1314 from consul/comments-html
html for comments
2016-12-28 16:28:19 +01:00
Alberto Garcia Cabeza
3b28b56c5c improves html structure for comments 2016-12-28 14:36:06 +01:00
Juanjo Bazán
5ffce7fb05 Merge pull request #1312 from consul/signature-sheets-polish
Signature sheets polish
2016-12-28 12:16:15 +01:00
rgarcia
122446ef62 find or create signatures in case of a timeout 2016-12-28 11:41:52 +01:00
rgarcia
0a6e86ea83 increase delayed job max run time to 30 minutes 2016-12-28 11:41:41 +01:00
rgarcia
c9f62bf2b9 fixes conflicts 2016-12-28 11:41:32 +01:00
rgarcia
113c4551aa makes signatures aware of spaces between numbers and letter 2016-12-28 11:40:36 +01:00
rgarcia
d554ec810a adds document counter to signature sheet 2016-12-28 11:40:20 +01:00
Juanjo Bazán
48fa7ab919 Merge pull request #1309 from consul/accesibility
accesibility
2016-12-27 16:49:16 +01:00
Alberto Garcia Cabeza
5bf09ec569 replaces span tag to div on comments votes 2016-12-27 16:33:06 +01:00
Alberto Garcia Cabeza
b8f60b48fe changes time tags to span 2016-12-27 16:30:56 +01:00
Alberto Garcia Cabeza
a95edee7c7 improves styles for reply and deleted comments 2016-12-27 16:29:32 +01:00
Alberto Garcia Cabeza
170ef4e680 improves styles for users avatar 2016-12-27 16:17:43 +01:00
Alberto Garcia Cabeza
f0258fb3ee improves html structure for comments 2016-12-27 14:26:20 +01:00
Alberto Garcia Cabeza
ae7458024d closes missing aside tag 2016-12-27 13:57:27 +01:00
Alberto Garcia Cabeza
bb64dab5b9 adds type date on advanced search date min and date max 2016-12-27 13:51:19 +01:00
Alberto Garcia Cabeza
736099fa51 adds id to advanced search href link and form 2016-12-27 13:37:24 +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
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
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
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +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
Alberto Miedes Garcés
d83c370c6a Remove duplicated code in Admin::BannersController 2016-12-22 17:18:27 +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
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
rgarcia
b10dbd7cb5 adds specs 2016-12-20 18:00:36 +01:00