Commit Graph

1362 Commits

Author SHA1 Message Date
kikito
3c9e08b06f Adds organization_name attribute to budget investments 2017-01-06 18:43:55 +01:00
rgarcia
864c703ac4 Merge branch 'budgets' into budgets-tags 2017-01-06 18:28:52 +01:00
Alberto Garcia Cabeza
f503c492f3 improves styles for budgets investments ballot and votes 2017-01-05 17:43:57 +01:00
Alberto Garcia Cabeza
0171538a2d updates i18n 2017-01-05 17:23:50 +01:00
Raimond Garcia
e2cb390d43 Merge pull request #1328 from consul/budgets-polish-views
budgets views
2017-01-05 13:48:55 +01:00
rgarcia
c3380d18fa fixes conflicts with budgets 2017-01-05 13:14:09 +01:00
Juanjo Bazán
a5b4a79f62 Merge pull request #1325 from consul/budgets-gaspar
Budgets - several fixes
2017-01-05 13:06:48 +01:00
Alberto Garcia Cabeza
e8dafde39f adds message for not logged users 2017-01-05 13:03:11 +01:00
kikito
5eec8c7da2 attempts to fix travis again 2017-01-05 12:32:36 +01:00
rgarcia
dde1d34172 fixes conflicts with master 2017-01-05 01:56:35 +01:00
rgarcia
517483f244 fixes typo 2017-01-05 01:24:25 +01:00
Juanjo Bazán
70b86170a2 adds booth_assignment show with officers and recounts info 2017-01-04 21:00:36 +01:00
Alberto Garcia Cabeza
8b1e8fed5b improves styles for budgets views 2017-01-04 19:18:41 +01:00
kikito
635de83f86 prints the right value in budgets table 2017-01-04 18:48:01 +01:00
kikito
0835a7aba6 fixes valuation subtitle in budget investments index 2017-01-04 18:24:15 +01:00
Juanjo Bazán
2bd6e121c7 Merge branch 'master' into polls 2017-01-04 18:08:03 +01:00
kikito
cc00af31b9 Merge branch 'budgets-admin-views' into budgets-gaspar 2017-01-04 17:57:46 +01:00
Alberto Garcia Cabeza
32c11c0981 removes unused i18n keys 2017-01-04 17:36:03 +01:00
Alberto Garcia Cabeza
74a361690d improves styles for valuation budgets 2017-01-04 17:33:09 +01:00
kikito
8aa982725e Renames "Vote" to "Give support" during the support phase 2017-01-04 17:10:56 +01:00
Alberto Garcia Cabeza
e1367d4463 improves table of admin budgets index 2017-01-04 13:52:04 +01:00
Fernando Blat
8350143496 Don't fetch setting if table doesn't exist 2017-01-04 13:37:55 +01:00
kikito
0f174df5fe Removes geozones from budget heading views and specs 2017-01-04 12:46:11 +01:00
Juanjo Bazán
b2c9d5e6b0 Merge branch 'master' into polls 2017-01-03 23:04:21 +01:00
Juanjo Bazán
0953a536af adds recounting to officing 2017-01-03 22:23:54 +01:00
Juanjo Bazán
09dac72471 adds officing's polls index 2017-01-03 22:22:52 +01:00
Juanjo Bazán
8d52224121 removes unused routes/files 2017-01-03 22:17:27 +01:00
kikito
5ac2d9ccc9 started working on tags for budget investments. Error in investments/show because paths are hard 2017-01-03 17:13:28 +01:00
Fernando Blat
04a3a4177d Merge branch 'master' into 1315-manage-offices_url-as-setting 2017-01-03 08:57:02 +01:00
Juanjo Bazán
08ea4b35eb Merge branch 'master' into polls 2017-01-02 12:14:40 +01:00
kikito
68d598a43d Merge branch 'master' into budgets 2017-01-02 12:10:23 +01:00
kikito
51f7239d07 i18n 2017-01-02 10:52:59 +01:00
kikito
4adf32d582 Changes initializer to avoid crash when migrating database from scratch 2017-01-02 10:02:34 +01:00
kikito
9effcc4041 i18n 2017-01-01 15:04:06 +01:00
Alberto Garcia Cabeza
d8b4af5add adds meta description and keywords 2016-12-30 17:17:46 +01:00
Alberto Garcia Cabeza
f32a77bae9 removes unused i18n keys 2016-12-30 01:13:04 +01:00
Alberto Garcia Cabeza
73e3ea3560 fixes specs 2016-12-29 19:16:20 +01:00
Alberto Garcia Cabeza
84e44dc529 updates i18n 2016-12-29 17:53:16 +01:00
Alberto Garcia Cabeza
ca8ba4675e adds create button for logged and verified users 2016-12-29 17:50:06 +01:00
kikito
110a4091f8 Adds budget investment location 2016-12-29 17:30:21 +01:00
kikito
34ee8c1c48 Makes Budgets editable, and makes their description editable with html 2016-12-29 16:21:42 +01:00
kikito
55ea9f1089 replaces unicode by yes/no 2016-12-29 12:11:31 +01:00
Fernando Blat
ca2370eb7c Manage offices url as a setting 2016-12-29 10:31:38 +01:00
rgarcia
d0b0782c46 sets only one server to run delayed jobs 2016-12-28 21:24:56 +01:00
kikito
0a603b9e80 i18n 2016-12-28 19:17:52 +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
Alberto Garcia Cabeza
241ddcb163 polish styles for tables, assignments and searches on polls admin 2016-12-28 13:45:36 +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