rgarcia
|
7d34621c1c
|
removes duplicate code
|
2016-07-27 13:05:00 +02:00 |
|
rgarcia
|
464673a7aa
|
creates setter association for budget investments
|
2016-07-27 13:04:52 +02:00 |
|
rgarcia
|
6eab5d79a1
|
comments out budget for city proposals
|
2016-07-27 13:04:18 +02:00 |
|
rgarcia
|
3c55d66591
|
fixes conflicts with budget
|
2016-07-27 11:41:46 +02:00 |
|
rgarcia
|
7172e5a23d
|
updates link to paths
|
2016-07-27 11:33:49 +02:00 |
|
rgarcia
|
403f048f3f
|
updates calls to new method names
|
2016-07-27 11:33:41 +02:00 |
|
rgarcia
|
f7810d44dd
|
updates translations
|
2016-07-27 11:33:18 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +02:00 |
|
rgarcia
|
f24a8887bb
|
fixes conflicts with master
|
2016-07-19 14:49:27 +02:00 |
|
rgarcia
|
4ebd9bf0e9
|
renders budget's index view
|
2016-07-19 14:42:07 +02:00 |
|
rgarcia
|
85d9dd4b84
|
integrates cancan with budgets
|
2016-07-19 14:41:55 +02:00 |
|
rgarcia
|
33a44fc470
|
uses a module to structure controller code
|
2016-07-19 13:49:00 +02:00 |
|
rgarcia
|
1e35ca4895
|
adds budget structure for views and controllers
|
2016-07-19 13:16:30 +02:00 |
|
Juanjo Bazán
|
dc7ee45766
|
uses before_action instead of before_filter
before_filter is deprecated
|
2016-07-18 14:50:28 +02:00 |
|
Alberto Garcia Cabeza
|
616e8abe28
|
Updates foundation rails gem
|
2016-07-13 14:22:24 +02:00 |
|
Raimond Garcia
|
50cbce2283
|
Merge pull request #1179 from consul/setting-helper
makes sure setting helper is used in views
|
2016-07-08 15:09:53 +02:00 |
|
Juanjo Bazán
|
7f01dbdca2
|
makes sure setting helper is used in views
|
2016-07-08 14:42:28 +02:00 |
|
Alberto Garcia Cabeza
|
e55fdc42ee
|
Updates classes names for social share button
|
2016-07-08 14:13:13 +02:00 |
|
Alberto Garcia Cabeza
|
702cfe13d1
|
Fixes specs
|
2016-07-06 14:47:09 +02:00 |
|
Alberto Garcia Cabeza
|
42722080fc
|
Changes references to Madrid
|
2016-07-05 13:47:14 +02:00 |
|
Alberto Garcia Cabeza
|
ece2f6f019
|
Removes Madrid references on pages
|
2016-07-04 18:07:45 +02:00 |
|
rgarcia
|
96630f88f2
|
takes into account emails separated by commas without spaces
|
2016-06-29 21:46:03 +02:00 |
|
rgarcia
|
ad1720ba02
|
uses applications's default locale
|
2016-06-27 23:38:23 +02:00 |
|
rgarcia
|
745de9bb77
|
sends invitation email to users
|
2016-06-27 23:37:58 +02:00 |
|
Alberto Garcia Cabeza
|
0bb948a013
|
Updates mailer texts
|
2016-06-27 16:01:03 +02:00 |
|
Alberto Garcia Cabeza
|
a2a2960867
|
Adds mailer template for user invites
|
2016-06-27 15:37:45 +02:00 |
|
Alberto Garcia Cabeza
|
947b2bcb0d
|
Adds user invites views on management
|
2016-06-27 14:25:20 +02:00 |
|
kikito
|
73d3d0c8c3
|
hides the retire proposal link for admins in User#show
|
2016-06-23 17:48:30 +02:00 |
|
Alberto Garcia Cabeza
|
0972f5284a
|
Creates new scss file for IE styles
|
2016-06-23 13:56:57 +02:00 |
|
rgarcia
|
1f7e86e206
|
fixes specs
|
2016-06-20 22:06:49 +02:00 |
|
rgarcia
|
00dbbd0689
|
fixes specs (unauthenticated users can view spending proposal show)
|
2016-06-20 21:54:45 +02:00 |
|
rgarcia
|
9e910a834b
|
Displays badge for official positions
|
2016-06-20 21:37:25 +02:00 |
|
rgarcia
|
51d688897a
|
displays badge option if official position is level 1
|
2016-06-20 21:37:03 +02:00 |
|
rgarcia
|
98040e191e
|
fixes conflicts with fork
|
2016-06-20 21:33:34 +02:00 |
|
Alberto Garcia Cabeza
|
3299b595aa
|
Adds info text on proposal notification digest
|
2016-06-20 16:28:56 +02:00 |
|
Enrique García
|
588a2d84e4
|
Merge pull request #1154 from consul/stats
Adds stats for proposal notifications and direct messages
|
2016-06-16 18:42:10 +02:00 |
|
rgarcia
|
3c2098eb14
|
improves legibility of counts
|
2016-06-16 18:40:05 +02:00 |
|
rgarcia
|
b7e3129ec1
|
uses more efficient count
|
2016-06-16 18:35:34 +02:00 |
|
Alberto Garcia Cabeza
|
352f3fa2f9
|
Resolves conflicts and improves styles for stats
|
2016-06-16 18:07:13 +02:00 |
|
rgarcia
|
f9a2f5d5dc
|
adds specs for stats
|
2016-06-16 17:59:56 +02:00 |
|
rgarcia
|
0abc9c8376
|
adds stats for direct messages and proposal notifications
|
2016-06-16 17:42:16 +02:00 |
|
rgarcia
|
d40af1e94c
|
do not display button to send message to myself
|
2016-06-16 16:05:09 +02:00 |
|
rgarcia
|
8ee7d535ba
|
generic message for max_per_day setting
|
2016-06-16 15:54:19 +02:00 |
|
Alberto Garcia Cabeza
|
7f20d4eb23
|
Improves styles for admin pages
|
2016-06-16 13:44:06 +02:00 |
|
rgarcia
|
18dd9c95f3
|
fixes specs
|
2016-06-16 12:06:26 +02:00 |
|
rgarcia
|
b3fd5e225a
|
Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications
|
2016-06-16 11:23:23 +02:00 |
|
rgarcia
|
91860cb409
|
validates that a user does not want to receive direct messages
|
2016-06-16 11:23:03 +02:00 |
|
rgarcia
|
25ebb325d1
|
limits maximum number of messages able to send per day
|
2016-06-16 11:10:26 +02:00 |
|
Alberto Garcia Cabeza
|
9f7b49838d
|
Improves texts for the sender's email
|
2016-06-15 21:37:36 +02:00 |
|
Alberto Garcia Cabeza
|
c83e831cb7
|
Adds link to not receive direct messages
|
2016-06-15 21:28:17 +02:00 |
|