3471b9acb1
Merge pull request #476 from ineffyble/fix-paperclip-s3-acl
...
Fix S3 default settings
2017-01-15 14:29:47 +01:00
cd8e2f8ac8
Merge branch 'ineffyble-feature/toot-app-source'
2017-01-15 14:04:56 +01:00
5d88ef90c9
Fix tests, add applications to eager loading/cache for statuses, fix
...
application website validation, don't link to app website if website isn't set,
also comment out animated boost icon from #464 until it's consistent with non-animated version
2017-01-15 14:01:33 +01:00
3a957e127a
Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source
2017-01-15 13:23:47 +01:00
91edf829ec
Merge pull request #464 from blackle/backflip
...
Make boost button spin around
2017-01-15 13:19:15 +01:00
db40fd4641
Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read'
2017-01-15 20:58:46 +11:00
195d976d1a
Merge pull request #474 from ineffyble/add-back-link-to-settings
...
Add a 'Back to Mastodon' link to footer of settings pages
2017-01-15 02:15:37 +01:00
21c888fefd
Add a textual 'Back to Mastodon' link in footer of settings pages
2017-01-15 11:03:35 +11:00
80f186cdf0
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:30:23 +11:00
c10a41e89e
Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether
2017-01-15 10:27:54 +11:00
77e78ed6aa
Make boost button arrows spin around
2017-01-14 17:56:24 -05:00
6d333d9fc6
Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source
2017-01-15 09:12:11 +11:00
2c042fe57f
Test for presence of Application in haml before trying to render details, to fix errors identified by CI
2017-01-15 09:10:44 +11:00
e751dd669a
Fix typo in rel
2017-01-15 09:04:14 +11:00
8e0c1914fb
Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11
2017-01-15 08:58:50 +11:00
cbcd9b3503
Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies
...
Hide 'Do not display on public timeline' for reply toots
2017-01-14 20:33:10 +01:00
49ff508743
Hide 'Do not display on public timeline' for reply toots. Fixes #412 .
2017-01-15 06:10:23 +11:00
4b384d6914
Fix too late return
2017-01-14 02:22:16 +01:00
8442a176c5
Improve extended about page layout
2017-01-13 20:27:02 +01:00
f2667139ad
Adding about/more page with extended information that can be set up by an admin
2017-01-13 20:16:38 +01:00
533448be42
Add extended about page stub
2017-01-13 03:24:41 +01:00
6d98465db2
Extend rails-settings-cached to merge db-saved hash values with defaults
2017-01-13 02:42:22 +01:00
1a30737ff5
Add settings for contact information
2017-01-12 20:54:14 +01:00
7e7c2bbb0f
Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings
...
with YAML-defined defaults. Add admin page for editing global settings. Add "site_description"
setting that would show as a paragraph on the frontpage
2017-01-12 20:46:24 +01:00
f622f4e137
Merge pull request #461 from vjackson725/master
...
fix Vagrantfile so that the correct ruby is installed
2017-01-12 13:50:17 +01:00
1403f5b31b
fix Vagrantfile so that the correct ruby is installed
...
Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@992c8d2, this no longer works.
Change the provision scrip so that 2.3.1 is installed via rbenv. Note this drastically increases provision time.
2017-01-12 23:20:55 +11:00
ac95c2dbfe
Add rake task for clearing out media from silenced accounts
2017-01-12 04:19:04 +01:00
1a77ccb668
Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else)
2017-01-12 03:54:50 +01:00
992c8d2c41
Add ruby version to Gemfile, move devDependencies in package.json to dependencies,
...
fix bug in process feed service
2017-01-11 15:39:31 +01:00
9eb3f68499
Merge pull request #456 from ineffyble/fix-repo-url
...
Fix repo URL
2017-01-11 14:19:19 +01:00
efd8ce920f
Better animations
2017-01-11 04:21:49 +01:00
ad61a21752
Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places
2017-01-11 13:24:14 +11:00
001a73c6fc
Fix env variable name
2017-01-10 22:01:13 +01:00
bc17613e70
Fix issue when settings are not defined for column type
2017-01-10 17:33:32 +01:00
c8bcd413e2
Home column filters
2017-01-10 17:25:10 +01:00
15b183117c
Add "not found" component to UI
2017-01-10 13:50:59 +01:00
14a0bec2d8
Add link to list of apps
2017-01-10 12:23:30 +01:00
efd4565389
Merge pull request #450 from blackle/master
...
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
57e496e1bc
simplify emojification on public pages with .emojify class
2017-01-09 22:41:47 -05:00
0c0d4b7c92
Fix sandboxed iOS login again
2017-01-09 19:43:53 +01:00
ee6b885468
Merge branch 'blackle-master'
2017-01-09 14:13:46 +01:00
394f185e91
Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master
2017-01-09 14:12:40 +01:00
609748016f
Merge branch 'blackle-dropdown'
2017-01-09 14:12:00 +01:00
a1783b80b2
Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown
2017-01-09 14:10:32 +01:00
4293e132d1
Persist UI settings, add missing localizations for German
2017-01-09 14:00:55 +01:00
c1c814e6a1
Improve initialState loading
2017-01-09 12:37:53 +01:00
62167338b8
Generate key for each input so we can upload the same file even after deleting
2017-01-08 21:00:13 -05:00
a697b5473a
Switch to compose view when tapping 'mention' in dropdown on mobile
2017-01-08 17:12:00 -05:00
f29df16eea
Fix Paperclip timeout setting. Fix bug introduced in #437
2017-01-08 19:12:54 +01:00
9f3e2737e9
Merge pull request #443 from blackle/master
...
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
Eugen