kikito
4b7cf22b18
Adds manager to dev_seeds
2016-12-05 17:29:43 +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
1a8f7e119f
sets default value for password_changed_at
2016-11-02 14:51:52 +01:00
Marcia
1f72c5cc74
improves expired password view
2016-09-30 10:10:20 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
Enrique García
03dca699ac
removes unused budget feature info from schema.rb
2016-09-21 15:53:38 +02:00
rgarcia
0c873649c5
updates dev seed with archived proposals
2016-09-16 20:24:25 +02:00
Alberto Garcia Cabeza
910b24936d
Merge branch 'master' into voting-proposals
...
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
2016-09-15 13:58:53 +02:00
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
rgarcia
a6a53659ae
updates dev seeds
2016-09-10 16:22:41 +02:00
Alberto Garcia Cabeza
3bbc2862d2
Adds admin setting 'months to archive proposals'
2016-09-09 18:02:02 +02:00
Juanjo Bazán
11a5ed15ea
adds question marks to seed data
2016-09-08 15:45:29 +02:00
Alberto Garcia Cabeza
a527de4f92
Adds proposal ballots controller and views
2016-09-07 12:43:12 +02:00
Juanjo Bazán
40cdeb568e
adds missing associations to dev_seeds
2016-09-05 13:11:57 +02:00
Juanjo Bazán
ee2e0b864f
denormalizes investments
2016-09-05 11:56:53 +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
rgarcia
6281af2a7d
adds emailed_at attribute to notifications
2016-08-03 19:33:23 +02:00
Juanjo Bazán
1ad78d599e
adds admin budgets index
2016-07-28 12:36:39 +02:00
rgarcia
35f7f58fa8
removes obsolete attribute reference
2016-07-27 13:03:49 +02:00
rgarcia
3c55d66591
fixes conflicts with budget
2016-07-27 11:41:46 +02:00
rgarcia
68ed041ecb
updates schema
2016-07-20 14:25:29 +02:00
rgarcia
f24a8887bb
fixes conflicts with master
2016-07-19 14:49:27 +02:00
rgarcia
e0e5068c87
updates seeds
...
- investment headings are now required
2016-07-19 14:41:17 +02:00
Andrés Pereira
c5e6735caa
Change madrid.es to consul.dev - closes #1169
2016-07-14 16:28:16 +02:00
rgarcia
98040e191e
fixes conflicts with fork
2016-06-20 21:33:34 +02:00
rgarcia
86fcd4fa76
removes blank space in setting's key
2016-06-16 15:45:33 +02:00
Enrique García
5417adee4a
Merge pull request #1140 from consul/proposal-notifications
...
Proposal notifications and Direct Messages
2016-06-16 12:35:37 +02:00
rgarcia
18dd9c95f3
fixes specs
2016-06-16 12:06:26 +02:00
rgarcia
25ebb325d1
limits maximum number of messages able to send per day
2016-06-16 11:10:26 +02:00
rgarcia
fd67294075
adds option to receive direct messages
2016-06-14 18:20:36 +02:00
rgarcia
6e800c5120
adds email digest for proposal notifications
2016-06-14 17:53:36 +02:00
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
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
a3ffbd77b2
adds missing migration file (external_link)
2016-06-09 13:51:07 +02:00
Juanjo Bazán
3fae269c40
adds missing migration file (external_link)
2016-06-09 13:30:01 +02:00
rgarcia
c3d06c8bd0
adds direct messages
2016-06-08 20:44:54 +02:00
Alberto Garcia Cabeza
0899a0ddb4
Improves styles for budget index and show views
2016-06-07 19:22:15 +02:00
rgarcia
8e12fbdd55
adds time limit between notifications
2016-06-07 13:48:09 +02:00
kikito
118b9c843d
Activates budget in seeds for tests
2016-06-07 11:09:57 +02:00
rgarcia
ad697cd2c1
adds preference to receive proposal notifications
2016-06-06 12:55:33 +02:00
kikito
d57a6c510f
Activates budget setting in dev_seeds
2016-06-03 18:31:05 +02:00
Juanjo Bazán
e4a7989b15
Merge branch 'master' into budget
2016-06-02 12:35:44 +02:00
rgarcia
f5375e813d
stores a proposal notification
2016-06-01 17:23:56 +02:00
kikito
0427395f32
Adds missing currency symbol to dev_seeds
2016-05-31 18:58:50 +02:00
kikito
56f5983dc4
Adds budget dev_seeds
2016-05-31 12:53:11 +02:00
kikito
2409cccd8f
Adds budget.price and ballot.heading_id
2016-05-24 17:38:41 +02:00
