Commit Graph

4747 Commits

Author SHA1 Message Date
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
Juanjo Bazán
f6525944d3 Merge pull request #1190 from consul/accesibility
Accesibility
2016-07-20 13:17:50 +02:00
Juanjo Bazán
6d2f28b13d removes unused i18n entries 2016-07-20 13:16:59 +02:00
rgarcia
c42a041d3a fixes specs 2016-07-19 16:20:45 +02:00
rgarcia
3f6dc4ff5e updates Readme with reference to Customization instructions 2016-07-19 16:00:42 +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
85d9dd4b84 integrates cancan with budgets 2016-07-19 14:41:55 +02:00
rgarcia
e0e5068c87 updates seeds
- investment headings are now required
2016-07-19 14:41:17 +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
075c6c24b9 Merge pull request #1187 from consul/docs
updates Readme with reference to current features in Docs
2016-07-19 12:35:15 +02:00
rgarcia
a3f5b826d8 updates Readme with reference to current features in Docs 2016-07-19 12:27:19 +02:00
rgarcia
dee1b4ca0f updates updates test coverage badge for spanish Readme 2016-07-19 11:47:19 +02:00
rgarcia
132e7d720f updates test coverage badge 2016-07-19 11:44:16 +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
Juanjo Bazán
0772c8a5ca updates ckeditor version 2016-07-18 14:49:56 +02:00
Juanjo Bazán
1946fa242f updates dependencies
fuubar, groupdate
2016-07-18 14:37:16 +02:00
Raimond Garcia
e98c0ced26 Merge pull request #1184 from andreslucena/docs
Initial version of documentation
2016-07-15 13:30:13 +02:00
Andrés Lucena
c37a96c404 Fixing docs Markdown format and images routes 2016-07-14 18:25:25 +02:00
Andrés Pereira
e8b73947ef Adding initial documentation for users and panels for special users 2016-07-14 18:18:15 +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
Raimond Garcia
d8593f3619 Merge pull request #1183 from andreslucena/fix-consul.dev
Change madrid.es to consul.dev - closes #1169
2016-07-14 17:53:31 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
Juanjo Bazán
9144c7da05 changes travis script
this commit reverts cf50b3743c because Fuubar 
format does not works well with travis/coveralls
2016-07-14 14:01:25 +02:00
Juanjo Bazán
24dfbdceed Merge pull request #1181 from consul/update-foundation-rails
Updates foundation rails gem
2016-07-13 15:47:23 +02:00
Alberto Garcia Cabeza
616e8abe28 Updates foundation rails gem 2016-07-13 14:22:24 +02:00
Juanjo Bazán
cf50b3743c updates travis' script 2016-07-13 12:06:12 +02:00
Juanjo Bazán
1b5f7a0e6e rails up! 2016-07-13 11:48:59 +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
f91385873a updates ruby version in deploy.rb to 2.3.1 2016-07-12 11:21:15 +02:00