kikito
|
dc686f1bf7
|
Adds price to budget factory
|
2016-05-24 17:39:15 +02:00 |
|
kikito
|
2409cccd8f
|
Adds budget.price and ballot.heading_id
|
2016-05-24 17:38:41 +02:00 |
|
kikito
|
9876583c1a
|
deactivates test
|
2016-05-24 15:31:23 +02:00 |
|
kikito
|
fc35522467
|
uses a string in the factories
|
2016-05-24 14:36:45 +02:00 |
|
kikito
|
673cfc8249
|
Implements some basic budget investment specs
|
2016-05-24 14:36:45 +02:00 |
|
kikito
|
d663e4c594
|
Adds/improves factories
|
2016-05-24 14:34:04 +02:00 |
|
kikito
|
d4d16d3006
|
Adds responsible_name migration for investments
|
2016-05-24 14:34:04 +02:00 |
|
kikito
|
60cf683a0b
|
Adds valuator_assignments
|
2016-05-24 14:34:04 +02:00 |
|
kikito
|
20108639cb
|
migrates
|
2016-05-24 14:34:04 +02:00 |
|
kikito
|
fdc8636e12
|
Adds simple Budget specs
|
2016-05-24 14:33:30 +02:00 |
|
kikito
|
cf0b7a53b0
|
Adds missing budget_id to investments
|
2016-05-24 14:33:30 +02:00 |
|
Enrique García
|
10625532d0
|
Merge pull request #1126 from consul/ballot-model-specs
Ballot model specs
|
2016-05-24 14:12:42 +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 |
|
Juanjo Bazán
|
1eec6f10a5
|
Merge pull request #1131 from consul/budget-fix
Uses strings instead of classes to prevent error when doing rake db:setup
|
2016-05-24 12:50:07 +02:00 |
|
kikito
|
0fd04be499
|
Uses strings instead of classes to prevent error when doing rake db:setup
|
2016-05-24 12:39:20 +02:00 |
|
Juanjo Bazán
|
a679123326
|
adds factories for Budget classes
|
2016-05-23 14:48:39 +02:00 |
|
Enrique García
|
23649e7478
|
Merge pull request #1125 from consul/investments_tweaks
Removes Investment-1:N-Heading relation
|
2016-05-23 14:31:26 +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 |
|
Juanjo Bazán
|
15178c7ff1
|
Merge pull request #1123 from consul/budget-headings
Budget headings
|
2016-05-23 11:51:44 +02:00 |
|
Juanjo Bazán
|
956c539e09
|
updates dependencies
|
2016-05-21 22:22:00 +02:00 |
|
kikito
|
ccffcf60b3
|
Replaces geozones by headings in the models
|
2016-05-20 14:06:50 +02:00 |
|
kikito
|
f1b8ba0457
|
Adds headings via migrations
|
2016-05-20 14:06:32 +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 |
|
kikito
|
40ae4efe26
|
Adds migrations
|
2016-05-20 12:40:52 +02:00 |
|
Raimond Garcia
|
a314e2dce5
|
Merge pull request #1121 from consul/slow-query
optimizes stat query
|
2016-05-20 11:10:42 +02:00 |
|
Juanjo Bazán
|
65335d1344
|
optimizes stat query
|
2016-05-20 11:05:10 +02:00 |
|
Juanjo Bazán
|
647f0ef597
|
Merge pull request #1120 from consul/refactor-scss
Refactor scss
|
2016-05-19 18:48:11 +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 |
|
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 |
|
Juanjo Bazán
|
f726c6e8b1
|
Merge pull request #1118 from consul/refactor-scss
Refactor scss
|
2016-05-18 17:40:40 +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 |
|
Alberto Garcia Cabeza
|
d1f34c8288
|
Removes unused image and scss
|
2016-05-18 12:47:24 +02:00 |
|
Juanjo Bazán
|
b375e696c0
|
Merge pull request #1114 from consul/design-fixes
Fixes styles for mobile and updates scss files
|
2016-05-13 15:04:17 +02:00 |
|
Alberto Garcia Cabeza
|
c436f1389a
|
Fixes styles for mobile and updates scss files
|
2016-05-13 14:47:52 +02:00 |
|
Raimond Garcia
|
e7d49f7730
|
Merge pull request #1111 from consul/manager-role
Manager role
|
2016-05-11 11:54:38 +02:00 |
|
Juanjo Bazán
|
ef9546968b
|
removes duplicate specs
(already present in features/admin/tags_spec.rb)
|
2016-05-11 11:25:35 +02:00 |
|
Juanjo Bazán
|
ddc8614394
|
adds managers to admin menu
|
2016-05-11 11:24:52 +02:00 |
|
Juanjo Bazán
|
c4bf90f576
|
adds managers section to admin
|
2016-05-11 11:24:38 +02:00 |
|
Juanjo Bazán
|
d1e50d70d6
|
managers can login to /management
|
2016-05-10 19:10:02 +02:00 |
|
Juanjo Bazán
|
9ed3fa2a22
|
creates manager role
|
2016-05-10 18:31:50 +02:00 |
|