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

93 commits

Author SHA1 Message Date
Eugen Rochko
6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146) 2018-08-09 09:56:53 +02:00
Thibaut Girka
30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	config/settings.yml
 2018-08-01 22:20:25 +02:00
Eugen Rochko
934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107) 
* Add separate setting for sidebar text (site_short_description)

* Fix tests
 2018-07-31 18:59:34 +02:00
Jenkins
3fc6e7dabb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-05-04 18:17:32 +00:00
Eugen Rochko
93b8db8f08 Better pagination for ActivityPub outbox (#7356) 2018-05-04 19:19:11 +02:00
Thibaut Girka
12f8473561 Add backend support for bookmarks 
Bookmarks behave like favourites, except they aren't shared with other
users and do not have an associated counter.
 2018-04-11 20:40:29 +02:00
imncls
c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon 
# Conflicts:
#	app/controllers/settings/exports_controller.rb
#	app/models/media_attachment.rb
#	app/models/status.rb
#	app/views/about/show.html.haml
#	docker_entrypoint.sh
#	spec/views/about/show.html.haml_spec.rb
 2018-02-23 23:28:31 +09:00
Eugen Rochko
ad1f541bd7 Redesign landing page (again) (#6486) 
* Redesign landing page (again)

* Move login form in small version to the right column

* Display closed registrations message

* Add site setting for the hero image

* Fix test

* Increase spacing, maximum width, change call to action section
 2018-02-22 01:03:48 +01:00
Eugen Rochko
cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527) 
It was merge when it needed to be deep_merge. And added some tests
 2018-02-21 23:22:12 +01:00
Jenkins
e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2018-02-19 15:17:14 +00:00
Eugen Rochko
750f3e64c9 Cache relationships in API (#6482) 
* Cache relationships in API

* Fetch relationships for search results in UI

* Only save one account's maps in each cache item
 2018-02-18 03:14:46 +01:00
Jenkins
a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master 2017-12-06 20:17:13 +00:00
Yamagishi Kazutoshi
fba46b6072 Using double splat operator (#5859) 2017-12-06 11:41:57 +01:00
Ondřej Hruška
0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream 2017-09-28 09:18:35 +02:00
Ondřej Hruška
914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream 2017-09-28 09:12:17 +02:00
Daigo 3 Dango
7e6322863c Compact status_ids in StatusRelationshipsPresenter (#5073) 2017-09-24 11:18:32 +02:00
nullkal
e5a634f940 Use OrderedCollectionPage to return followers/following list (#4949) 2017-09-19 16:37:06 +02:00
Akihiko Odaki
f4e3449e61 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) 
It is faster.
 2017-09-18 14:59:57 +02:00
Eugen Rochko
9ff429aa6d Uploads for admin site settings (#4913) 
* Improve OpenGraph tags for about pages

* Add thumbnail admin setting

* Fix error

* Fix up
 2017-09-14 00:04:30 +02:00
David Yip
67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream 2017-09-09 14:28:08 -05:00
David Yip
da3f22ee7d Merge branch 'origin/master' into sync/upstream 
Conflicts:
	app/javascript/mastodon/components/status_list.js
	app/javascript/mastodon/features/notifications/index.js
	app/javascript/mastodon/features/ui/components/modal_root.js
	app/javascript/mastodon/features/ui/components/onboarding_modal.js
	app/javascript/mastodon/features/ui/index.js
	app/javascript/styles/about.scss
	app/javascript/styles/accounts.scss
	app/javascript/styles/components.scss
	app/presenters/instance_presenter.rb
	app/services/post_status_service.rb
	app/services/reblog_service.rb
	app/views/about/more.html.haml
	app/views/about/show.html.haml
	app/views/accounts/_header.html.haml
	config/webpack/loaders/babel.js
	spec/controllers/api/v1/accounts/credentials_controller_spec.rb
 2017-09-09 14:27:47 -05:00
Eugen Rochko
181cbbcaf8 Fix #4794 - Fake instant follow in API response when account is believed unlocked (#4799) 2017-09-05 17:48:13 +02:00
Eugen Rochko
3e20cb7025 Pinned statuses (#4675) 
* Pinned statuses

* yarn manage:translations
 2017-08-25 01:41:18 +02:00
Daigo 3 Dango
fd9d66dfd4 Add Mastodon::Source.url (#4643) 
* Add Mastodon::Source.url

* Update spec

* Refactor

Move things frmo Mastodon::Source to Mastodon::Version
 2017-08-22 22:54:19 +02:00
Eugen Rochko
0e5c8372e7 Add protocol handler. Handle follow intents (#4511) 
* Add protocol handler. Handle follow intents

* Add share intent

* Improve code in intents controller

* Adjust share form CSS
 2017-08-14 04:53:31 +02:00
Ondřej Hruška
2129485669 Fix JS errors and add back commit hash 2017-07-25 21:54:12 +02:00
Ondřej Hruška
713938f266 Updated from tootsuite 2017-07-17 20:03:57 +02:00
Eugen Rochko
f3ed02e492 Minor ActivityPub JSON fixes (#4214) 
- Objects must have attributedTo instead of actor
- The current attribute belongs to CollectionPage, not Collection
 2017-07-16 10:28:55 +02:00
kibigo!
f48f42598f Merge upstream (#81) 2017-07-15 14:33:15 -07:00
Eugen Rochko
c99f41dc3c Improve ActivityPub representations (#3844) 
* Improve webfinger templates and make tests more flexible

* Clean up AS2 representation of actor

* Refactor outbox

* Create activities representation

* Add representations of followers/following collections, do not redirect /users/:username route if format is empty

* Remove unused translations

* ActivityPub endpoint for single statuses, add ActivityPub::TagManager for better
URL/URI generation

* Add ActivityPub::TagManager#to

* Represent all attachments as Document instead of Image/Video specifically
(Because for remote ones we may not know for sure)

Add mentions and hashtags representation to AP notes

* Add AP-resolvable hashtag URIs

* Use ActiveModelSerializers for ActivityPub

* Clean up unused translations

* Separate route for object and activity

* Adjust cc/to matrices

* Add to/cc to activities, ensure announce activity embeds target status and
not the wrapper status, add "id" to all collections
 2017-07-15 03:01:39 +02:00
unarist
df81145b7c Fix response of unreblog/unfavourite APIs (#4204) 
Both APIs process asynchronously, so reblogged/favourited fields in the response should be set to `false` manually.
 2017-07-14 20:44:53 +02:00
Sorin Davidoi
ecab38fd66 Web Push Notifications (#3243) 
* feat: Register push subscription

* feat: Notify when mentioned

* feat: Boost, favourite, reply, follow, follow request

* feat: Notification interaction

* feat: Handle change of public key

* feat: Unsubscribe if things go wrong

* feat: Do not send normal notifications if push is enabled

* feat: Focus client if open

* refactor: Move push logic to WebPushSubscription

* feat: Better title and body

* feat: Localize messages

* chore: Fix lint errors

* feat: Settings

* refactor: Lazy load

* fix: Check if push settings exist

* feat: Device-based preferences

* refactor: Simplify logic

* refactor: Pull request feedback

* refactor: Pull request feedback

* refactor: Create /api/web/push_subscriptions endpoint

* feat: Spec PushSubscriptionController

* refactor: WebPushSubscription => Web::PushSubscription

* feat: Spec Web::PushSubscription

* feat: Display first media attachment

* feat: Support direction

* fix: Stuff broken while rebasing

* refactor: Integration with session activations

* refactor: Cleanup

* refactor: Simplify implementation

* feat: Set VAPID keys via environment

* chore: Comments

* fix: Crash when no alerts

* fix: Set VAPID keys in testing environment

* fix: Follow link

* feat: Notification actions

* fix: Delete previous subscription

* chore: Temporary logs

* refactor: Move migration to a later date

* fix: Fetch the correct session activation and misc bugs

* refactor: Move migration to a later date

* fix: Remove follow request (no notifications)

* feat: Send administrator contact to push service

* feat: Set time-to-live

* fix: Do not show sensitive images

* fix: Reducer crash in error handling

* feat: Add badge

* chore: Fix lint error

* fix: Checkbox label overlap

* fix: Check for payload support

* fix: Rename action "type" (crash in latest Chrome)

* feat: Action to expand notification

* fix: Lint errors

* fix: Unescape notification body

* fix: Do not allow boosting if the status is hidden

* feat: Add VAPID keys to the production sample environment

* fix: Strip HTML tags from status

* refactor: Better error messages

* refactor: Handle browser not implementing the VAPID protocol (Samsung Internet)

* fix: Error when target_status is nil

* fix: Handle lack of image

* fix: Delete reference to invalid subscriptions

* feat: Better error handling

* fix: Unescape HTML characters after tags are striped

* refactor: Simpify code

* fix: Modify to work with #4091

* Sort strings alphabetically

* i18n: Updated Polish translation

it annoys me that it's not fully localized :P

* refactor: Use current_session in PushSubscriptionController

* fix: Rebase mistake

* fix: Set cacheName to mastodon

* refactor: Pull request feedback

* refactor: Remove logging statements

* chore(yarn): Fix conflicts with master

* chore(yarn): Copy latest from master

* chore(yarn): Readd offline-plugin

* refactor: Use save! and update!

* refactor: Send notifications async

* fix: Allow retry when push fails

* fix: Save track for failed pushes

* fix: Minify sw.js

* fix: Remove account_id from fabricator
 2017-07-13 22:15:32 +02:00
kibigo!
bcc30c8697 Merge upstream!! #64 <3 <3 2017-07-12 02:03:17 -07:00
DJ Sundog
be8eed1bd9 First lame pass at adding optional git commit hash display on /about/… (#67) 
* First lame pass at adding optional git commit hash display on /about/more page.

Currently, this is implemented by checking for the existence of a file called CURRENT_RELEASE in the home directory of the user running Mastodon. If the file exists, its contents are added.

I've modified my update process to include the following before precompiling assets:

git log -1 | head -n 1 | cut -d " " -f2 > ~/CURRENT_RELEASE

That puts the current commit hash into the file ~/CURRENT_RELEASE, but you figured that out because you're a smart cookie.

As I am quite sure this is a horrible methodology for implementing this, I look forward to any improvements you have to offer!

* Updated to handle instances that share a user - the CURRENT_RELEASE file now lives in the instance's base directory.

This also requires modifying the update hook to `git log -1 | head -n 1 | cut -d " " -f2 > CURRENT_RELEASE`
 2017-07-11 20:32:16 -04:00
Eugen Rochko
49026e27e8 Redesign the landing page, mount public timeline on it (#4122) 
* Redesign the landing page, mount public timeline on it

* Adjust the standalone mounted component to the lacking of router

* Adjust auth layout pages to new design

* Fix tests

* Standalone public timeline polling every 5 seconds

* Remove now obsolete translations

* Add responsive design for new landing page

* Address reviews

* Add floating clouds behind frontpage form

* Use access token from public page when available

* Fix mentions and hashtags links, cursor on status content in standalone mode

* Add footer link to source code

* Fix errors on pages that don't embed the component, use classnames

* Fix tests

* Change anonymous autoPlayGif default to false

* When gif autoplay is disabled, hover to play

* Add option to hide the timeline preview

* Slightly improve alt layout

* Add elephant friend to new frontpage

* Display "back to mastodon" in place of "login" when logged in on frontpage

* Change polling time to 3s
 2017-07-11 15:27:59 +02:00
Eugen Rochko
0d54e620d9 Replace OEmbed and initial state Rabl templates with serializers (#4110) 
* Replace OEmbed Rabl template with serializer

* Replace initial state rabl with serializer
 2017-07-08 14:51:05 +02:00
Eugen Rochko
20e15ecfb3 Refactor JSON templates to be generated with ActiveModelSerializers instead of Rabl (#4090) 2017-07-07 04:02:06 +02:00
Yamagishi Kazutoshi
68abc90aec Customizable privacy policy from admin interface (#4062) 2017-07-04 15:19:24 +02:00
Eugen Rochko
e21b9c875e Bump version, improve how version is stored for better commit history (#2526) 2017-04-27 15:22:19 +02:00
Ash Furrow
c229532144 Adds version to about/more and API (#2181) 
* Adds version.

* Cleans up code.

* Removes standalone endpoint and adds version to instance endpoint.

* Addresses feedback from #2181.
 2017-04-21 03:30:59 +02:00
alpaca-tc
c413926027 Replace User.count -> User.confirmed.count (#2127) 2017-04-19 14:58:27 +02:00
Matt Jankowski
f382a4f746 About page contact email (#1839) 
* Correct site_contact_email typo

* Separate about more page into partials, add specs
 2017-04-15 13:33:25 +02:00
Matt Jankowski
41b79ae693 Clean up about page (#1282) 
* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter
 2017-04-09 14:47:25 +02:00