rgarcia
|
1c8290faa9
|
refactors budget translations
|
2016-09-02 13:51:16 +02:00 |
|
rgarcia
|
c2c7cdb18d
|
Merge branch 'budget' into budget-public-controllers
|
2016-09-02 13:15:40 +02:00 |
|
rgarcia
|
3e0786b555
|
Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget
|
2016-09-02 13:15:30 +02:00 |
|
rgarcia
|
9003655ccc
|
removes duplicate views
|
2016-09-02 13:10:10 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
Juanjo Bazán
|
0f7e23bec4
|
adds budget's groups & headings to admin
|
2016-08-03 20:23:41 +02:00 |
|
Juanjo Bazán
|
c4768e380d
|
saves querys
|
2016-07-30 09:56:13 +02:00 |
|
Juanjo Bazán
|
724ccf175c
|
adds budget show to admin
|
2016-07-29 14:52:37 +02:00 |
|
Juanjo Bazán
|
6fce9df451
|
adds admin creation of budgets
|
2016-07-29 13:34:41 +02:00 |
|
Alberto Garcia Cabeza
|
3e892c6e76
|
Adds translations and improve example content
|
2016-07-28 19:21:53 +02:00 |
|
Alberto Garcia Cabeza
|
b69308b770
|
Adds example content for admin budget new
|
2016-07-28 13:04:30 +02:00 |
|
Juanjo Bazán
|
958cfb1338
|
adds budgets to admin's menu
|
2016-07-28 12:37:12 +02:00 |
|
Juanjo Bazán
|
1ad78d599e
|
adds admin budgets index
|
2016-07-28 12:36:39 +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 |
|
Juanjo Bazán
|
fb810c1b90
|
Merge pull request #1188 from consul/custom-folders
Custom folders
|
2016-07-21 13:19:52 +02:00 |
|
rgarcia
|
1587222cba
|
tmp commit
|
2016-07-20 14:06:27 +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
|
4ebd9bf0e9
|
renders budget's index view
|
2016-07-19 14:42:07 +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 |
|
Alberto Garcia Cabeza
|
a30d9218d4
|
Deletes alt text for decorative images
|
2016-07-14 18:07:45 +02:00 |
|
Alberto Garcia Cabeza
|
c3d70f6e95
|
Adds text for show comment children
|
2016-07-14 18:02:27 +02:00 |
|
Alberto Garcia Cabeza
|
62a7b32389
|
Adds texts to icons on comments votes
|
2016-07-12 13:55:52 +02:00 |
|
Alberto Garcia Cabeza
|
77b99c1b5c
|
Adds text to icons like and unlike on debates
|
2016-07-12 13:48:55 +02:00 |
|
Alberto Garcia Cabeza
|
f3e0626709
|
Adds text to notifications icons on header
|
2016-07-12 13:24:49 +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
|
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
|
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
|
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
|
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 |
|