Commit Graph

1202 Commits

Author SHA1 Message Date
Eugen Rochko
7cde08e30b Improve extended about page layout 2017-01-13 20:27:02 +01:00
Eugen Rochko
c01dd089ff 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
e25170f960 Add extended about page stub 2017-01-13 03:24:41 +01:00
Eugen Rochko
2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults 2017-01-13 02:42:22 +01:00
Eugen Rochko
ca50ceeaf0 Add settings for contact information 2017-01-12 20:54:14 +01:00
Eugen Rochko
b11fdc3ae3 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
babc6a1528 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
91dc21c469 fix Vagrantfile so that the correct ruby is installed
Prior to this commit, the vagrantfile installs ruby 2.3.3. Due to commit mastodon@7951e7f, 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
8f54a8851a Add rake task for clearing out media from silenced accounts 2017-01-12 04:19:04 +01:00
Eugen Rochko
4a2ee43e80 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
7951e7ffd5 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
10739df458 Merge pull request #456 from ineffyble/fix-repo-url
Fix repo URL
2017-01-11 14:19:19 +01:00
Eugen Rochko
3ad0496ccb Better animations 2017-01-11 04:21:49 +01:00
Effy Elden
f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places 2017-01-11 13:24:14 +11:00
Eugen
4292cf60ae Fix env variable name 2017-01-10 22:01:13 +01:00
Eugen Rochko
18b11100e7 Fix issue when settings are not defined for column type 2017-01-10 17:33:32 +01:00
Eugen Rochko
312c51b5c8 Home column filters 2017-01-10 17:25:10 +01:00
Eugen Rochko
1e9d2c4b1e Add "not found" component to UI 2017-01-10 13:50:59 +01:00
Eugen
a1db2a191b Add link to list of apps 2017-01-10 12:23:30 +01:00
Eugen
67a31454ad Merge pull request #450 from blackle/master
simplify emojification on public pages with .emojify class
2017-01-10 12:21:06 +01:00
blackle
917cf0bf5d simplify emojification on public pages with .emojify class 2017-01-09 22:41:47 -05:00
Eugen Rochko
205ba00017 Fix sandboxed iOS login again 2017-01-09 19:43:53 +01:00
Eugen Rochko
5d558c14b4 Merge branch 'blackle-master' 2017-01-09 14:13:46 +01:00
Eugen Rochko
def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master 2017-01-09 14:12:40 +01:00
Eugen Rochko
d6a456dc71 Merge branch 'blackle-dropdown' 2017-01-09 14:12:00 +01:00
Eugen Rochko
3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown 2017-01-09 14:10:32 +01:00
Eugen Rochko
75f80bef10 Persist UI settings, add missing localizations for German 2017-01-09 14:00:55 +01:00
Eugen Rochko
23ebf60b95 Improve initialState loading 2017-01-09 12:37:53 +01:00
blackle
131bae89fd Generate key for each input so we can upload the same file even after deleting 2017-01-08 21:00:13 -05:00
blackle
d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile 2017-01-08 17:12:00 -05:00
Eugen Rochko
2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 2017-01-08 19:12:54 +01:00
Eugen
38bc85e695 Merge pull request #443 from blackle/master
Add call-to developers on getting started page
2017-01-08 13:36:02 +01:00
Eugen
a8e30060ae Merge pull request #446 from blackle/dropdown2
Expand dropdown leftways on status view
2017-01-08 13:34:27 +01:00
blackle
05e964688d Expand dropdown leftways on status view 2017-01-08 06:32:37 -05:00
blackle
b4f09bae1d Add call-to developers on getting started page 2017-01-08 00:23:22 -05:00
Eugen
69643338f6 Merge pull request #437 from krainboltgreene/patch-1
Simplifying followers mappings
2017-01-08 04:14:54 +01:00
Eugen
e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2
Less complicated determination of subscription
2017-01-08 04:00:22 +01:00
Eugen
db8a088502 Update badges 2017-01-08 03:47:33 +01:00
Kurtis Rainbolt-Greene
abe3ae1cc2 Simplifying followers mappings
Deduplicating some logic and switching to pluck, to avoid pulling the entire model in memory.
2017-01-07 18:09:00 -08:00
Kurtis Rainbolt-Greene
4a7e3e5082 Less complicated determination 2017-01-07 17:59:51 -08:00
Eugen
6d097d559b Merge pull request #434 from vjackson725/fix_vagrantfile
Fix Vagrantfile to include yarn
2017-01-08 02:58:43 +01:00
Eugen
4447c4c7c8 Merge pull request #435 from krainboltgreene/patch-1
Using "rails style" order arguments
2017-01-08 02:58:19 +01:00
Kurtis Rainbolt-Greene
e5d9009d71 Using "rails style" order arguments 2017-01-07 17:55:40 -08:00
vjackson725
db3d5d811c Fix Vagrantfile to include yarn
The current Vagrantfile fails to build upon provisioning, as it lacks yarn.

Change the Vagrantfile to add the yarn repository, and install yarn.
2017-01-08 12:38:04 +11:00
Eugen
7a0a13ab53 Merge pull request #432 from blackle/volume-icon
Show correct volume icons on video player
2017-01-08 02:36:12 +01:00
blackle
8a571158c9 Show correct volume icons on video player 2017-01-07 20:23:15 -05:00
Eugen
cec7e69827 Merge pull request #430 from blackle/logout_mobile
Show logout button on getting started so it's available on mobile
2017-01-08 01:24:06 +01:00
blackle
e1ca354956 Show logout button on getting started so it's available on mobile 2017-01-07 18:41:57 -05:00
Eugen
679aa35e15 Merge pull request #429 from blackle/emojify_usernames
Emojify display names in notifcations
2017-01-08 00:19:24 +01:00
blackle
57ff221c0f Emojify display names in notifcations 2017-01-07 18:16:14 -05:00