JantsoP
db4a41cf58
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
b8243c1b49
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
Eugen Rochko
eb023beb49
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
Eugen Rochko
b510a56c0c
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
Eugen Rochko
4c53af64f0
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
Eugen Rochko
f722bd2387
Separate background jobs into different queues. ATTENTION: new queue "pull"
...
must be added to the Sidekiq invokation in your systemd file
The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
2017-04-04 00:53:20 +02:00
Eugen Rochko
8232f76c48
Add check for visibility.nil? even though it can't ever be, to check for race conditions
2017-04-03 22:54:46 +02:00
Eugen Rochko
68f829e11c
Add basic logging of who resolved report
2017-04-03 19:35:00 +02:00
Eugen Rochko
71458dc6df
When taking action on a report (silence/suspend), it dismisses all other
...
reports for that user automatically
2017-04-03 19:19:54 +02:00
Eugen Rochko
b7c1b12367
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
David Baumgold
5652f00d81
GitHub should be capitalized
2017-04-03 11:44:11 -04:00
JantsoP
a229840ffe
fixed typo
2017-04-03 14:16:03 +02:00
JantsoP
bfa99981e5
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
JantsoP
ae95f35fe6
add finnish translation
...
add finnish translation
2017-04-03 13:34:26 +02:00
JantsoP
22f88b845a
add finnish translation
...
add finnish translation
2017-04-03 13:33:43 +02:00
JantsoP
eabb86b124
add finnish language
...
add finnish language
2017-04-03 13:32:10 +02:00
Eugen
5d854f37b4
Merge pull request #764 from ticky/tweak-quick-start-area
...
Fix the position of the Mastodon mascot in the UI
2017-04-03 12:59:16 +02:00
JantsoP
69fc95a2f5
Create Finnish translation for Mastodon
...
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
Marvin Kopf
1236a12cae
add mute option in status dropdown
2017-04-03 10:44:08 +02:00
Jessica Stokes
2d384850cb
Fix the position of the Mastodon mascot in the UI
...
The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour!
It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
2017-04-03 13:16:14 +10:00
Eugen
d2358aefec
Merge branch 'master' into master
2017-04-03 01:07:53 +02:00
Eugen
61894582b8
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Kazhnuz
c76d20c2a0
Add forgotten comma
2017-04-02 23:39:41 +02:00
Damien Erambert
4f7cce25ac
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
Kazhnuz
633e5ec6f6
Update French Translation
2017-04-02 23:18:01 +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
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
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 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
Eugen Rochko
34aff3e269
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
2017-04-02 12:36:26 +02:00
Damien Erambert
3ed75efc31
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
Eugen Rochko
433cb198fa
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
Tobias Merkle
ae43978433
improve video button visibililty
2017-04-01 21:02:30 -04: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
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 Rochko
b4046c5957
Rework search
2017-03-31 21:11:09 +02:00
shel
f20f6b25b9
Merge branch 'master' into patch-2
2017-03-31 10:34:14 -04:00
