Thibaut Girka
f5eaefc485
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
app/lib/user_settings_decorator.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/views/stream_entries/_simple_status.html.haml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
config/routes.rb
2018-10-01 12:43:20 +02:00
Thibaut Girka
acf5099504
Fix maxCharacters in vanilla front-end
2018-09-28 17:05:19 +02:00
ふぁぼ原
bb8afc4608
Add a new preference to always hide all media ( #8569 )
2018-09-25 05:09:35 +02:00
Matt Sweetman
674865731a
Add user preference to always expand toots marked with content warnings ( #8762 )
2018-09-24 05:44:01 +02:00
Thibaut Girka
4ec907e413
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
Dockerfile
app/javascript/packs/common.js
config/webpack/loaders/sass.js
config/webpack/shared.js
db/schema.rb
package.json
yarn.lock
A lot of the conflicts come from updating webpack.
Even though upstream deleted app/javascript/packs/common.js, I kept
glitch-soc's version as it unifies JS/CSS packs behavior across flavours.
Ported glitch changes to webpack 4.x
2018-07-16 14:50:42 +02:00
Eugen Rochko
e90b9a0b05
Display Mastodon version in footer of web UI ( #8013 )
...
Fix #7846
2018-07-14 03:56:34 +02:00
Thibaut Girka
3d6c594903
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
Eugen Rochko
a21c8a2e0e
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
Lain Iwakura
8a66ab68e8
Handle character limit in initial state in frontend.
2018-06-14 01:56:11 +02:00
Eugen Rochko
a91ef56e80
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
Eugen Rochko
219b28e172
Add preference to always display sensitive media ( #6448 )
2018-02-09 00:26:57 +01:00
Nolan Lawson
b89628424d
Refactor initial state: "me" ( #5563 )
...
* Refactor initial state: "me"
* remove "me" from reducers/meta.js
2017-10-31 11:27:48 +09:00
Nolan Lawson
fc075b16d9
Reactor unfollow_modal, boost_modal, delete_modal ( #5505 )
2017-10-30 00:10:15 +09:00
Nolan Lawson
2085c1fa33
Refactor initial state: reduce_motion and auto_play_gif ( #5501 )
2017-10-28 00:04:44 +09:00
