Ondřej Hruška 7e5691804d Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00

..

controllers

Merge git://github.com/tootsuite/mastodon into tootsuite-master

2017-07-25 21:36:22 +02:00

fabricators

Web Push Notifications (#3243)

2017-07-13 22:15:32 +02:00

features

…

fixtures

Use charlock_holmes instead of nkf at FetchLinkCardService (#4080)

2017-07-08 22:44:31 +02:00

helpers

Improve ActivityPub representations (#3844)

2017-07-15 03:01:39 +02:00

javascript

feat(emoji): Add back title attribute (#4253)

2017-07-18 22:49:24 +02:00

lib

Use the same emoji data on the frontend and backend (#4284)

2017-07-21 04:27:40 +02:00

mailers

…

models

Merge changes from upstream with the CSS reload fix

2017-07-18 18:58:47 +02:00

policies

…

presenters

…

requests

Redesign the landing page, mount public timeline on it (#4122)

2017-07-11 15:27:59 +02:00

routing

…

services

Fix intermittent test failures due to accidentally reused class instance between threads (#4287)

2017-07-21 12:45:13 +02:00

support

…

views

Redesign /terms page (#4338)

2017-07-24 17:15:15 +02:00

workers

Bump to 1.5.0rc1 (#4318)

2017-07-24 16:21:08 +02:00

rails_helper.rb

Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)

2017-07-07 23:25:15 +02:00

spec_helper.rb

…