consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,771 Commits 1 Branch 0 Tags
cb15a2e25b3db45815f23589797812884785b35c
Commit Graph

8771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto Garcia Cabeza
ad9e2cc637 Adds styles for social share and auth 2015-08-26 20:32:48 +02:00
Raimond Garcia
9ab13abf20 Merge pull request #256 from AyuntamientoMadrid/improve_emails 
Improve emails
 2015-08-26 20:06:28 +02:00
Raimond Garcia
4bd5ff0116 Merge pull request #253 from AyuntamientoMadrid/counter-cache-comments 
Counter cache column for Debate's comments
 2015-08-26 20:05:57 +02:00
Raimond Garcia
59dadb96e2 Merge pull request #255 from AyuntamientoMadrid/bullet 
Bullet
 2015-08-26 20:01:59 +02:00
Alberto Garcia Cabeza
33b501d98e Improves texts for instructions emails 2015-08-26 19:43:51 +02:00
Alberto Garcia Cabeza
4382a83c30 Fixes asset host for development 2015-08-26 19:43:12 +02:00
Alberto Garcia Cabeza
86369200ba Adds mailer layout to instructions emails 2015-08-26 19:42:51 +02:00
kikito
b9634cffab Adds User#for_render 2015-08-26 19:41:55 +02:00
kikito
48ef4df0c3 Adds Comment#for_render 2015-08-26 19:41:42 +02:00
kikito
9112cacde4 Adds Debate#for_render 2015-08-26 19:40:37 +02:00
Alberto Garcia Cabeza
8ac5abb7bc Updates custom icons font 2015-08-26 19:06:12 +02:00
Alberto Garcia Cabeza
522e40b9ce Adds styles to instructions emails 2015-08-26 18:51:53 +02:00
Alberto Garcia Cabeza
4e8b281a23 Adds styles to comment and reply emails 2015-08-26 18:51:29 +02:00
Juanjo Bazán
dacbe27fda uses cache counter for debate's comments 2015-08-26 17:26:17 +02:00
Juanjo Bazán
5d112ac2bf adds after_hide hook to paranoid aliases 2015-08-26 17:24:11 +02:00
Juanjo Bazán
ca3f8daab9 adds comments counte cache column to debate 2015-08-26 17:24:10 +02:00
kikito
048f7c9b73 Adds bullet to dev & test, but makes it visible only on-demmand 
The logs are always stored in log/bullet.log

If you run the specs with `BULLET=true bin/rspec`:
* Any feature test which makes bullet angry will fail

If you run rails with `BULLET=true bin/rails s`:
* It will print the bullet logs in both the rails log and the bullet log
* It will show a footer on each page with the N+1 queries etc.
 2015-08-26 17:24:08 +02:00
kikito
d2665e4ef0 adds bullet to gemfile 2015-08-26 16:51:58 +02:00
Enrique García
54bed9e515 Merge pull request #252 from AyuntamientoMadrid/votes-cache-counters 
Votes cache counters
 2015-08-26 16:50:22 +02:00
kikito
4e86586e7d fixes error in db/schema.rb 2015-08-26 14:51:54 +02:00
kikito
25c3c4d1f1 merges master and fix conflicts 2015-08-26 14:48:16 +02:00
kikito
c9ca3877e8 adds only the needed cahced fields to comments and debates; 2015-08-26 14:46:51 +02:00
Enrique García
a2b240c360 Merge pull request #251 from AyuntamientoMadrid/flag_inappropriate 
Flag as inappropriate styles
 2015-08-26 14:12:28 +02:00
kikito
6110284356 removes all references to "review" (replaced by "archive") 2015-08-26 13:48:57 +02:00
kikito
3b3f25f14e merges with master 2015-08-26 13:22:07 +02:00
kikito
015fe704e4 Fixes flagging specs by making them id-based instead of text-based 2015-08-26 13:14:42 +02:00
kikito
5eeb89584b Fixes a couple specs which fail with the new words (ArchiveD vs Archive) 2015-08-26 13:14:07 +02:00
Juanjo Bazán
46bd0f2c7f adds basic style/content to moderation dashboard 2015-08-26 12:24:37 +02:00
rgarcia
e219e5be4d adds force ssl to staging 2015-08-26 12:22:58 +02:00
rgarcia
c13aea5f1d removes force ssl from staging 2015-08-26 12:03:28 +02:00
rgarcia
30d996da84 force ssl in staging 2015-08-26 12:00:34 +02:00
rgarcia
1a806db80d removes ssl from production env 2015-08-26 11:46:09 +02:00
rgarcia
98c6f6561c removes force ssl in staging env 2015-08-26 11:37:41 +02:00
David Rodríguez
d9b067e9b2 updates ruby version to 2.2.3 2015-08-26 05:37:26 -03:00
Juanjo Bazán
616566a05d Merge pull request #248 from deivid-rodriguez/simplify_readme_commands 
simplifies commands in readme
 2015-08-26 10:32:21 +02:00
David Rodríguez
70b40b6ce8 simplifies redundant commands in README 
Use either `bundle exec` or bundler generated binstubs, but not both.
Since you are committing binstubs to source control, I assume you want
the latter.
 2015-08-26 05:17:55 -03:00
kikito
c183cf2cc6 merges master and fix conflicts 2015-08-25 19:31:25 +02:00
Enrique García
44ec0cb76d Merge pull request #244 from AyuntamientoMadrid/organization-login-226 
Organization login 226
 2015-08-25 19:25:34 +02:00
kikito
f47fbe82d5 Uses *_html tags instead of calling raw in the view 2015-08-25 19:22:57 +02:00
Alberto Garcia Cabeza
82c404092a fixes conflicts [#226] 2015-08-25 16:53:11 +02:00
Alberto Garcia Cabeza
7d17209be6 Adds styles for organization success registration [#226] 2015-08-25 16:47:53 +02:00
Juanjo Bazán
6ead1a2c1d adds cache to votes on Debates 2015-08-25 16:26:36 +02:00
Juanjo Bazán
cfe583fbe6 adds cache to votes on Comments 2015-08-25 16:26:36 +02:00
Juanjo Bazán
96dc85d1a5 adds cache columns to acs_as_votable models 2015-08-25 16:26:36 +02:00
Raimond Garcia
6bfe369e7d Merge pull request #242 from AyuntamientoMadrid/ssl 
configures ssl for staging and production environments
 2015-08-25 16:09:27 +02:00
Raimond Garcia
320e41e0f3 Merge pull request #238 from dgilperez/issue-19 
Adding Omniauth for sign up and sign in
 2015-08-25 16:03:26 +02:00
Alberto Garcia Cabeza
8bdf03c50d Changes some test for moderation 2015-08-25 16:02:36 +02:00
rgarcia
65a91ae821 configures ssl for staging and production environments 2015-08-25 16:01:43 +02:00
Alberto Garcia Cabeza
8037a82fef Adds styles to moderation admin 2015-08-25 15:19:54 +02:00
David Gil
8d0ba2fe33 cleans up unused variable 2015-08-25 15:07:36 +02:00