3373ae02deMerge branch 'development'
Eugen Rochko
2016-11-23 19:01:12 +01:00
79a0135869Cache accounts/:id/statuses and single statuses too
Eugen Rochko
2016-11-23 18:56:30 +01:00
2112a81e86Adding content sensitivity toggle, spoilers for media
Eugen Rochko
2016-11-23 18:53:23 +01:00
8e936b03d5Improve contrast for settings pages (fixes#173)
Andrea Faulds
2016-11-23 17:36:35 +00:00
d74cef45aaMerge pull request #227 from nclm/french-translation
Eugen
2016-11-23 17:18:27 +01:00
e8725d2d98Rename ‘Publier’ to ‘Pouet’ in French locale.
nicolas
2016-11-23 15:53:49 +01:00
23677bc51eMerge branch 'master' into french-translation
nicolas
2016-11-23 15:43:27 +01:00
1e95fbb10bUpdate doorkeeper.fr.yml
nicolas
2016-11-23 14:47:41 +01:00
94f96a6e85Update doorkeeper.fr.yml
nicolas
2016-11-23 14:45:31 +01:00
5434ad3002Add content spoilers for media in sensitive-content statuses
Eugen Rochko
2016-11-23 11:23:32 +01:00
0603971894Adding sensitive marker to statuses in API
Eugen Rochko
2016-11-23 10:46:48 +01:00
82191b3383Explain application secrets (#217)
Andrea Faulds
2016-11-23 08:30:53 +00:00
4bdb6a0eafRename "publish" to "toot" in english locale, fix lightbox showing old image before loading new one, cache notifications API, fix missing follow button on public profiles
Eugen Rochko
2016-11-23 09:20:34 +01:00
9b53c7d353Fix#168 - Turn off e-mail notifications by default
Eugen Rochko
2016-11-23 08:39:04 +01:00
cf912e01fdImplement includes caching for timelines APIs
Eugen Rochko
2016-11-23 08:34:35 +01:00
5c78547198More query optimizations
Eugen Rochko
2016-11-22 23:18:54 +01:00
fc90d38893Moving some counter queries out of subqueries in the API
Eugen Rochko
2016-11-22 22:59:54 +01:00
4b5b953d42Upgrade to latest Rails, which apparently improves ActionCable performance
Eugen Rochko
2016-11-22 22:26:44 +01:00
f5dd152e1aMerge pull request #2 from Gargron/master
nicolas
2016-11-22 17:26:17 +01:00
95db6cbe28Merge branch 'nclm-french-translation'
Eugen Rochko
2016-11-22 11:35:15 +01:00
4a422650bbFix broken locales
Eugen Rochko
2016-11-22 11:34:36 +01:00
c7031fd535Update fr.jsx
nicolas
2016-11-22 10:49:50 +01:00
82cb34916aUpdate fr.yml
nicolas
2016-11-22 10:39:15 +01:00
ba4c03de71Update simple_form.fr.yml
nicolas
2016-11-22 10:32:43 +01:00
89dab7c534Merging code updates (Unlisted Mode)
nicolas
2016-11-22 10:25:17 +01:00
f9bd3d8808Adding French locale to mastodon.jsx
nicolas
2016-11-22 10:21:56 +01:00
115ce90578Adding French locale to settings_helper.rb
nicolas
2016-11-22 10:20:28 +01:00
1788164352Local accounts can control "silenced" attribute which removes them from public timeline
Eugen Rochko
2016-11-21 23:05:11 +01:00
64cfbbcc55Adding French locale
nicolas
2016-11-21 22:46:59 +01:00
46d9076e99Importing doorkeeper.fr.yml
nicolas
2016-11-21 22:39:20 +01:00
12e9f789abImporting devise.fr.yml
nicolas
2016-11-21 22:34:50 +01:00
7abbb02824Fix#163 - No need for Safari chrome on iOS
Eugen Rochko
2016-11-21 22:33:44 +01:00
835d5483feFirst version for fr.jsx
nicolas
2016-11-21 22:06:05 +01:00
7944ed6fe5Adding option to specify asset server, filter followers query by local accounts during Fan Out On Write to load less stuff into memory
Eugen Rochko
2016-11-21 22:04:10 +01:00
6b6243a186Create fr.jsx
nicolas
2016-11-21 21:51:34 +01:00
a3afea7b9dFirst version for simple_form.fr.yml
nicolas
2016-11-21 21:30:13 +01:00
fc87243c39First version for fr.yml
nicolas
2016-11-21 21:25:27 +01:00
05823c325cCreate devise.fr.yml
nicolas
2016-11-21 20:59:41 +01:00
753115ff57Create doorkeeper.fr.yml
nicolas
2016-11-21 20:59:13 +01:00
8504110d45Create simple_form.fr.yml
nicolas
2016-11-21 20:58:43 +01:00
e9980a9b8bCreate fr.yml
nicolas
2016-11-21 20:57:28 +01:00
627a85f4e4Better error message in doorkeeper json response
Eugen Rochko
2016-11-21 16:19:35 +01:00
f88ca4a206Performance improvement for notifications API
Eugen Rochko
2016-11-21 16:10:42 +01:00
52119104b9Remove some n+1 queries from notifications API
Eugen Rochko
2016-11-21 15:16:04 +01:00
e8c27767aaRemove orphaned notifications, add scopes param to app create API
Eugen Rochko
2016-11-21 14:59:13 +01:00
954f344cf7Merge branch 'victorhck-master'
Eugen Rochko
2016-11-21 11:05:33 +01:00
db58235930Fixes for the Spanish translation
Eugen Rochko
2016-11-21 11:05:11 +01:00
e3665c1d67Try to fix for browsers that don't support notifications
Eugen Rochko
2016-11-21 10:59:59 +01:00
c41dc5e8e9Icon for desktop notifications
Eugen Rochko
2016-11-21 10:55:49 +01:00
d32e0364f9Switch to compose route when replying and compose is not mounted
Eugen Rochko
2016-11-21 10:52:11 +01:00
93577f74e7Use old rules for mention notifications as for mentions timeline
Eugen Rochko
2016-11-21 10:37:34 +01:00
fb48cc3b74Desktop notifications
Eugen Rochko
2016-11-21 10:24:50 +01:00
e616ffc5d6Fix responsive layout breakpoint, replace mentions column with notifications
Eugen Rochko
2016-11-21 10:03:55 +01:00
29b12f9e0aCall NotifyService about remote reblogs
Eugen Rochko
2016-11-21 09:56:01 +01:00
38dd85daabAdding notifications column
Eugen Rochko
2016-11-20 19:39:18 +01:00
da2ef4d676Adding unified streamable notifications
Eugen Rochko
2016-11-20 00:33:02 +01:00
51dc725794Graphic emoji in usernames in the "reblogged" string above status
Eugen Rochko
2016-11-19 00:28:42 +01:00
39533190c2Display human names of locales in dropdown
Eugen Rochko
2016-11-19 00:19:57 +01:00
c7a1b78536Activating Spanish i18n
Eugen Rochko
2016-11-19 00:10:47 +01:00
ac2403fb24Add more Spanish i18n
Eugen Rochko
2016-11-19 00:00:04 +01:00
367b05d733Spanish translation for devise.es.yml
Victorhck
2016-11-18 23:57:03 +01:00
0293a7dd49Updating some npm packages
Eugen Rochko
2016-11-18 23:55:44 +01:00
7dea6a23f7Move Salmon processing to background as well as PuSH
Eugen Rochko
2016-11-18 23:24:57 +01:00
2c58e7e06aCatch validation errors in ProcessFeedService so that one failing entry wouldn't stop others from going through
Eugen Rochko
2016-11-18 23:19:38 +01:00
e4f56fa942Don't create attachments if remote file cannot be fetched
Eugen Rochko
2016-11-18 23:16:34 +01:00
882de42babValidate presence of text even for remote statuses
Eugen Rochko
2016-11-18 23:14:41 +01:00
7b7bf834e9Fix OAuth authorization page and add a spec for it
Eugen Rochko
2016-11-18 23:08:52 +01:00
a05fe70c24finished spanish translation for es.yml
Victorhck
2016-11-18 23:04:26 +01:00