Commit Graph

416 Commits

Author SHA1 Message Date
rgarcia
72b8c24470 moves category_names method to Tag class 2016-02-16 16:23:20 +01:00
kikito
4bac9e6ea1 updates oauth code to handle faulty facebook responses better 2016-01-27 18:36:22 +01:00
kikito
1617f7295c requests omniauth facebook email 2016-01-26 18:15:39 +01:00
Josep Jaume Rey Peroy
cf00f12ec7 Store locale in a user's field and switch locale on mailers 2016-01-22 18:10:28 +01:00
Josep Jaume Rey Peroy
1c9a4c8ec6 Use secret_key_base as devise's secret key 2016-01-21 08:52:23 +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
4f4f005328 removes i18n memorization for development env 2015-12-18 17:47:22 +01:00
Juanjo Bazán
7998daef7f memoizes i18n keys 2015-12-18 17:39:32 +01:00
Juanjo Bazán
328bd767ca adds js file for IE eyes only 2015-12-14 12:56:50 +01:00
Juanjo Bazán
b946f31fc7 changes 'participacion' to 'consul' in config 2015-11-23 14:10:46 +01:00
kikito
6193dee20f removes geocoding from ahoy 2015-11-03 16:11:09 +01:00
Alberto Garcia Cabeza
68b866171b Adds styles for management pages 2015-10-13 23:49:12 +02:00
Juanjo Bazán
8c99c6a5f0 refactors stats and optimizes js
JS libraries for stats (d3, c3, etc.) only load now when needed (stats/show)
2015-09-23 19:37:24 +02:00
kikito
d71a404661 Adds more methods to ActsAsTaggableOn 2015-09-17 16:53:21 +02:00
kikito
fedefa215f Increases/decreases custom counters when taggings are created/destroyed 2015-09-17 12:50:14 +02:00
rgarcia
ad8880d02c adds proposal votes 2015-09-13 21:56:52 +02:00
kikito
07b99fcf19 fixes kaminari inability to pluralize spanish names 2015-09-12 18:39:29 +02:00
rgarcia
f2b917d486 adds proposal show 2015-09-12 12:30:20 +02:00
kikito
43bdfb940e merges master and fixes conflicts 2015-09-10 17:47:40 +02:00
Juanjo Bazán
8e1dcdc16a fix bug on tag deletion when no taggable 2015-09-10 13:52:39 +02:00
Raimond Garcia
02c101cd97 Merge pull request #453 from AyuntamientoMadrid/ie8
Ie8
2015-09-09 23:51:31 +02:00
Alberto Garcia Cabeza
dba3385a6c Adds rem and respond js 2015-09-09 20:32:38 +02:00
kikito
8c9f189d75 merges master and fixes conflicts 2015-09-09 19:36:23 +02:00
rgarcia
6a09e6548d reverts - stats with delayed jobs 2015-09-09 19:17:13 +02:00
kikito
86e1974a58 monkeypatches foundation_rails_helper so it shows an error div after ckeditor 2015-09-09 18:36:03 +02:00
rgarcia
dca7e1e38f moves stats storing to queue 2015-09-09 14:41:19 +02:00
rgarcia
cdc914de0d moves storing of visits to queue 2015-09-09 14:41:19 +02:00
rgarcia
c6886cfad6 fixes typo 2015-09-06 13:42:31 +02:00
rgarcia
994af94253 enables rollbar in staging env 2015-09-06 13:38:19 +02:00
rgarcia
2461ab3c4a disables delayed jobs in dev 2015-09-03 23:31:14 +02:00
rgarcia
a5e7b1b166 disables asynchronous sending of devise emails in test env 2015-09-03 23:11:02 +02:00
rgarcia
71aaef3805 sends devise emails with delayed_jobs 2015-09-03 22:59:25 +02:00
rgarcia
8a950761d3 configures delayed_jobs 2015-09-03 22:47:54 +02:00
rgarcia
e1d6319953 enable rollbar only in pre and pro envs 2015-09-01 19:48:35 +02:00
rgarcia
c350dcfff4 configures rollbar gem 2015-09-01 18:41:28 +02:00
Raimond Garcia
3c665153d4 Merge pull request #300 from AyuntamientoMadrid/flag-helper
Flag helper
2015-09-01 15:19:16 +02:00
kikito
c2faf0ef92 Merge Vote.in with Vote.for_debates 2015-09-01 13:08:32 +02:00
Juanjo Bazán
c9e688fc72 changes devise's défault email address 2015-09-01 11:45:11 +02:00
Juanjo Bazán
a00abc0020 adds touch to debates on tag destroy 2015-08-31 20:26:30 +02:00
Juanjo Bazán
7753bd35c8 pluralizes organización 2015-08-29 13:49:32 +02:00
Juanjo Bazán
a0592ea16b adds ckeditor files to asset pipeline 2015-08-28 12:30:33 +02:00
Alberto Garcia Cabeza
86369200ba Adds mailer layout to instructions emails 2015-08-26 19:42:51 +02:00
David Gil
59aede5b00 adds Google OAuth2 support 2015-08-25 14:15:24 +02:00
David Gil
86dccac9c6 adds support for Facebook OAuth 2015-08-24 20:24:54 +02:00
David Gil
158e203936 adds omniauth basic authentication process with Twitter, including an intermediate step to ask the user for her email if not provided by the OAuth provider - Twitter, for instance 2015-08-24 20:24:54 +02:00
David Gil
88eb8a6cc4 adds omniauth and omniauth-twitter gems and initializer with references to secrets 2015-08-24 20:22:21 +02:00
kikito
b28f63b016 merges master and fixes conflicts 2015-08-18 09:35:13 +02:00
Juanjo Bazán
7e1cd2940d Fix conflicts 2015-08-17 21:08:15 +02:00
Juanjo Bazán
635dfba418 adds kaminari config file
it is empty now, showing the defaults
2015-08-17 17:03:48 +02:00
kikito
42b441a866 fixes specs by using the correct capthca helper instead of deactivating it 2015-08-17 12:29:42 +02:00