Juanjo Bazán
|
1b57e14a86
|
removes heading reference in ballot
heading info is stored per group in ballot_lines
|
2016-06-14 14:04:27 +02:00 |
|
Juanjo Bazán
|
4fcf138045
|
refactors investment adding to ballots
|
2016-06-14 14:03:21 +02:00 |
|
Juanjo Bazán
|
56a358a638
|
adds funds and feasibility validations to lines
|
2016-06-11 15:01:51 +02:00 |
|
Juanjo Bazán
|
ab008ed4e9
|
adds denormalization to budget::ballot::lines
|
2016-06-11 14:57:07 +02:00 |
|
Juanjo Bazán
|
b5a6828e41
|
adds Budget::Group model to group headings
many refactors through budget related models
|
2016-06-09 18:00:06 +02:00 |
|
Juanjo Bazán
|
e4a7989b15
|
Merge branch 'master' into budget
|
2016-06-02 12:35:44 +02:00 |
|
Juanjo Bazán
|
824a969c0e
|
fixes admin menu spec
|
2016-06-02 12:21:13 +02:00 |
|
Alberto Garcia Cabeza
|
d147cce459
|
Fixes localization specs
|
2016-06-02 11:26:40 +02:00 |
|
Alberto Garcia Cabeza
|
31cb29d8c5
|
Fixes specs
|
2016-06-01 21:46:17 +02:00 |
|
Alberto Garcia Cabeza
|
9e31eeefad
|
Cleans admin.scss
|
2016-06-01 18:10:14 +02:00 |
|
Alberto Garcia Cabeza
|
5bd7bbee4f
|
Improves styles for management section
|
2016-06-01 18:07:58 +02:00 |
|
Alberto Garcia Cabeza
|
b71c61e405
|
Improves styles for moderation section
|
2016-06-01 17:30:01 +02:00 |
|
Alberto Garcia Cabeza
|
fb6dbdf2f9
|
Improves all pages for admin section
|
2016-06-01 13:23:57 +02:00 |
|
Alberto Garcia Cabeza
|
00fd9da0f9
|
Improves admin dashboard
|
2016-05-31 17:25:30 +02:00 |
|
Alberto Garcia Cabeza
|
56bb06b168
|
Improves general layout for admin
|
2016-05-31 17:10:08 +02:00 |
|
Juanjo Bazán
|
65e007ef85
|
Merge pull request #1135 from consul/budget-permissions
Budget permissions
|
2016-05-30 14:36:47 +02:00 |
|
kikito
|
7005faabe6
|
adds admin permissions for investments
|
2016-05-30 14:13:36 +02:00 |
|
kikito
|
2a82e9e33a
|
Redoes the common balloting permissions
|
2016-05-30 14:01:47 +02:00 |
|
kikito
|
13f43d8b67
|
Adds valuator investment abilities
|
2016-05-30 13:55:12 +02:00 |
|
kikito
|
daa8783b02
|
Adds common Investment abilities
|
2016-05-30 13:53:30 +02:00 |
|
kikito
|
bb7f82a72f
|
Fixes hidden bug when calculating amount_available
|
2016-05-27 15:12:54 +02:00 |
|
kikito
|
b6e47bc14a
|
Adds missing scope to investments
|
2016-05-27 15:12:39 +02:00 |
|
kikito
|
3e39272b3b
|
Fixes implementation of amount_available moving it to the ballot
|
2016-05-24 17:39:49 +02:00 |
|
kikito
|
673cfc8249
|
Implements some basic budget investment specs
|
2016-05-24 14:36:45 +02:00 |
|
kikito
|
60cf683a0b
|
Adds valuator_assignments
|
2016-05-24 14:34:04 +02:00 |
|
kikito
|
fdc8636e12
|
Adds simple Budget specs
|
2016-05-24 14:33:30 +02:00 |
|
Juanjo Bazán
|
57642075a7
|
adds ballot model spec
|
2016-05-24 13:04:12 +02:00 |
|
Juanjo Bazán
|
1cae255555
|
changes sps to investments in ballot relation
|
2016-05-24 13:04:12 +02:00 |
|
Juanjo Bazán
|
282553543f
|
removes forum and delegated votes from investments
|
2016-05-24 13:04:12 +02:00 |
|
Juanjo Bazán
|
c48059594b
|
removes belongs_to :heading relation from ballot
|
2016-05-24 13:04:12 +02:00 |
|
Alberto Garcia Cabeza
|
7d1bf7344a
|
Removes unused file and style
|
2016-05-23 19:05:16 +02:00 |
|
Alberto Garcia Cabeza
|
8954ea6cb5
|
Improves styles, removes blank spaces and changes banners img
|
2016-05-23 16:49:40 +02:00 |
|
Alberto Garcia Cabeza
|
a9ac0dc7ff
|
Moves banners styles to layout.scss
|
2016-05-23 16:48:42 +02:00 |
|
Juanjo Bazán
|
da769d8746
|
investment can not have many headings
|
2016-05-23 13:57:36 +02:00 |
|
Juanjo Bazán
|
183034abb4
|
Merge branch 'master' into budget
|
2016-05-23 12:23:58 +02:00 |
|
Alberto Garcia Cabeza
|
7c65a6ee1a
|
Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin
|
2016-05-23 12:14:52 +02:00 |
|
kikito
|
ccffcf60b3
|
Replaces geozones by headings in the models
|
2016-05-20 14:06:50 +02:00 |
|
kikito
|
9d195609f9
|
Adds models
|
2016-05-20 12:41:48 +02:00 |
|
kikito
|
06f48b6fdd
|
Includes description in Sanitizable
|
2016-05-20 12:41:26 +02:00 |
|
Juanjo Bazán
|
65335d1344
|
optimizes stat query
|
2016-05-20 11:05:10 +02:00 |
|
Alberto Garcia Cabeza
|
1103703ace
|
Removes duplicates styles
|
2016-05-19 16:29:37 +02:00 |
|
Alberto Garcia Cabeza
|
10a2412e20
|
Removes unused scss
|
2016-05-19 16:25:10 +02:00 |
|
MaiteHdezRivas
|
550f61ed51
|
Merge with consul
|
2016-05-19 13:55:25 +02:00 |
|
MaiteHdezRivas
|
3b2bfc46cf
|
Admin option to add banners and show banners
|
2016-05-19 13:18:30 +02:00 |
|
Alberto Garcia Cabeza
|
ecf6999730
|
Improves layout
|
2016-05-19 12:54:49 +02:00 |
|
Alberto Garcia Cabeza
|
a59cb3481e
|
Removes unused scss
|
2016-05-19 12:44:40 +02:00 |
|
Alberto Garcia Cabeza
|
49c8145e76
|
Cleans scss
|
2016-05-18 18:39:35 +02:00 |
|
Alberto Garcia Cabeza
|
58aa0309ac
|
Fixes typo
|
2016-05-18 17:24:08 +02:00 |
|
Alberto Garcia Cabeza
|
e77b9cf46c
|
Moves custom variables to settings.scss
|
2016-05-18 17:16:06 +02:00 |
|
Alberto Garcia Cabeza
|
d9cca3cbf1
|
Updates settings.scss
|
2016-05-18 16:52:17 +02:00 |
|