mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-12-22 16:43:41 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
7259 commits 5 branches 147 tags 265 MiB
Commit graph

7259 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
roikale
1df453aff6 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
f7c909e290 Retry ActivityPub delivery a few more times (#5014) 2017-09-30 16:01:46 +02:00
MIYAGI Hikaru
7481ae1bcb trivial refactoring for emojify() (#5075) 
* unite loop process
* add hint for original emojifier
 2017-09-30 15:57:32 +02:00
abcang
cb3b0c1a0f Update react-router-scroll at yarn.lock (#5154) 2017-09-30 15:50:02 +02:00
Nolan Lawson
ca0e8be20c Improve IntersectionObserverArticle perf (#5152) 2017-09-30 14:28:49 +02:00
Nishi, Keisuke
83ffc4dc07 Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155) 2017-09-30 14:28:29 +02:00
Eugen Rochko
d6fe0954e3 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
ebb8c89207 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
0060f98847 Remove react-sizeme (#5143) 
* Remove react-sizeme

* Fix aspect ratio in "sensitive" mode
 2017-09-29 22:46:43 +02:00
Jakob Kramer
1a72813b53 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
ce3e0faf4d
add login form to landing page if regs are closed 2017-09-29 16:41:18 +02:00
Yanaken
c3f9c74719 Better Japanese translations (#5142) 2017-09-29 13:27:31 +09:00
beatrix
c027a7bd4d Merge pull request #157 from glitch-soc/merging-upstream 
ABRACA-HRRRRRRRRRRRNGGGGGGGHHH!!!!!!!!!!!!!!!!!!!
 2017-09-28 21:48:28 -04:00
Eugen Rochko
35a8cafa35 Replace self-rolled statsd instrumention with localshred/nsa (#5118) 2017-09-29 03:16:44 +02:00
Eugen Rochko
f4ca116ea8 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!
53f829dfa8 HAML fix 2017-09-28 18:16:04 -07:00
Eugen Rochko
5b45c1646a Remove dependency on db during assets:precompile (#5138) 2017-09-29 03:03:03 +02:00
kibigo!
cf1f83ca2a Fixed lingering upstream Theme code 2017-09-28 17:45:16 -07:00
Eugen Rochko
887cd94e96 Increase attachment descriptions to 420 characters (#5139) 
Blaze it
 2017-09-29 02:30:00 +02:00
kibigo!
1522795853 new HAML for statuses 2017-09-28 17:18:12 -07:00
Eugen Rochko
d2f56d1cbc 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
d0b4709b2a 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
6e0659c838 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
3406e30526 OC 500 error (#5110) 2017-09-28 20:22:34 +02:00
Eugen Rochko
76f360c625 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
a3202f61af Updated German translation (#5132) 2017-09-28 17:38:39 +02:00
Eugen Rochko
4ec1771165 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
3d9b8847d2 Flush body when POST requests (#5128) 2017-09-28 15:04:32 +02: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 fa3587645d, reversing
changes made to 15c9c2fd7e.
 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