Permalink
Commits on Jan 18, 2017
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 18, 2017
  2. Bump json

    json 1.8.3 was incompatible with ruby 2.4.0
    
    closes #7285
    svbergerem committed with SuperTux88 Jan 18, 2017
  3. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 18, 2017
  4. Merge branch 'release/0.6.3.0' into next-minor

    SuperTux88 committed Jan 18, 2017
Commits on Jan 16, 2017
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 16, 2017
  2. Update database config comments

    closes #7282
    svbergerem committed with SuperTux88 Jan 15, 2017
Commits on Jan 15, 2017
  1. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 15, 2017
  2. Move formatting from locale to views

    closes #7283
    svbergerem committed with SuperTux88 Jan 15, 2017
  3. Fix script/server when bin/ is not in PATH

    This fixes an issue, when the bin/ directory of diaspora is not in the PATH variable
    
    closes #7281
    spixi committed with SuperTux88 Jan 8, 2017
  4. Add .wti to .gitignore

    SuperTux88 committed Jan 15, 2017
  5. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 15, 2017
  6. Start 0.6.4.0 cycle

    SuperTux88 committed Jan 15, 2017
  7. Merge branch 'next-minor' into develop

    svbergerem committed Jan 15, 2017
  8. Switch reason and message

    unify
    
    rename and show full post on reports
    
    Fix XSS issue
    
    Unification
    
    Style
    
    Fix pronto
    
    closes #7180
    SansPseudoFix committed with svbergerem Nov 3, 2016
  9. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 15, 2017
  10. Use new ajax error handling for like, unlike and comment failures

    closes #7227
    svbergerem committed with SuperTux88 Nov 27, 2016
  11. Downgrade thor to 0.19.1

    Version 0.19.4 prints errors to the console, which can be weird for
    podmins.
    
    See erikhuda/thor#538
    SuperTux88 committed Jan 15, 2017
Commits on Jan 14, 2017
  1. Merge branch 'next-minor' into develop

    denschub committed Jan 14, 2017
  2. Hash from federation library now contains strings

    closes #7258
    SuperTux88 committed with denschub Jan 8, 2017
  3. Add created_at to comments

    SuperTux88 committed with denschub Dec 29, 2016
  4. Bump diaspora_federation

    SuperTux88 committed with denschub Dec 29, 2016
  5. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 14, 2017
  6. Fix link to post on mobile photo page

    closes #7274
    svbergerem committed with SuperTux88 Jan 12, 2017
  7. Merge branch 'next-minor' into develop

    SuperTux88 committed Jan 14, 2017
  8. Bump markdown-it

    closes #7277
    svbergerem committed with SuperTux88 Jan 13, 2017