me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1023 commits 2 branches 0 tags 429 MiB
Commit graph

1023 commits

This branch
This branch
All branches
Author SHA1 Message Date
blackle
5c3c7c545c Change boost sprite to look like fa-retweet 2017-01-15 11:40:05 -05:00
Eugen Rochko
7e46083338 Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse 2017-01-15 14:59:25 +01:00
Eugen Rochko
73e217d9d7 Fix #427 - don't suggest hashtag if the search value contains a space 2017-01-15 14:47:39 +01:00
Eugen Rochko
58b0fe2f28 Fix #449 - don't do relationships fetch for empty array of IDs 2017-01-15 14:47:39 +01:00
Eugen Rochko
11117f5aec Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up 2017-01-15 14:47:39 +01:00
Eugen
3471b9acb1 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl 
Fix S3 default settings
 2017-01-15 14:29:47 +01:00
Eugen Rochko
cd8e2f8ac8 Merge branch 'ineffyble-feature/toot-app-source' 2017-01-15 14:04:56 +01:00
Eugen Rochko
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
Eugen Rochko
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
Eugen
91edf829ec Merge pull request #464 from blackle/backflip 
Make boost button spin around
 2017-01-15 13:19:15 +01:00
Effy Elden
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
Eugen
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
Effy Elden
21c888fefd Add a textual 'Back to Mastodon' link in footer of settings pages 2017-01-15 11:03:35 +11:00
blackle
77e78ed6aa Make boost button arrows spin around 2017-01-14 17:56:24 -05:00
Effy Elden
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
Effy Elden
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
Effy Elden
e751dd669a Fix typo in rel 2017-01-15 09:04:14 +11:00
Effy Elden
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
Eugen
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
Effy Elden
49ff508743 Hide 'Do not display on public timeline' for reply toots. Fixes #412. 2017-01-15 06:10:23 +11:00
Eugen
4b384d6914 Fix too late return 2017-01-14 02:22:16 +01:00
Eugen Rochko
8442a176c5 Improve extended about page layout 2017-01-13 20:27:02 +01:00
Eugen Rochko
f2667139ad Adding about/more page with extended information that can be set up by an admin 2017-01-13 20:16:38 +01:00
Eugen Rochko
533448be42 Add extended about page stub 2017-01-13 03:24:41 +01:00
Eugen Rochko
6d98465db2 Extend rails-settings-cached to merge db-saved hash values with defaults 2017-01-13 02:42:22 +01:00
Eugen Rochko
1a30737ff5 Add settings for contact information 2017-01-12 20:54:14 +01:00
Eugen Rochko
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
Eugen
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
vjackson725
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
Eugen Rochko
ac95c2dbfe Add rake task for clearing out media from silenced accounts 2017-01-12 04:19:04 +01:00
Eugen Rochko
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
Eugen Rochko
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
Eugen
9eb3f68499 Merge pull request #456 from ineffyble/fix-repo-url 
Fix repo URL
 2017-01-11 14:19:19 +01:00
Eugen Rochko
efd8ce920f Better animations 2017-01-11 04:21:49 +01:00
Effy Elden
ad61a21752 Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places 2017-01-11 13:24:14 +11:00
Eugen
001a73c6fc Fix env variable name 2017-01-10 22:01:13 +01:00
Eugen Rochko
bc17613e70 Fix issue when settings are not defined for column type 2017-01-10 17:33:32 +01:00
Eugen Rochko
c8bcd413e2 Home column filters 2017-01-10 17:25:10 +01:00
Eugen Rochko
15b183117c Add "not found" component to UI 2017-01-10 13:50:59 +01:00
Eugen
14a0bec2d8 Add link to list of apps 2017-01-10 12:23:30 +01:00
Eugen
efd4565389 Merge pull request #450 from blackle/master 
simplify emojification on public pages with .emojify class
 2017-01-10 12:21:06 +01:00
blackle
57e496e1bc simplify emojification on public pages with .emojify class 2017-01-09 22:41:47 -05:00
Eugen Rochko
0c0d4b7c92 Fix sandboxed iOS login again 2017-01-09 19:43:53 +01:00
Eugen Rochko
ee6b885468 Merge branch 'blackle-master' 2017-01-09 14:13:46 +01:00
Eugen Rochko
394f185e91 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-01-09 14:12:40 +01:00
Eugen Rochko
609748016f Merge branch 'blackle-dropdown' 2017-01-09 14:12:00 +01:00
Eugen Rochko
a1783b80b2 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown 2017-01-09 14:10:32 +01:00
Eugen Rochko
4293e132d1 Persist UI settings, add missing localizations for German 2017-01-09 14:00:55 +01:00
Eugen Rochko
c1c814e6a1 Improve initialState loading 2017-01-09 12:37:53 +01:00
blackle
62167338b8 Generate key for each input so we can upload the same file even after deleting 2017-01-08 21:00:13 -05:00