DJ Sundog
979b0d66a7
update indentation
2017-10-07 13:53:46 -07:00
DJ Sundog
6ca03a7f58
add faststart to audio transcoding
2017-10-07 19:59:22 +00:00
DJ Sundog
96ba3482b9
adding support for audio uploads, transcoded to mp4 videos
2017-10-07 19:54:10 +00:00
Ondřej Hruška
1a8011648f
Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing
...
workaround for notif clearing
2017-10-06 09:34:12 +02:00
Ondřej Hruška
37e141bccb
comment out unused stuff with Video
2017-10-06 09:23:28 +02:00
Ondřej Hruška
dcd8ff5308
fix haml quotes in a bid to make travis less grumpy
2017-10-06 09:07:04 +02:00
Ondřej Hruška
f82e90bf11
workaround for notif clearing
2017-10-05 21:55:02 +02:00
beatrix
b1217242fc
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
beatrix
5dec67d964
Merge pull request #159 from glitch-soc/closed-instance-landing-page-login-form
...
add login form to landing page if regs are closed
2017-09-30 15:01:32 -04:00
Ondřej Hruška
ce3e0faf4d
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
beatrix
c027a7bd4d
Merge pull request #157 from glitch-soc/merging-upstream
...
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
2017-09-28 21:48:28 -04:00
kibigo!
53f829dfa8
HAML fix
2017-09-28 18:16:04 -07:00
kibigo!
cf1f83ca2a
Fixed lingering upstream Theme code
2017-09-28 17:45:16 -07:00
kibigo!
1522795853
new HAML for statuses
2017-09-28 17:18:12 -07:00
Ondřej Hruška
e9f9e3cc89
unbreak onboarding modal
2017-09-28 11:13:37 +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
74e4fc8f8a
fix custom emoji not shown in statuses
2017-09-28 10:13:16 +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
daad07b1d5
Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
2017-09-28 09:20:59 +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
fcf0d2078e
Skip-merge commit '0401a24558294b6941c30c922af3f2063dfd305e' into merging-upstream
2017-09-28 09:12:47 +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
06e299cef5
Revert "autoscroll emoji suggestions box"
...
This reverts commit c89cce0219
2017-09-28 08:56:32 +02:00
Ondřej Hruška
8a24ad5828
Revert "Merge pull request #149 from glitch-soc/mojon-suggest"
...
This reverts commit fa3587645d15c9c2fd7e
2017-09-28 08:55:53 +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
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
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
901fc48aae
Upgrade Webpacker to version 3.0.1 ( #5122 )
2017-09-27 14:41:54 +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
6e83b5e719
Update brakeman to 3.0 and bundler-audit to 0.6 ( #5117 )
2017-09-27 03:13:09 +02:00
nullkal
b32a1d5754
Refactor 500 file generation for future extension ( #5105 )
2017-09-26 11:55:33 +02: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!
f7ca205f38
Fixed webpack config code
2017-09-25 19:35:54 -07:00
kibigo!
86e617a839
Better themeing support!!
2017-09-25 19:24:32 -07:00
Eugen Rochko
e528114c53
Follow-up to #4582 and #5027 , removing dead code ( #5101 )
2017-09-26 01:06:27 +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
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
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
259181c41a
Fix size of single media in media-gallery ( #5098 )
2017-09-25 20:26:50 +02:00
Eugen Rochko
510df0ac55
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
Akihiko Odaki
98936bfcdf
Add missing validations in ActivityPub::Activity::Create ( #5096 )
2017-09-25 18:33:11 +02:00
unarist
5c82c2b75f
Increase max height of preview card image ( #5092 )
...
We added horizontal layout to preview card for wide image. However, max height of the thumbnail is still limited to 120px and it makes nearly square images to too small for that layout.
This PR increases max height as well as max width.
2017-09-25 17:10:49 +02:00
Yamagishi Kazutoshi
0fea700c7b
Refresh manifest before generate 500.html ( #5090 )
2017-09-25 16:58:12 +02:00
Eugen Rochko
2c8e3fbbfb
Generate 500.html with assets:precompile, remove loading from Google Fonts ( #5067 )
2017-09-25 04:04:04 +02:00
Eugen Rochko
b982d549f4
Add strong_migrations gem to warn when creating unsafe migrations ( #5078 )
2017-09-25 02:11:14 +02:00
Eugen Rochko
909a6d4661
Fix streaming API double-JSON-encoding status IDs for deletes ( #5069 )
2017-09-24 15:31:03 +02:00
JeanGauthier
3f3de38075
OC update: different emoji picker ( #5046 ) ( #5077 )
2017-09-24 12:17:47 +02:00
ThibG
c267acfcf7
Thread toot notification mails by conversation ( #5061 )
...
* Thread toot notification mails by conversation
* Make codeclimate happy and avoid potential mis-threading
2017-09-24 11:19:42 +02:00
Daigo 3 Dango
ab625c57ce
Compact status_ids in StatusRelationshipsPresenter ( #5073 )
2017-09-24 11:18:32 +02:00
abcang
e756c4f5ec
Fix media spoiler of DetailedStatus ( #5071 )
2017-09-24 11:15:11 +02:00
