Commit Graph

4426 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
f64e59bbf6 fixes ul tag on order links submenu 2016-12-29 17:44:16 +01:00
kikito
110a4091f8 Adds budget investment location 2016-12-29 17:30:21 +01:00
kikito
9d0e736878 budget description now returns html 2016-12-29 16:22:14 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
rgarcia
43c18d58ac fixes specs 2016-12-29 12:47:57 +01:00
rgarcia
2a0267a1af updates db schema 2016-12-29 12:34:50 +01:00
Juanjo Bazán
c33df285fe Merge pull request #1311 from consul/budgets-select
adds thead and button to select on budget investement index table
2016-12-29 12:31:43 +01:00
kikito
55ea9f1089 replaces unicode by yes/no 2016-12-29 12:11:31 +01:00
rgarcia
365faeff31 removes physical votes from proposals 2016-12-29 12:05:29 +01:00
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
kikito
0a603b9e80 i18n 2016-12-28 19:17:52 +01:00
kikito
d2356c18d0 Adds toggle_selection action 2016-12-28 19:11:59 +01:00
kikito
64ca1f18c6 Extracts code to partial. Adds remote links 2016-12-28 17:43:21 +01:00
kikito
f7c505392a Adds new route and matching ability for administrators 2016-12-28 17:42:47 +01:00
kikito
010aeaa9ac i18n 2016-12-28 17:42:15 +01:00
kikito
3dcd7b444a adds valuation_finished_feasible scope 2016-12-28 17:29:49 +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
kikito
b6dfd7178d Merge branch 'budgets-select' of github.com:consul/consul into budgets-select 2016-12-28 12:18:17 +01:00
Alberto Garcia Cabeza
d8cc888d60 changes table headings and selected button css 2016-12-28 12:17:08 +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
kikito
93047ed68e Merge branch 'budgets-select' of github.com:consul/consul into budgets-select 2016-12-28 11:12:39 +01:00
kikito
31aed877e8 i18n 2016-12-27 18:56:11 +01:00
kikito
6e5de228fd fixes failing spec due to merge with master 2016-12-27 18:52:37 +01:00
Alberto Garcia Cabeza
3121dd066e adds thead and button to select on budget investement index table 2016-12-27 18:02:35 +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
kikito
9d97421b0e Merge branch 'master' into budgets 2016-12-27 14:02:12 +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
kikito
d8b2e703ca marks spec as pending 2016-12-27 13:15:22 +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