Commit Graph

4181 Commits

Author SHA1 Message Date
Juanjo Bazán
f24886560b removes unused i18n entry 2016-09-01 12:46:43 +02:00
Raimond Garcia
6a0f756a88 Merge pull request #1196 from consul/ckeditor-conf
Ckeditor conf
2016-09-01 12:44:39 +02:00
kikito
fb31a4782f downgrades sprockets to 3.6.3 to avoid warnings 2016-08-30 18:35:53 +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
c84108ae60 updates rails version
(security fix)
2016-08-12 13:41:51 +02:00
Juanjo Bazán
46563f8222 Merge pull request #1194 from consul/notifications-polish
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
24bc8cca20 runs all specs 2016-08-03 20:56:33 +02:00
rgarcia
4f4a5b68e5 runs all spec file 2016-08-03 20:50:37 +02:00
rgarcia
3b5e0b55c0 tries to fix flacky spec 2016-08-03 20:45:36 +02:00
Juanjo Bazán
0f7e23bec4 adds budget's groups & headings to admin 2016-08-03 20:23:41 +02:00
Juanjo Bazán
64a614c67f adds geozone helper to map ids and names 2016-08-03 20:20:52 +02:00
rgarcia
5bd7fdb263 fixes specs 2016-08-03 20:05:08 +02:00
rgarcia
63274dfe08 marks notifications as emailed after rake 2016-08-03 19:48:43 +02:00
rgarcia
0faff2f01c adds specs 2016-08-03 19:33:43 +02:00
rgarcia
b087fe8fb7 refactors email digest 2016-08-03 19:33:37 +02:00
rgarcia
6281af2a7d adds emailed_at attribute to notifications 2016-08-03 19:33:23 +02:00
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
rgarcia
99b9c3867e adds pending spec 2016-08-02 20:52:08 +02:00
Juanjo Bazán
c4768e380d saves querys 2016-07-30 09:56:13 +02:00
Juanjo Bazán
9abf6e1558 updates dependencies
bullet, coveralls, faker, uglifier
2016-07-29 15:13:28 +02:00
Juanjo Bazán
724ccf175c adds budget show to admin 2016-07-29 14:52:37 +02:00
Juanjo Bazán
49bc6533e8 adds explicit permission to admin to read budgets 2016-07-29 13:39:08 +02:00
Juanjo Bazán
6fce9df451 adds admin creation of budgets 2016-07-29 13:34:41 +02:00
Juanjo Bazán
9014de2693 adds budgets_helper 2016-07-29 13:34:11 +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
958cfb1338 adds budgets to admin's menu 2016-07-28 12:37:12 +02:00
Juanjo Bazán
a9c3629de7 adds missing trait to testing factories 2016-07-28 12:37:00 +02:00
Juanjo Bazán
1ad78d599e adds admin budgets index 2016-07-28 12:36:39 +02:00
Juanjo Bazán
baddfdb3d1 adds phase scopes to budget 2016-07-28 12:35:22 +02:00
rgarcia
f21fda0898 fixes pending specs 2016-07-27 16:39:25 +02:00
rgarcia
fa052d990e marks specs as pending 2016-07-27 14:11:08 +02:00
rgarcia
93bfd492d4 marks specs as pending 2016-07-27 13:27:37 +02:00
rgarcia
5ea9f9b00c marks investment specs as pending 2016-07-27 13:05:56 +02:00
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
82db8bb673 adds tmp factory hack 2016-07-27 13:04:31 +02:00
rgarcia
6eab5d79a1 comments out budget for city proposals 2016-07-27 13:04:18 +02:00
rgarcia
35f7f58fa8 removes obsolete attribute reference 2016-07-27 13:03:49 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
7fee1e43ff fixes specs 2016-07-27 11:33:59 +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
2f392a28c3 updates dependencies
sass-rails & sprockets
2016-07-25 13:57:22 +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
68ed041ecb updates schema 2016-07-20 14:25:29 +02:00
rgarcia
1587222cba tmp commit 2016-07-20 14:06:27 +02:00