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
Juanjo Bazán
47a6480652
updates monitoring dependencies
2016-06-28 21:30:22 +02:00
Andrés Pereira
a4dbd768ce
Custom folder structure: initial documentation, code and structure folders
2016-05-31 19:57:29 +02:00
Juanjo Bazán
956c539e09
updates dependencies
2016-05-21 22:22:00 +02:00
kikito
1d93207744
uses invisible_captcha 0.8.2
2016-04-28 11:12:07 +02:00
kikito
4b74a69680
Points Gemfile to invisible_captcha's git repo
2016-04-27 16:07:48 +02:00
kikito
eedf02a186
Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile
2016-04-27 16:07:48 +02:00
kikito
54a3cc40b7
Adds invisible_captcha gem
2016-04-27 16:07:48 +02:00
kikito
dea1a28a69
purges simple_captcha
2016-04-27 16:07:47 +02:00
Juanjo Bazán
13aa83f277
updates dependencies
2016-04-25 18:53:27 +02:00
Juanjo Bazán
87d2d74f66
updates devise & ahoy
2016-04-19 13:27:16 +02:00
Juanjo Bazán
038a520987
updates dependencies and specs
2016-04-19 13:05:08 +02:00
Juanjo Bazán
0c524a0733
updates dependencies
2016-04-02 21:48:22 +02:00
rgarcia
7a141b8147
updates jwt gem
2016-03-28 11:19:36 +02:00
Alberto García Cabeza
3f63c5af7b
Merge pull request #985 from Ana06/master
...
Share with WhatsApp
2016-03-21 11:33:14 +01:00
Juanjo Bazán
e7deea8d02
updates gemfile
2016-03-19 12:23:50 +01:00
Ana
8119df26fb
Use of fontastic instead of font-awesome
2016-03-12 22:20:35 +01:00
Ana
927b1e8e5d
Share with WhatsApp in debates
2016-03-11 00:21:39 +01:00
Juanjo Bazán
70627148fe
rails up to v4.2.6 🎉
2016-03-09 14:40:57 +01:00
kikito
3e36efffb6
Updates devise gem
2016-03-04 16:24:09 +01:00
Juanjo Bazán
69325132ce
Merge pull request #884 from consul/foundation_6
...
Includes Foundation 6 🎉
2016-03-01 18:57:36 +01:00
Juanjo Bazán
38dcdf1917
updates Rails version (security release)
2016-02-29 23:36:15 +01:00
Alberto Garcia Cabeza
3752f3a53b
Adds foundation 6 🎉
2016-02-26 19:33:33 +01:00
rgarcia
08d9a3eb3e
updates rollbar gem version
2016-02-17 18:03:07 +01:00
Juanjo Bazán
7b09a73861
rails up to security release 4.2.5.1
2016-01-25 21:44:57 +01:00
Juanjo Bazán
03f2b8d7c1
devise up
2016-01-23 22:59:51 +01:00
rgarcia
e85ba440b6
configures jquery datepicker
2016-01-20 12:24:37 +01:00
Antonio Tapiador del Dujo
9610a6a933
Adds Tolk gem for i18n web interface
...
Closes #793
2016-01-14 14:57:06 +01:00
Juanjo Bazán
e165f1de9f
updates dependencies
2016-01-12 13:32:43 +01:00
