Akihiko Odaki
51f48c8960
Fix order of paginated accounts in FollowerDomainsController and spec ( #3357 )
...
* Fix order of paginated accounts in FollowerDomainsController
Unordered pagination could result in unexpected behavior.
* Cover Settings::FollowerDomainsController more
2017-09-30 23:06:09 +02:00
Eugen Rochko
5983fa43f5
Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works ( #5112 )
2017-09-30 22:05:42 +02:00
Hinaloe
4d0143dd02
Reduce container size with clean yarn ( #3506 )
...
* Reduce container size with clean yarn
* Merge trouble
2017-09-30 22:05:24 +02:00
beatrix
2955141d2e
Merge pull request #125 from glitch-soc/data-column
...
Add data-column="..." to all columns
2017-09-30 15:02:21 -04:00
beatrix
cd46df6671
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
roikale
4f18c27c43
Change wording on landing page. ( #4805 )
...
"Ilmainen" means "gratis", but Mastodon is free as in freedom, libre – "vapaa".
https://fi.wikipedia.org/wiki/Vapaa_ohjelmisto
2017-09-30 16:25:14 +02:00
ThibG
ba3e2a0c38
Retry ActivityPub delivery a few more times ( #5014 )
2017-09-30 16:01:46 +02:00
MIYAGI Hikaru
924c022340
trivial refactoring for emojify() ( #5075 )
...
* unite loop process
* add hint for original emojifier
2017-09-30 15:57:32 +02:00
abcang
a76120e437
Update react-router-scroll at yarn.lock ( #5154 )
2017-09-30 15:50:02 +02:00
Nolan Lawson
1660e53726
Improve IntersectionObserverArticle perf ( #5152 )
2017-09-30 14:28:49 +02:00
Nishi, Keisuke
8f344b7bb0
Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa ( #5155 )
2017-09-30 14:28:29 +02:00
Eugen Rochko
75207f55a5
Make emoji autosuggestions immediate, usernames appear sooner ( #5149 )
...
* Do not debounce emoji search
* Make autosuggestions appear sooner
2017-09-30 05:11:44 +02:00
Eugen Rochko
2fac5e21c2
Upgrade to React 16 ( #5119 )
...
* Upgrade to React 16.0.0
* Disable some uncritical tests while chai-enzyme remains incompatible
2017-09-30 04:29:56 +02:00
Nolan Lawson
0b668dc4d3
Remove react-sizeme ( #5143 )
...
* Remove react-sizeme
* Fix aspect ratio in "sensitive" mode
2017-09-29 22:46:43 +02:00
Jakob Kramer
6f2a885ea3
Updated German translation ( #5151 )
...
Translate "about" page, several settings pages, data export/import,
sessions overview, authorized followers page, account deletion page.
More consistent use of words:
- A toot is a Beitrag.
- An account is a Konto.
Some small improvements.
2017-09-29 21:11:28 +02:00
Ondřej Hruška
18988b89cf
add login form to landing page if regs are closed
2017-09-29 16:41:18 +02:00
Yanaken
e65378e808
Better Japanese translations ( #5142 )
2017-09-29 13:27:31 +09:00
beatrix
075db77f04
Merge pull request #157 from glitch-soc/merging-upstream
...
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
2017-09-28 21:48:28 -04:00
Eugen Rochko
6033b8eac1
Replace self-rolled statsd instrumention with localshred/nsa ( #5118 )
2017-09-29 03:16:44 +02:00
Eugen Rochko
cb8ecac1ce
After 7 days of repeated delivery failures, give up on inbox ( #5131 )
...
- A successful delivery cancels it out
- An incoming delivery from account of the inbox cancels it out
2017-09-29 03:16:20 +02:00
kibigo!
9bee4d313a
HAML fix
2017-09-28 18:16:04 -07:00
Eugen Rochko
20ff1c629d
Remove dependency on db during assets:precompile ( #5138 )
2017-09-29 03:03:03 +02:00
kibigo!
62fbd4d247
Fixed lingering upstream Theme code
2017-09-28 17:45:16 -07:00
Eugen Rochko
5f137e7ec3
Increase attachment descriptions to 420 characters ( #5139 )
...
Blaze it
2017-09-29 02:30:00 +02:00
kibigo!
9feca5cabf
new HAML for statuses
2017-09-28 17:18:12 -07:00
Eugen Rochko
7143870551
Change max redirects followed to 2 ( #5136 )
...
I see no reason to allow more than that. Usually a redirect is
HTTP->HTTPS, then maybe URL structure changed, but more than that
is highly unlikely to be a legitimate use case.
2017-09-28 23:20:08 +02:00
Jakob Kramer
d55a6ae28a
Update German translation ( #5133 )
...
Create activerecord.de.yml (50%)
Update devise.de.yml
Update doorkeeper.de.yml (100%)
Update simple_form.de.yml (100%)
2017-09-28 20:45:09 +02:00
Nolan Lawson
c74512f7af
Improve performance of modal and swipe animations ( #5135 )
...
* Improve performance of modal and swipe animations
* Fix eslint issues
2017-09-28 20:43:18 +02:00
JeanGauthier
0f0791c563
OC 500 error ( #5110 )
2017-09-28 20:22:34 +02:00
Eugen Rochko
c35e6234ab
If HTTP signature is wrong and webfinger cache is stale, retry with resolve ( #5129 )
...
If the signature could not be verified and the webfinger of the account
was last retrieved longer than the cache period, try re-resolving the
account and then attempting to verify the signature again
2017-09-28 17:50:14 +02:00
Jakob Kramer
b295f86753
Updated German translation ( #5132 )
2017-09-28 17:38:39 +02:00
Eugen Rochko
795e624d5d
Add ability to specify alternative text for media attachments ( #5123 )
...
* Fix #117 - Add ability to specify alternative text for media attachments
- POST /api/v1/media accepts `description` straight away
- PUT /api/v1/media/:id to update `description` (only for unattached ones)
- Serialized as `name` of Document object in ActivityPub
- Uploads form adjusted for better performance and description input
* Add tests
* Change undo button blend mode to difference
2017-09-28 15:31:31 +02:00
abcang
292f489301
Flush body when POST requests ( #5128 )
2017-09-28 15:04:32 +02:00
Ondřej Hruška
7c8bd52431
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
b769f9c0df
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
282a126b3f
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
2ae4f48a48
Skip-merge commit 'b4842ef0b90be08414b57ac9f1cfae87f631ed58' 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
ca2fd3c8a2
Revert "autoscroll emoji suggestions box"
...
This reverts commit 640740eeac
.
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
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
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
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
Yamagishi Kazutoshi
12b7306a03
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
a90aac6953
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