db200226b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/javascript/mastodon/initial_state.js
db/schema.rb
Upstream added a new field to initial_state.
Not too sure about what happened with db/schema.rb though…
2018-06-15 20:51:39 +02:00
1cc775200e
Add "find friends", "invite people", and more to getting started footer ( #7803 )
...
- Find friends from Twitter (bridge)
- Invite people (when invites enabled)
- Security (change e-mail/password)
- Developers (create OAuth apps/tokens)
2018-06-15 15:51:37 +02:00
6bae583d2f
Handle character limit in initial state in frontend.
2018-06-14 01:56:11 +02:00
7901f9f63e
When search enabled, display hint in search popout ( #6593 )
...
* When advanced search is enabled, show different hint in search popout
* Change "getting started" icon in tabs bar from asterisk to hamburger
2018-03-02 06:02:42 +01:00
76f3d5d16b
Add preference to always display sensitive media ( #6448 )
2018-02-09 00:26:57 +01:00
b254e6ca5f
Refactor initial state: "me" ( #5563 )
...
* Refactor initial state: "me"
* remove "me" from reducers/meta.js
2017-10-31 11:27:48 +09:00
5e111ce16d
Reactor unfollow_modal, boost_modal, delete_modal ( #5505 )
2017-10-30 00:10:15 +09:00
3de22a82bf
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
Thibaut Girka
Eugen Rochko
Lain Iwakura
Nolan Lawson