Ondřej Hruška
e9f9e3cc89
unbreak onboarding modal
2017-09-28 11:13:37 +02:00
Ondřej Hruška
34a29615fa
remove wrong emojify usage in old glitch components
2017-09-28 11:03:23 +02:00
Ondřej Hruška
cf24ce7e03
remove wrong emojify usage in old glitch components
2017-09-28 11:03:23 +02:00
Ondřej Hruška
b769f9c0df
fix custom emoji not shown in statuses
2017-09-28 10:13:16 +02:00
Ondřej Hruška
74e4fc8f8a
fix custom emoji not shown in statuses
2017-09-28 10:13:16 +02:00
Ondřej Hruška
3e3073081d
fix some js errors due to number->string change of status ID
2017-09-28 10:04:20 +02:00
Ondřej Hruška
9a5418942c
fix some js errors due to number->string change of status ID
2017-09-28 10:04:20 +02:00
Ondřej Hruška
282a126b3f
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
Ondřej Hruška
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +02:00
Ondřej Hruška
0cc795db6b
Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
2017-09-28 09:18:35 +02:00
Ondřej Hruška
83bda6c1a8
Merge commit 'b9f59ebcc68e9da0a7158741a1a2ef3564e1321e' into merging-upstream
2017-09-28 09:18:35 +02:00
Ondřej Hruška
2ae4f48a48
Skip-merge commit 'b4842ef0b90be08414b57ac9f1cfae87f631ed58' into merging-upstream
2017-09-28 09:12:47 +02:00
Ondřej Hruška
fcf0d2078e
Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream
2017-09-28 09:12:47 +02:00
Ondřej Hruška
914c0465b1
Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
2017-09-28 09:12:17 +02:00
Ondřej Hruška
9330ea1f4d
Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream
2017-09-28 09:12:17 +02:00
Ondřej Hruška
ca2fd3c8a2
Revert "autoscroll emoji suggestions box"
...
This reverts commit 640740eeac
.
2017-09-28 08:56:32 +02:00
Ondřej Hruška
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
.
2017-09-28 08:56:32 +02:00
Ondřej Hruška
3398d0e84c
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit b14d2a5ae6
, reversing
changes made to 41832d083e
.
2017-09-28 08:55:53 +02:00
Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d
, reversing
changes made to 15c9c2fd7e
.
2017-09-28 08:55:53 +02:00
Yamagishi Kazutoshi
9ab3021562
Update Yarn to version 1.1.0 ( #5125 )
...
* Update Yarn to version 1.1.0
* remove hard-coding
2017-09-28 04:51:36 +02:00
Yamagishi Kazutoshi
b9f59ebcc6
Update Yarn to version 1.1.0 ( #5125 )
...
* Update Yarn to version 1.1.0
* remove hard-coding
2017-09-28 04:51:36 +02:00
Eugen Rochko
a2a189819e
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
2017-09-28 00:26:33 +02:00
Eugen Rochko
e648ef0bfb
Remove web UI warnings about OStatus privacy ( #5102 )
...
* Remove web UI warnings about OStatus privacy
* yarn run manage:translations
2017-09-28 00:26:33 +02:00
Eugen Rochko
7031e350b3
When OAuth password verification fails, return 401 instead of redirect ( #5111 )
...
Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
2017-09-27 23:42:49 +02:00
Eugen Rochko
db3ed498b0
When OAuth password verification fails, return 401 instead of redirect ( #5111 )
...
Call to warden.authenticate! in resource_owner_from_credentials would
make the request redirect to sign-in path, which is a bad response for
apps. Now bad credentials just return nil, which leads to HTTP 401
from Doorkeeper. Also, accounts with enabled 2FA cannot be logged into
this way.
2017-09-27 23:42:49 +02:00
Yamagishi Kazutoshi
12b7306a03
Upgrade Webpacker to version 3.0.1 ( #5122 )
2017-09-27 14:41:54 +02:00
Yamagishi Kazutoshi
901fc48aae
Upgrade Webpacker to version 3.0.1 ( #5122 )
2017-09-27 14:41:54 +02:00
Eugen Rochko
e8871341bf
Fix empty query sent to postgres for custom emojis ( #5121 )
2017-09-27 04:14:03 +02:00
Eugen Rochko
3caf0ba923
Fix empty query sent to postgres for custom emojis ( #5121 )
2017-09-27 04:14:03 +02:00
Eugen Rochko
a90aac6953
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
2017-09-27 03:13:09 +02:00
Eugen Rochko
6e83b5e719
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
2017-09-27 03:13:09 +02:00
nullkal
463bbe870f
Refactor 500 file generation for future extension ( #5105 )
2017-09-26 11:55:33 +02:00
nullkal
b32a1d5754
Refactor 500 file generation for future extension ( #5105 )
2017-09-26 11:55:33 +02:00
m4sk1n
7291f1de08
i18n: Update Polish translation ( #5106 )
...
* i18n: Update Polish translation
* i18n: Update Polish translation
2017-09-26 14:19:25 +09:00
m4sk1n
9d53a38a44
i18n: Update Polish translation ( #5106 )
...
* i18n: Update Polish translation
* i18n: Update Polish translation
2017-09-26 14:19:25 +09:00
kibigo!
cae9e7ab76
Fixed webpack config code
2017-09-25 19:35:54 -07:00
kibigo!
f7ca205f38
Fixed webpack config code
2017-09-25 19:35:54 -07:00
kibigo!
aac16a82d6
Better themeing support!!
2017-09-25 19:24:32 -07:00
kibigo!
86e617a839
Better themeing support!!
2017-09-25 19:24:32 -07:00
Eugen Rochko
10a2b3dd4c
Follow-up to #4582 and #5027 , removing dead code ( #5101 )
2017-09-26 01:06:27 +02:00
Eugen Rochko
e528114c53
Follow-up to #4582 and #5027 , removing dead code ( #5101 )
2017-09-26 01:06:27 +02:00
Eugen Rochko
1efe904a28
Fix #5059 - Stop processing payload if it's from local account ( #5100 )
2017-09-26 01:06:13 +02:00
Eugen Rochko
cf7fbf2c56
Fix #5059 - Stop processing payload if it's from local account ( #5100 )
2017-09-26 01:06:13 +02:00
Eugen Rochko
25d6a51276
Send streaming API delete to people mentioned in status ( #5103 )
...
- Previously they wouldn't receive it unless they were author's
followers
- Skip unpush from public/hashtag timelines if status wasn't
public in the first place
2017-09-26 00:29:29 +02:00
Eugen Rochko
91e5b0dfdb
Send streaming API delete to people mentioned in status ( #5103 )
...
- Previously they wouldn't receive it unless they were author's
followers
- Skip unpush from public/hashtag timelines if status wasn't
public in the first place
2017-09-26 00:29:29 +02:00
Eugen Rochko
1767f9817c
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
Eugen Rochko
3b60832214
New error page graphic. Other error page improvements ( #5099 )
...
- 500.html generated with admin-set default locale if set
- Error page `<title>` includes Mastodon site title
- 500 title changed to "This page is not
correct" (ref: <https://www.youtube.com/watch?v=2VCAP_seh1A >)
- 500 content appended with "on our end" to make clear it's
not user's fault
2017-09-25 23:05:54 +02:00
Lynx Kotoura
cad208ba43
Fix size of single media in media-gallery ( #5098 )
2017-09-25 20:26:50 +02:00
Lynx Kotoura
259181c41a
Fix size of single media in media-gallery ( #5098 )
2017-09-25 20:26:50 +02:00
Eugen Rochko
8b7c639bbe
Fix emojify() by generating a mapping to existing Twemoji files ( #5080 )
...
A new rake task emojis:generate downloads a full list of valid
unicode sequences from unicode.org and checks it against existing
Twemoji files, finally generating a map from each sequence to the
existing file (e.g. when there's multiple ways an emoji can be
expressed). The map is dumped into app/javascript/mastodon/emoji_map.json
That file is loaded by emojione_light.js (now a misnomer) which
decorates it further with shortcodes taken from emoji-mart's index.
2017-09-25 18:36:33 +02:00