Juanjo Bazán
16edbf15a2
Merge pull request #1620 from consul/medialab-legislation
...
Adds Collaborative Legislation
2017-06-07 18:06:15 +02:00
Juanjo Bazán
77b596b285
updates rubocop (sec fix)
...
fixes a current vulnerability in /tmp directory
(https://github.com/bbatsov/rubocop/commit/dcb258fabd5f2624c1ea0e1634763
094590c09d7)
2017-06-03 13:07:02 +02:00
rgarcia
1a46b4d4cb
fixes conflicts with master
2017-05-31 10:36:38 +02:00
Bertocq
6b89bdd17d
Revert Gemfile.lock changes by mistake, also remove Gemfile gem version specification
2017-05-23 20:26:39 +02:00
Bertocq
d922d093ee
Add specifiy version to multiple gems that didn't had one at the Gemfile
2017-05-23 19:52:14 +02:00
rgarcia
2a7ff2270e
sends zip file with test data
2017-05-23 16:45:34 +02:00
decabeza
5e0d5fc8c3
Merge branch 'legislation-module-stable' of https://github.com/medialab-prado/consul into medialab-legislation
2017-05-22 18:43:49 +02:00
Juanjo Bazán
9470204286
security upgrades
2017-05-16 11:09:18 +02:00
Juanjo Bazán
887e40bb59
updates dependencies
2017-05-05 11:32:13 +02:00
Juanjo Bazán
f80019aa1f
updates ahoy
2017-05-01 12:35:57 +02:00
Juanjo Bazán
29e5cff13f
updates capistrano
2017-05-01 12:20:52 +02:00
Juanjo Bazán
d8716cc72d
updates gem versions
2017-05-01 12:19:24 +02:00
Juanjo Bazán
b5e1ba9a53
updates gems
2017-04-17 18:55:19 +02:00
Amaia Castro
8143fe1037
Site customization: images uploads
2017-04-06 17:00:04 +02:00
Amaia Castro
5ee2c9efa0
Add telegram to footer and to social share button
2017-04-05 13:07:08 +02:00
Juanjo Bazán
18bce501ce
updates development dependencies
2017-03-24 21:40:30 +01:00
Juanjo Bazán
865a9e78a4
updates runtime dependencies
2017-03-24 21:32:51 +01:00
Amaia Castro
483d7c6e2b
Merge branch 'master' into legislation-module-stable
2017-03-17 18:08:22 +01:00
Juanjo Bazán
d0ada34631
rails version up to 4.2.8
2017-03-14 12:01:46 +01:00
rgarcia
c6617e5c4a
updates minor gem versions
2017-03-13 11:57:58 +01:00
Amaia Castro
a2a61341fe
Merge branch 'master' into legislation-module-stable
2017-01-11 22:54:41 +01:00
Raimond Garcia
f2dc822bfa
Merge pull request #1334 from consul/budgets
...
WIP Budgets
2017-01-10 22:43:27 +01:00
Amaia Castro
068c2c9f3d
Merge branch 'master' into legislation-module-stable
2017-01-09 09:27:38 +01:00
rgarcia
6688832f8c
updates dependencies
2017-01-05 01:02:07 +01:00
Amaia Castro
d25d6c178c
Legislation Questions model and basic admin
2016-12-20 18:52:43 +01:00
Alberto Garcia Cabeza
149f4f2ccb
updates foundation rails gem
2016-12-20 17:17:44 +01:00
Alberto Garcia Cabeza
fd6886d98e
downgrades foundation rails gem version
2016-12-19 18:20:44 +01:00
Amaia Castro
8c9cfa8b3f
Merge branch 'master' into legislation-module-stable
2016-12-14 11:48:28 +01:00
kikito
d5065fe021
fixes typo: ammount -> amount
2016-12-14 11:11:06 +01:00
Amaia Castro
715d9e5b88
Markdown editor for DraftVersion body
2016-12-12 11:10:10 +01:00
Juanjo Bazán
e47fc17992
updates minor dependencies
2016-12-09 20:39:46 +01:00
Julian Herrero
a175b5bc9b
add gem sitemap_generator
2016-12-02 11:26:46 +01:00
kikito
f0b8cfd4a2
Time.now -> Time.current
2016-11-23 19:19:19 +01:00
kikito
619c77f615
bundle update unicorn
2016-11-22 12:44:08 +01:00
kikito
a4d840c9c6
bundle update omniauth
2016-11-22 12:44:08 +01:00
kikito
2050e1411e
updates cancancan
2016-11-22 12:44:08 +01:00
kikito
6b24061bdc
updates rack gem
2016-11-22 12:44:08 +01:00
kikito
dcebcc41cb
Updates browser gem
2016-11-22 12:44:08 +01:00
kikito
695fc93b67
updates ancestry
2016-11-22 12:44:08 +01:00
Enrique García
ae2a6d6498
Merge pull request #1268 from consul/knapsack
...
Reduces build time using parallel builds
2016-11-22 10:37:12 +01:00
rgarcia
a1095089af
configures up to date capistrano rvm gem
2016-11-21 10:15:34 +01:00
rgarcia
f3512a4a6f
tries to speed up build with knapsack
2016-11-19 20:13:51 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
rgarcia
29905b61b7
Sets gem versions to equal to or greater than in the last digit
2016-10-28 12:36:58 +02:00
rgarcia
4979b6859a
updates minor version dependencies
2016-10-26 00:34:23 +02:00
Raimond Garcia
4a1e34c415
Merge pull request #1106 from gitmarcia/admin_password_expired
...
Expire admin passwords once a year #885
2016-10-06 16:27:11 +02:00
Juanjo Bazán
407c6e022d
updates capistrano-rails
2016-10-03 14:40:06 +02:00
Juanjo Bazán
263bef42bc
updates dependencies
...
all minor upgrades
2016-10-03 14:36:05 +02:00
Marcia
4269f3810b
Merge remote-tracking branch 'upstream/master' into admin_password_expired
2016-09-27 13:26:08 +02:00
kikito
dc74a180b6
updates initial.js to support unicode
2016-09-21 12:22:16 +02:00
