Permalink
Commits on Dec 2, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Dec 2, 2016
  2. Remove user_methods require line

    No need to explicitly require user_methods.rb since it is already required in spec_helper.rb
    
    closes #7236
    cmrd-senya committed with SuperTux88 Dec 1, 2016
Commits on Dec 1, 2016
  1. Merge branch 'next-minor' into develop

    denschub committed Dec 1, 2016
  2. pass "state" parameter back to openid client

    cmrd-senya committed with denschub Oct 24, 2016
  3. Merge branch 'next-minor' into develop

    SuperTux88 committed Dec 1, 2016
  4. Don't show browser notifications on pageload

    closes #7211
    svbergerem committed with SuperTux88 Nov 21, 2016
Commits on Nov 29, 2016
  1. Merge pull request #7232 from svbergerem/fix-mentions-in-comments-mig…

    …ration
    
    Fix mentions in comments migration on PostgreSQL
    SuperTux88 committed on GitHub Nov 29, 2016
  2. Fix mentions in comments migration on PostgreSQL

    svbergerem committed Nov 29, 2016
  3. Merge pull request #6818 from cmrd-senya/1851-mentions-in-comments.new

    Mentions in comments backend changes
    SuperTux88 committed Nov 29, 2016
  4. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 29, 2016
  5. Remove a dangling "lola" object creation

    It's never used and possibly was left unnoticed by some refactoring.
    
    closes #7230
    cmrd-senya committed with SuperTux88 Nov 29, 2016
Commits on Nov 28, 2016
  1. Mentions in comments backend changes

    cmrd-senya committed Aug 22, 2016
  2. Refactor mail workers to use common base

    Introduce Workers::Mail::NotifierBase to be a base for all appropriate
    mail workers to reduce code duplication
    cmrd-senya committed Sep 14, 2016
  3. Remove the photo comment spec

    This functionality is not something we support and it doesn't look
    it will be reintroduced soon.
    
    see discussion #6818 (comment)
    cmrd-senya committed Jul 11, 2016
  4. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 28, 2016
  5. Remove the duplicate "stream" container which already gets added in t…

    …he "messages" partial.
    
    closes #7228
    noplanman committed with SuperTux88 Nov 27, 2016
Commits on Nov 27, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 27, 2016
  2. require spec_helper in .rspec

    closes #7223
    jramos committed with SuperTux88 Nov 25, 2016
Commits on Nov 26, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 26, 2016
  2. Fix 500 on mobile commented and liked streams

    Fixes #7218, regression from #7036
    
    closes #7219
    svbergerem committed with SuperTux88 Nov 24, 2016
  3. Add help page cuke

    closes #7222
    svbergerem committed with SuperTux88 Nov 20, 2016
  4. Remove unused contacts link methods

    closes #7221
    svbergerem committed with SuperTux88 Nov 25, 2016
  5. Refactor conversations controller create

    closes #7224
    svbergerem committed with SuperTux88 Nov 26, 2016
Commits on Nov 25, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 25, 2016
  2. allowing for graceful unicorn restarts

    closes #7217
    jramos committed with SuperTux88 Nov 22, 2016
  3. Merge branch 'next-minor' into develop

    svbergerem committed Nov 25, 2016
  4. adding content_for(:javascript)

    closes #7209
    jramos committed with svbergerem Nov 20, 2016
  5. Merge branch 'next-minor' into develop

    svbergerem committed Nov 25, 2016
  6. only show community spotlight link on /contacts if it is enabled

    closes #7213
    jramos committed with svbergerem Nov 22, 2016
Commits on Nov 24, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 24, 2016
  2. only require fog/aws

    closes #7201
    jramos committed with SuperTux88 Nov 18, 2016
Commits on Nov 23, 2016
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Nov 23, 2016
  2. Remove unused photos.show.show_original_post translation

    closes #7208
    svbergerem committed with SuperTux88 Nov 22, 2016
  3. Fix notification cukes

    closes #7210
    svbergerem committed with SuperTux88 Nov 20, 2016