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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
Alberto Garcia Cabeza
|
3121dd066e
|
adds thead and button to select on budget investement index table
|
2016-12-27 18:02:35 +01:00 |
|
kikito
|
9d97421b0e
|
Merge branch 'master' into budgets
|
2016-12-27 14:02:12 +01:00 |
|
rgarcia
|
1bb307580f
|
makes translations aware of pluralisation
|
2016-12-26 12:03:39 +01:00 |
|
rgarcia
|
af7d71ccfd
|
Merge branch 'signature-sheets' of github.com:AyuntamientoMadrid/participacion into signature-sheets
|
2016-12-26 11:14:56 +01:00 |
|
kikito
|
526a6e2097
|
i18n
|
2016-12-25 23:18:58 +01:00 |
|
kikito
|
4b92cf3acf
|
Removes unused error messages from 18n
|
2016-12-25 12:57:46 +01:00 |
|
kikito
|
32710f57e1
|
Organization instead of organisation
|
2016-12-25 12:57:34 +01:00 |
|
kikito
|
2fab251593
|
adds i18n entries
|
2016-12-25 12:53:27 +01:00 |
|
Juanjo Bazán
|
d057c9457d
|
Merge branch 'master' into signature-sheets
|
2016-12-23 20:23:56 +01:00 |
|
rgarcia
|
37462b79cd
|
removes unused translations
|
2016-12-23 18:37:39 +01:00 |
|
Fernando Blat
|
8c8b273de0
|
Settings translation
|
2016-12-23 15:51:20 +01:00 |
|
Fernando Blat
|
85ce7d7227
|
Devise won't read mail from Settings in test environment
|
2016-12-23 15:45:20 +01:00 |
|