consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,173 Commits 1 Branch 0 Tags
2b6df62dd74906b51a06d971841db5af5d256aae
Commit Graph

93 Commits

Author SHA1 Message Date
rgarcia
0a6e86ea83 increase delayed job max run time to 30 minutes 2016-12-28 11:41:41 +01:00
rgarcia
c9f62bf2b9 fixes conflicts 2016-12-28 11:41:32 +01:00
Juanjo Bazán
d057c9457d Merge branch 'master' into signature-sheets 2016-12-23 20:23:56 +01:00
Fernando Blat
85ce7d7227 Devise won't read mail from Settings in test environment 2016-12-23 15:45:20 +01:00
Fernando Blat
a07fbc5b41 Extract mailer from name and address to a setting 2016-12-23 11:28:53 +01:00
rgarcia
3c682b8a9b adds signature sheets 2016-12-20 12:21:05 +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
Marcia
680c0636ed expired password last 2016-10-06 14:19:48 +02:00
Marcia
1f72c5cc74 improves expired password view 2016-09-30 10:10:20 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
Marcia
78c6a30424 optimize code 2016-09-27 13:07:06 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
kikito
7ad4a21229 Tries to make ckeditor work correctly with the asset pipeline 
Reference: https://github.com/galetahub/ckeditor/issues/519
 2016-08-30 12:05:46 +02:00
kikito
345e34d422 adds ckeditor config 2016-08-29 16:49:52 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
Andrés Pereira
a4dbd768ce Custom folder structure: initial documentation, code and structure folders 2016-05-31 19:57:29 +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
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
rgarcia
ed1ec1c553 adds votes to spending proposals 2016-03-29 14:53:46 +02:00
kikito
2ac12ef4a9 makes admin/spending_proposal/edit visually pleasant 2016-03-08 15:26:13 +01:00
rgarcia
cd8cbef389 adds filtering of tags for spending proposals 2016-03-08 13:57:58 +01:00
rgarcia
de8b7cdb70 uses a more efficient way of getting category names 2016-02-19 18:45:45 +01:00
rgarcia
a4ff3c6a6d displays categories and districts correctly capitalized 2016-02-19 18:21:45 +01:00
rgarcia
5837c3ac94 uses standard search to create proposal summaries 2016-02-18 17:11:48 +01:00
rgarcia
9409190db1 uses tag ids instead of tag names 2016-02-17 20:53:25 +01:00
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