Alberto Miedes Garcés
5d9054d284
Merge branch 'master' into api-dev-PRs
...
Conflicts:
Gemfile.lock
config/routes.rb
db/dev_seeds.rb
db/schema.rb
2017-05-11 21:59:42 +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
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
Alberto Miedes Garcés
5b7cbccd19
Merge branch 'master' into api-dev
2017-01-26 12:39:59 +01:00
Alberto Miedes Garcés
7a9373942a
Testing GraphQL 1.3.0 in Travis
2017-01-12 20:11:47 +01:00
rgarcia
6688832f8c
updates dependencies
2017-01-05 01:02:07 +01:00
Alberto Miedes Garcés
a2befe6bc1
Remove unused gem
2017-01-02 11:30:10 +01:00
Alberto Miedes Garcés
eadceb106c
Only mount graphiql in development environment
2017-01-02 11:27:56 +01:00
Alberto Miedes Garcés
d4b049175c
Merge branch 'master' into api-dev-0.18.11
2016-12-26 12:55:17 +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
Juanjo Bazán
e47fc17992
updates minor dependencies
2016-12-09 20:39:46 +01:00
Alberto Miedes Garcés
fdea4ad6ac
Merge branch 'master' into api-dev
2016-12-03 13:53:13 +01:00
Julian Herrero
a175b5bc9b
add gem sitemap_generator
2016-12-02 11:26:46 +01:00
Alberto Miedes Garcés
0eae2fada6
Refactor GraphQL controller specs
2016-11-27 13:50:01 +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
Alberto Miedes Garcés
8b30aaa6d4
Merge branch 'master' into api-dev
2016-11-18 16:40:33 +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
Alberto Miedes Garcés
c42bfbc9a0
Merge branch 'master' into api-coding-madrid
2016-11-10 22:33:27 +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
Alberto Miedes Garcés
f5926a367e
Merge remote-tracking branch 'remotes/consul/master' into api-graphql-dev
2016-10-06 15:10:35 +02:00
Juanjo Bazán
407c6e022d
updates capistrano-rails
2016-10-03 14:40:06 +02:00
Alberto Miedes Garcés
df5caea56f
Installed needed gems for GraphQL
2016-09-28 12:45:34 +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
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +02:00
kikito
fb31a4782f
downgrades sprockets to 3.6.3 to avoid warnings
2016-08-30 18:35:53 +02:00
Juanjo Bazán
c84108ae60
updates rails version
...
(security fix)
2016-08-12 13:41:51 +02:00
rgarcia
a23666683f
fixes conflicts with master
2016-07-19 15:50:22 +02:00
Juanjo Bazán
0772c8a5ca
updates ckeditor version
2016-07-18 14:49:56 +02:00
Juanjo Bazán
1b5f7a0e6e
rails up!
2016-07-13 11:48:59 +02:00
Juanjo Bazán
575d9a1998
updates capistrano
2016-07-11 14:21:54 +02:00
Juanjo Bazán
511d223612
updates dependencies
...
coffee-rails, foundation_rails_helper
2016-07-11 12:53:09 +02:00
Juanjo Bazán
23ff4d2203
updates development dependencies
2016-07-11 11:09:10 +02:00
Juanjo Bazán
c147ea227b
updates dependencies
2016-07-10 23:24:02 +02:00
Alberto Garcia Cabeza
811dcc20b2
Updates Gemfile
2016-07-08 10:50:55 +02:00
