kikito
f5dcb51d37
Adds valid_heading validation to budget line. Renames validation methods.
2017-01-04 13:56:42 +01:00
kikito
68d598a43d
Merge branch 'master' into budgets
2017-01-02 12:10:23 +01:00
kikito
451179fa59
fixes issues with valuating in specs
2017-01-02 08:22:11 +01:00
kikito
ecb3461a97
Renames Budget::VALID_PHASES to just PHASES
2017-01-01 13:16:22 +01:00
kikito
d80dedaad8
Adds sanitized descriptions for all phases to budget model
2017-01-01 12:51:17 +01:00
kikito
fa50e3f215
Adds new phases to budget and fixes specs
2016-12-30 18:43:15 +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
rgarcia
113c4551aa
makes signatures aware of spaces between numbers and letter
2016-12-28 11:40:36 +01:00
kikito
6e5de228fd
fixes failing spec due to merge with master
2016-12-27 18:52:37 +01:00
kikito
9d97421b0e
Merge branch 'master' into budgets
2016-12-27 14:02:12 +01:00
kikito
c6648ec39a
Fixes investment_spec and adds one more check for selected
2016-12-25 21:04:19 +01:00
kikito
21f396faaa
Fixes budget model specs using :selected & automatic line denormalization
2016-12-23 15:23:31 +01:00
rgarcia
0deba76db1
adds specs
2016-12-21 18:46:38 +01:00
rgarcia
b10dbd7cb5
adds specs
2016-12-20 18:00:36 +01:00
rgarcia
d09348ee49
adds specs
2016-12-20 16:46:20 +01:00
rgarcia
76723070e2
adds pending specs
2016-12-20 12:21:45 +01:00
kikito
d986702161
Activates and fixes specs in budget/ballot_spec
2016-12-15 18:19:55 +01:00
kikito
411cd674ff
Activates and refactors budget/ballot/line_spec
2016-12-15 18:18:49 +01:00
Raimond Garcia
392f00cdbd
Merge pull request #1282 from amiedes/crud-geozones-PRs
...
[Finished] Allow admins to manage geozones
2016-12-14 19:25:17 +01:00
Alberto Miedes Garcés
db029964fa
Check geozone 'safe_to_delete' behavior as unit test instead of integration test
2016-12-13 18:38:13 +01:00
rgarcia
d7e73b8abb
fixes specs
2016-12-12 19:11:00 +01:00
rgarcia
39fd031780
adds specs
2016-12-12 19:11:00 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
rgarcia
fe3451b4ba
fixes specs
2016-10-26 10:31:05 +02:00
Juanjo Bazán
8d48eccfed
adds not_archived scope to proposal
2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99
archived proposals can not accept votes
2016-09-12 18:47:56 +02:00
Juanjo Bazán
acae610995
adds model specs for archived proposal
2016-09-12 18:15:18 +02:00
Juanjo Bazán
3964988bb1
fixes specs
...
updates investment to have group_id & budget_id
2016-09-05 13:50:25 +02:00
rgarcia
c2c7cdb18d
Merge branch 'budget' into budget-public-controllers
2016-09-02 13:15:40 +02:00
Juanjo Bazán
b8b71d0ab0
Merge branch 'master' into budget
2016-09-02 12:47:54 +02:00
Juanjo Bazán
46563f8222
Merge pull request #1194 from consul/notifications-polish
...
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
9d9bf488fc
does not create notifications for blocked or erased users
2016-08-02 20:52:20 +02:00
rgarcia
f21fda0898
fixes pending specs
2016-07-27 16:39:25 +02:00
rgarcia
fa052d990e
marks specs as pending
2016-07-27 14:11:08 +02:00
rgarcia
93bfd492d4
marks specs as pending
2016-07-27 13:27:37 +02:00
rgarcia
c42a041d3a
fixes specs
2016-07-19 16:20:45 +02:00
rgarcia
a23666683f
fixes conflicts with master
2016-07-19 15:50:22 +02:00
rgarcia
f24a8887bb
fixes conflicts with master
2016-07-19 14:49:27 +02:00
rgarcia
85d9dd4b84
integrates cancan with budgets
2016-07-19 14:41:55 +02:00
Andrés Pereira
c5e6735caa
Change madrid.es to consul.dev - closes #1169
2016-07-14 16:28:16 +02:00
Alberto Garcia Cabeza
702cfe13d1
Fixes specs
2016-07-06 14:47:09 +02:00
rgarcia
9e910a834b
Displays badge for official positions
2016-06-20 21:37:25 +02:00
rgarcia
98040e191e
fixes conflicts with fork
2016-06-20 21:33:34 +02:00
rgarcia
25ebb325d1
limits maximum number of messages able to send per day
2016-06-16 11:10:26 +02:00
rgarcia
e2689d640c
refactors notification helpers
2016-06-15 12:12:56 +02:00
rgarcia
28d12fe55b
removes sending individual proposal notifications via email
2016-06-15 10:43:02 +02:00
rgarcia
fd67294075
adds option to receive direct messages
2016-06-14 18:20:36 +02:00
