rgarcia
|
21c2220626
|
fixes typo
|
2016-06-08 12:30:53 +02:00 |
|
rgarcia
|
34304a0b5e
|
fixes conflicts with master
|
2016-06-07 23:19:01 +02:00 |
|
rgarcia
|
16f10e34ef
|
fixes specs
|
2016-06-07 23:17:00 +02:00 |
|
rgarcia
|
51f4acef91
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-07 22:03:29 +02:00 |
|
rgarcia
|
a0ddde16e9
|
adds notifications for proposals
|
2016-06-07 22:03:14 +02:00 |
|
Alberto Garcia Cabeza
|
0899a0ddb4
|
Improves styles for budget index and show views
|
2016-06-07 19:22:15 +02:00 |
|
Alberto Garcia Cabeza
|
e866d9c2df
|
Merge branch 'proposal-notifications' of github.com:consul/consul into proposal-notifications
|
2016-06-07 16:12:26 +02:00 |
|
Alberto Garcia Cabeza
|
e550a40f90
|
Adds share and comment button on email
|
2016-06-07 16:12:16 +02:00 |
|
rgarcia
|
ea90869114
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-07 14:05:19 +02:00 |
|
rgarcia
|
43251585b9
|
pending permissions spec
|
2016-06-07 13:56:40 +02:00 |
|
rgarcia
|
8e12fbdd55
|
adds time limit between notifications
|
2016-06-07 13:48:09 +02:00 |
|
kikito
|
8cc2cd0eb1
|
Adds investment specs (WIP)
|
2016-06-07 11:13:08 +02:00 |
|
kikito
|
630a4878a8
|
Adds a lot of views (WIP)
|
2016-06-07 11:12:58 +02:00 |
|
kikito
|
43aec952bf
|
Adds route for ballot & ballot lines
|
2016-06-07 11:12:29 +02:00 |
|
kikito
|
5f5e7b7c07
|
Adds vote extensions to handle budget_investments
|
2016-06-07 11:12:11 +02:00 |
|
kikito
|
d1311438e7
|
Sets the random seed in the investments_controller
|
2016-06-07 11:11:00 +02:00 |
|
kikito
|
1aa70bec94
|
Adds method Ballot#has_investment?
|
2016-06-07 11:10:42 +02:00 |
|
kikito
|
888fb82227
|
Includes a default unfeasibility_explanation when creating an unfeasible Investment
|
2016-06-07 11:10:15 +02:00 |
|
kikito
|
118b9c843d
|
Activates budget in seeds for tests
|
2016-06-07 11:09:57 +02:00 |
|
kikito
|
a9dbc6160a
|
Fixes typo in ApplicationController
|
2016-06-07 11:09:43 +02:00 |
|
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 |
|