783de713cd
Merge branch 'master' into master
2017-04-05 20:28:58 +02:00
5189ce9cd1
Replace calls to FeedManager#inline_render and #broadcast
2017-04-05 19:45:18 +02:00
54329947ab
Fix wrong variable used in publish channel
2017-04-05 18:58:32 +02:00
b9ddfff8f6
Add proper message to PushUpdateWorker, use redis directly
2017-04-05 18:48:41 +02:00
d67e1fe44d
Merge branch 'master' into broadcast-to-worker
2017-04-05 18:44:33 +02:00
ea10ddedaa
Update components.scss
...
Use nicer scrollbars in MS edge
2017-04-05 12:10:25 -04:00
8f38353c4d
Only render public payload once in FanOutOnWrite
2017-04-05 14:26:17 +02:00
3cc7378924
Replace ActionCable broadcast call with simple redis publish
2017-04-05 13:28:46 +02:00
cae7d221c7
Merge pull request #919 from JantsoP/master
...
More updates to Finnish language
2017-04-05 10:27:12 +02:00
39e5ecb61d
Merge pull request #908 from krainboltgreene/application-worker-for-shared-logic
...
ApplicationWorker for shared worker behavior
2017-04-05 10:23:52 +02:00
c0295924bc
Merge branch 'master' into master
2017-04-05 10:07:17 +02:00
6a33b51fd2
updated translation
...
Updated some translations after seeing them in service. Should be better now
2017-04-05 09:56:10 +02:00
522410589e
Eliminate unnecessary queries and query clauses with none and all
2017-04-05 06:02:58 +00:00
192f855952
We're going to want these nice helper methods, lets share them with a parent class that matches Rails 5 practices (application level abstraction)
2017-04-04 21:14:37 -07:00
9b8f587c8d
Moved to the worker
2017-04-04 20:51:44 -07:00
bea03b4553
Moving in the inline render
2017-04-04 20:51:18 -07:00
dd66bce930
I don't actually think we need that.
2017-04-04 20:48:22 -07:00
7d887cea4b
Moving the queue_at into the worker
2017-04-04 20:39:14 -07:00
9e58c2b0e3
This method isn't used anymore
2017-04-04 20:38:07 -07:00
4f2985cddc
Replacing the broadcast method with the one defined in the feed manager
2017-04-04 20:36:03 -07:00
de1bb4bd56
By pushing this into a worker we can reduce the amount of time the feed manager using workers eat up a connection
2017-04-04 20:23:40 -07:00
744456cb55
Merge branch 'master' into add_more_tests_to_models
2017-04-05 03:27:38 +02:00
bb582ac177
Merge pull request #839 from SirCmpwn/profile-readability
...
Improve readability of text on profiles
2017-04-05 03:23:16 +02:00
27e4759c00
Improve readability of text on profiles
2017-04-04 21:13:23 -04:00
c571ed77d7
Merge pull request #818 from JantsoP/master
...
Updated Finnish Translation
2017-04-05 03:09:20 +02:00
4751381a24
Merge pull request #852 from peterkeen/email-whitelist-817
...
[#817 ] Add email whitelist
2017-04-05 03:04:58 +02:00
a8468cc6cc
Merge pull request #898 from SirCmpwn/remote-follow-improvements
...
Remote follow improvements
2017-04-05 02:54:03 +02:00
6a8bb89f80
Merge pull request #858 from krainboltgreene/patch-6
...
Use active record shorthand
2017-04-05 02:53:39 +02:00
932b0b2f1f
Remote follow improvements
...
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
2017-04-04 20:52:31 -04:00
d2b7daf6bb
Remove PuSH subscriptions when delivery is answered with a 4xx error
2017-04-05 02:34:33 +02:00
06424fd912
fix rubocop issues
2017-04-05 00:47:17 +02:00
9f80b2dd4e
add more tests to models
2017-04-05 00:29:56 +02:00
f6463e595f
Added Esperanto translation inside the javascripts folder
2017-04-04 20:54:42 +02:00
fa2a1af90a
Spawn FeedInsertWorker to deliver status into personal feed
2017-04-04 19:21:37 +02:00
8dace45447
Use active record shorthand
2017-04-04 09:04:07 -07:00
f28fcf9080
[ #817 ] Add email whitelist
...
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.
Fixes #817
2017-04-04 11:20:15 -04:00
353a30810c
New admin setting: open/close registrations, with custom message, from the admin UI
2017-04-04 15:28:12 +02:00
c3db103305
updated line 28 about GitHub
2017-04-04 15:07:15 +02:00
79828478c6
Merge pull request #804 from fhalna/development
...
Accessibility Fix.
2017-04-04 14:52:27 +02:00
e60c473917
Reduce number of items in feeds, optimize regeneration worker slightly,
...
make regeneration worker unique, (only schedule/execute once at a time)
2017-04-04 13:58:34 +02:00
9123aca6df
Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
2017-04-04 13:43:36 +02:00
1484df2db5
Move OStatus processing back into default queue
2017-04-04 13:02:49 +02:00
fbf64105a5
Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods,
...
do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
2017-04-04 13:01:14 +02:00
c7e14e496b
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
0c0e1c2519
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
fc2b031506
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
5110975df4
Fix #808 - smaller elephant friend PNG for frontpage
2017-04-04 02:03:16 +02:00
7a56845060
Only call regeneration worker after first login after a 14 day break
2017-04-04 02:00:10 +02:00
24793cdbaa
Fix ActionController::Parameters in API issue
2017-04-04 01:33:34 +02:00
8eca42b265
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
8796f7a125
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
4833f53a37
accessibility fix
...
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
d6d192c914
added Esperanto (eo)
2017-04-03 20:22:50 +02:00
c9ffa7ab1d
Add basic logging of who resolved report
2017-04-03 19:35:00 +02:00
ceaafb22d3
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
6ebe31e716
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
3e38b3989f
GitHub should be capitalized
2017-04-03 11:44:11 -04:00
f0be0d36c9
fixed typo
2017-04-03 14:16:03 +02:00
35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
bb8d80f1b0
add finnish translation
...
add finnish translation
2017-04-03 13:34:26 +02:00
4949cc46d8
add finnish translation
...
add finnish translation
2017-04-03 13:33:43 +02:00
a3e82c4fa5
add finnish language
...
add finnish language
2017-04-03 13:32:10 +02:00
a2224bb6ac
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
7227a992fc
Create Finnish translation for Mastodon
...
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
61333ed232
add mute option in status dropdown
2017-04-03 10:44:08 +02:00
f7bc9938a8
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
8ba7d4ed82
Merge branch 'master' into master
2017-04-03 01:07:53 +02:00
720922cd13
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
e6a6c102f6
Add forgotten comma
2017-04-02 23:39:41 +02:00
5f0e912d87
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
6ac05fc74b
Update French Translation
2017-04-02 23:18:01 +02:00
e3509e02c0
Merge pull request #740 from 0x70b1a5/master
...
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
0335a52e28
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
2017-04-02 22:22:44 +02:00
4bfabbd5e2
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
eb85833dc7
Keep track of which timelines are connected live to avoid redundant
...
refreshes on navigation
2017-04-02 21:44:06 +02:00
1ee4c6415c
Catching rack timeout from rails doesn't work
2017-04-02 21:12:18 +02:00
bba468bcca
single-quotes
2017-04-02 14:55:13 -04:00
034cfeb1ac
remove black border on buttons
2017-04-02 14:54:24 -04:00
00e99e58db
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
6e4703703a
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
2017-04-02 17:04:31 +02:00
2d8a0caf98
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
f04816f005
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +02:00
4db2e2f4eb
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
572cf64791
Fix feed regeneration bug
2017-04-02 15:46:31 +02:00
347830262f
Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master
2017-04-02 12:36:26 +02:00
22fb48ca13
Add fr locale for community_timeline in fr.jsx
2017-04-01 23:45:53 -07:00
e407ed24a6
Fix landing page sign up form ignoring username field
2017-04-02 04:13:22 +02:00
8befce32f3
improve video button visibililty
2017-04-01 21:02:30 -04:00
431bfcaad6
Fix broken reference
2017-04-01 22:29:20 +02:00
d1f8bd2673
Paperclip will complain on its own if this variable is missing
2017-04-01 22:16:26 +02:00
b794690bfe
Made modal system more generic
2017-04-01 22:11:28 +02:00
9f0d00567b
Fix word-break in profile's note on profile page and profile component
2017-04-01 20:17:28 +02:00
348e817d53
Improve mobile tabs a little
2017-04-01 15:17:35 +02:00
3c6e9ee33c
Fix reworked search
2017-03-31 22:45:56 +02:00
a895f0d448
Rework search
2017-03-31 21:11:09 +02:00
57e3d4c58b
Merge branch 'master' into patch-2
2017-03-31 10:34:14 -04:00
7931d5886c
Fix web UI profile clickable area overlapping with follow button area
2017-03-31 14:23:44 +02:00
355b9278d5
Fix some views still not using counter caches
2017-03-31 14:02:07 +02:00
be9accbacc
Fix #700 - hide spoilers on static pages
2017-03-31 13:54:36 +02:00
9169326960
:active and :focus states same as :hover for buttons
2017-03-31 12:08:51 +02:00
André Lewin