consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,895 Commits 1 Branch 0 Tags
c1bf89a09eb244be92dea262fe51df16d5a8e9d9
Commit Graph

1016 Commits

Author SHA1 Message Date
rgarcia
9570d79ee0 ignores missing and unused budget i18n keys 2016-09-02 13:51:22 +02:00
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
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
Juanjo Bazán
f24886560b removes unused i18n entry 2016-09-01 12:46:43 +02:00
kikito
7ad4a21229 Tries to make ckeditor work correctly with the asset pipeline 
Reference: https://github.com/galetahub/ckeditor/issues/519
 2016-08-30 12:05:46 +02:00
kikito
345e34d422 adds ckeditor config 2016-08-29 16:49:52 +02:00
Juanjo Bazán
0f7e23bec4 adds budget's groups & headings to admin 2016-08-03 20:23:41 +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
6bb09185e4 makes i18n-tasks ignore filter keys in budgets 2016-07-28 12:40:57 +02:00
Juanjo Bazán
1ad78d599e adds admin budgets index 2016-07-28 12:36:39 +02:00
rgarcia
7d34621c1c removes duplicate code 2016-07-27 13:05:00 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +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
Juanjo Bazán
6d2f28b13d removes unused i18n entries 2016-07-20 13:16:59 +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
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
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Juanjo Bazán
f91385873a updates ruby version in deploy.rb to 2.3.1 2016-07-12 11:21:15 +02:00
Juanjo Bazán
575d9a1998 updates capistrano 2016-07-11 14:21:54 +02:00
Alberto Garcia Cabeza
d24efbad60 Changes .com urls examples to .consul 2016-07-06 12:32:07 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
22e1b533bc Removes Madrid from translations 2016-07-04 18:06:51 +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
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
Alberto Garcia Cabeza
e01162bc7a Changes message for ie alert 2016-06-22 11:17:27 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Alberto Garcia Cabeza
ecd9d514af Improves translation 2016-06-20 16:33:08 +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
32736110f9 adds missing translation 2016-06-16 18:20:14 +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
Alberto Garcia Cabeza
38fded40d8 Changes translations 2016-06-16 16:22:48 +02:00
rgarcia
8ee7d535ba generic message for max_per_day setting 2016-06-16 15:54:19 +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