Commit Graph

3951 Commits

Author SHA1 Message Date
Juanjo Bazán
9e29b96b45 Merge pull request #1142 from consul/improves-accesibility
Shows anonymous messages on focus whit tab
2016-06-07 10:16:22 +02:00
Alberto Garcia Cabeza
0a5369c7b4 Shows anonymous messages on focus whit tab 2016-06-06 18:04:58 +02:00
Alberto Garcia Cabeza
bfc9c6c0df Improves styles for proposal show 2016-06-06 17:51:16 +02:00
Alberto Garcia Cabeza
224c9d42c4 Fixes layout for order comments 2016-06-06 17:47:17 +02:00
Alberto Garcia Cabeza
14f17983f4 Improves styles for about receivers message 2016-06-06 17:30:31 +02:00
Alberto Garcia Cabeza
bdb5a83911 Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications 2016-06-06 17:26:56 +02:00
Alberto Garcia Cabeza
84f9dcaa76 Adds tabs for notifications on proposal show 2016-06-06 17:26:48 +02:00
rgarcia
a2c9756c18 displays message about receivers 2016-06-06 16:50:00 +02:00
rgarcia
86f0cae7bb fixes specs 2016-06-06 13:52:40 +02:00
rgarcia
ad697cd2c1 adds preference to receive proposal notifications 2016-06-06 12:55:33 +02:00
rgarcia
fc6cc090f8 displays notifications in proposal view 2016-06-06 12:21:48 +02:00
kikito
4ade8325d7 css for investments 2016-06-03 18:51:08 +02:00
kikito
e2d88e30fd i18n for investments 2016-06-03 18:51:00 +02:00
kikito
be6d7a1d39 Adds views and helpers for investments 2016-06-03 18:50:49 +02:00
kikito
7051333028 Adds actions to application_controller and investments_controller 2016-06-03 18:50:28 +02:00
kikito
c6c3e22a40 Adds methods for investments in models 2016-06-03 18:44:34 +02:00
kikito
d57a6c510f Activates budget setting in dev_seeds 2016-06-03 18:31:05 +02:00
kikito
9f3b99f0a6 Allows blocks in has_orders concern 2016-06-03 18:30:47 +02:00
Alberto Garcia Cabeza
0ef316de91 Improves styles for proposal notifications 2016-06-02 13:36:41 +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
Juanjo Bazán
c614edf9ef Merge pull request #1141 from consul/design-admin
Design admin
2016-06-02 12:06:49 +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
rgarcia
ca26b3423b sends notification email to each voter 2016-06-01 21:40:23 +02:00
rgarcia
6e4ed0b895 adds link to send message from my activity 2016-06-01 21:01:24 +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
rgarcia
f5375e813d stores a proposal notification 2016-06-01 17:23:56 +02:00
Raimond Garcia
abd1e7edd0 Merge pull request #1139 from tomdemeyer/master
Tests run fine in under 2.3.0
2016-06-01 17:17:54 +02:00
Tom Demeyer
ea3d15996c Tests run fine in under 2.3.0
These two tests fail: 
rspec ./spec/features/legislation_spec.rb:40 # Legislation Annotations Update
rspec ./spec/features/admin/spending_proposals_spec.rb:146 # Admin spending proposals Index Filtering by valuator
Seem not to be ruby issues.
2016-06-01 14:13:15 +02:00
Alberto Garcia Cabeza
fb6dbdf2f9 Improves all pages for admin section 2016-06-01 13:23:57 +02:00
Juanjo Bazán
9db7b2f7c0 Merge pull request #1136 from consul/budget-dev-seed
Adds budget dev_seeds
2016-05-31 21:16:08 +02:00
Andrés Pereira
24a9d77e64 Custom folder structure: verification residence for Madrid 2016-05-31 19:57:37 +02:00
Andrés Pereira
a4dbd768ce Custom folder structure: initial documentation, code and structure folders 2016-05-31 19:57:29 +02:00
kikito
fa6f34bf5c Adds basic Budget controller / views 2016-05-31 19:26:56 +02:00
kikito
0427395f32 Adds missing currency symbol to dev_seeds 2016-05-31 18:58:50 +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
kikito
56f5983dc4 Adds budget dev_seeds 2016-05-31 12:53:11 +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
Juanjo Bazán
6646ce56e5 Merge pull request #1134 from consul/more-budget-model-specs
More budget model specs
2016-05-27 17:43:51 +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
4dd293f487 Adds a ballot spec for amount_available 2016-05-27 15:11:58 +02:00