mirrors/nyastodon
1
0
Fork 0
mirror of https://git.bsd.gay/fef/nyastodon.git synced 2024-11-01 13:11:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
4652 commits 2 branches 270 tags 226 MiB
Commit graph

4652 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eugen
2cd792fc3d Merge pull request #737 from nevillepark/patch-2 
Corrected spelling mistake
 2017-04-02 22:23:11 +02:00
Eugen
09b4b65fde Merge pull request #740 from 0x70b1a5/master 
remove black border on video mute/spoiler buttons
 2017-04-02 22:22:56 +02:00
Eugen
48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales 
Improve/add some French locales
 2017-04-02 22:22:44 +02:00
Eugen Rochko
a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong 
button would be displayed in account lists for unloaded relationships
 2017-04-02 22:02:38 +02:00
Eugen Rochko
aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant 
refreshes on navigation
 2017-04-02 21:44:06 +02:00
Eugen Rochko
3618cc04ff Add heartbeat to websockets streaming API connections 2017-04-02 21:27:14 +02:00
Eugen Rochko
2d07cb5771 Catching rack timeout from rails doesn't work 2017-04-02 21:12:18 +02:00
Tobias Merkle
f25fc04ea1 single-quotes 2017-04-02 14:55:13 -04:00
Tobias Merkle
ca21be3e16 remove black border on buttons 2017-04-02 14:54:24 -04:00
Eugen Rochko
5b12624847 Add proper error page for request timeouts 2017-04-02 19:43:44 +02:00
Neville Park
54c796c8df Corrected spelling mistake 2017-04-02 13:01:55 -04:00
Eugen
34ff11c496 Merge pull request #729 from Abzol/master 
Fix word-break in account profiles
 2017-04-02 17:53:00 +02:00
Eugen
25ed563cdb Merge pull request #735 from TheKinrar/patch-3 
Add link to instances.mastodon.xyz
 2017-04-02 17:50:15 +02:00
TheKinrar
9f219d8968 Add link to instances.mastodon.xyz 2017-04-02 17:48:25 +02:00
Olivia Mossberg
30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon 
It's just an upstream merge
 2017-04-02 17:04:31 +02:00
Olivia Mossberg
f4b5fe9caf Fix word-break in account profiles 
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
 2017-04-02 16:54:24 +02:00
Eugen Rochko
4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in 
admin UI
 2017-04-02 16:45:49 +02:00
Eugen
3a62721e54 Merge pull request #728 from bottitytto/add-mashek 
Adding social.mashek.net
 2017-04-02 16:30:30 +02:00
Eugen Rochko
d6b965cf08 Fix issue with feed merge-in code as well 2017-04-02 15:58:25 +02:00
Eugen Rochko
e809caa0e1 Fix feed regeneration bug 2017-04-02 15:46:31 +02:00
Sina Mashek
aaea7e1e7c Adding social.mashek.net 2017-04-02 16:22:13 +03:00
Eugen Rochko
750662d9e2 Merge branch 'maximeborges-master' 2017-04-02 12:38:11 +02:00
Eugen Rochko
34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master 2017-04-02 12:36:26 +02:00
Eugen
e70661b495 Merge pull request #723 from jkap/patch-1 
Updated list of instances for gay.crime.team
 2017-04-02 12:33:34 +02:00
Eugen
a2fa09518f Merge branch 'master' into patch-1 2017-04-02 12:33:29 +02:00
Eugen
3e84a86eb8 Merge pull request #727 from TheKinrar/patch-2 
Add IPv6 column in list and remove dead instance
 2017-04-02 12:32:17 +02:00
TheKinrar
f5d434e433 Add IPv6 column in list and remove dead instance 
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
 2017-04-02 12:05:32 +02:00
Damien Erambert
3ed75efc31 Add fr locale for community_timeline in fr.jsx 2017-04-01 23:45:53 -07:00
Damien Erambert
cb1989cbd8 Add locale in devise.fr.yml 2017-04-01 23:38:40 -07:00
Damien Erambert
03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml 2017-04-01 23:35:11 -07:00
Damien Erambert
9e26af264e Fix small typo in doorkeeper.fr.yml 2017-04-01 23:34:37 -07:00
Damien Erambert
f9f6098e22 Complete localization of in simple_form.fr.yml 2017-04-01 23:26:26 -07:00
Damien Erambert
2c881e6717 Improve french locales on the backend (WIP) 2017-04-01 23:15:49 -07:00
jenn kaplan
1389d5d7fd Updated list of instances for gay.crime.team 
Updated out-of-date info for gay.crime.team
 2017-04-01 22:37:10 -07:00
Eugen Rochko
433cb198fa Fix landing page sign up form ignoring username field 2017-04-02 04:13:22 +02:00
Eugen
3ffa27e812 Merge pull request #720 from 0x70b1a5/master 
improve video button visibililty (issue #713)
 2017-04-02 03:15:22 +02:00
Tobias Merkle
ae43978433 improve video button visibililty 2017-04-01 21:02:30 -04:00
Eugen
0f05643f5d Merge pull request #718 from Wonderfall/master 
Add social.targaryen.house to instances list
 2017-04-02 01:27:02 +02:00
Wonderfall
7ccc9b8b02
Add social.targaryen.house to instances list 2017-04-01 23:53:00 +02:00
Eugen
55d275d30f Merge pull request #714 from TheKinrar/patch-1 
Add mastodon.xyz to instances list
 2017-04-01 23:10:39 +02:00
Eugen Rochko
a8c2e44fee Fix broken reference 2017-04-01 22:29:20 +02:00
Eugen Rochko
808017ff18 Paperclip will complain on its own if this variable is missing 2017-04-01 22:16:26 +02:00
Eugen Rochko
60ebfa182f Made modal system more generic 2017-04-01 22:11:28 +02:00
Maxime BORGES
f693ab69f3 Fix word-break in profile's note on profile page and profile component 2017-04-01 20:17:28 +02:00
TheKinrar
355168b939 Add mastodon.xyz to instances list 2017-04-01 18:00:52 +02:00
Eugen Rochko
13dfd8d109 Improve mobile tabs a little 2017-04-01 15:17:35 +02:00
Eugen Rochko
d93d6f5124 Fix reworked search 2017-03-31 22:45:56 +02:00
Eugen
7ddda65269 Merge pull request #706 from alexgleason/patch-3 
Put line breaks between API methods in docs
 2017-03-31 21:25:31 +02:00
Eugen Rochko
b4046c5957 Rework search 2017-03-31 21:11:09 +02:00
Alex Gleason
d835647ec0 Put line breaks between API methods in docs 2017-03-31 14:55:08 -04:00