Thibaut Girka 
							
						 
					 
					
						
						
						
						
							
						
						
							84a2587d44 
							
						 
					 
					
						
						
							
							Merge branch 'master' into glitch-soc/merge-upstream  
						
						
						
						
					 
					
						2018-08-11 15:45:42 +02:00 
						 
				 
			
				
					
						
							
							
								ThibG 
							
						 
					 
					
						
						
						
						
							
						
						
							44680c46ed 
							
						 
					 
					
						
						
							
							Ensure single user is a local user ( fixes   #8154 ) ( #8157 )  
						
						
						
						
					 
					
						2018-08-11 11:53:10 +02:00 
						 
				 
			
				
					
						
							
							
								David Yip 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							16d5217502 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/master' into gs-master  
						
						... 
						
						
						
						Conflicts:
 	app/controllers/home_controller.rb
 	app/controllers/stream_entries_controller.rb
 	app/javascript/mastodon/locales/ja.json
 	app/javascript/mastodon/locales/pl.json 
						
						
					 
					
						2018-04-18 18:48:12 -05:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							aab5581c43 
							
						 
					 
					
						
						
							
							Set Referrer-Policy to origin in web UI and public pages of private toots ( #7162 )  
						
						... 
						
						
						
						Fix  #7115  
					
						2018-04-17 13:51:01 +02:00 
						 
				 
			
				
					
						
							
							
								Jenkins 
							
						 
					 
					
						
						
						
						
							
						
						
							447d7e6127 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master  
						
						
						
						
					 
					
						2018-03-09 00:17:17 +00:00 
						 
				 
			
				
					
						
							
							
								Akihiko Odaki 
							
						 
					 
					
						
						
						
						
							
						
						
							a38dbd9c8a 
							
						 
					 
					
						
						
							
							Redirect from Web tag timeline to public tag timeline if not signed in ( #6633 )  
						
						... 
						
						
						
						This is also implemented in Pawoo:
ceafdbd1bb 
						
						
					 
					
						2018-03-05 19:29:36 +01:00 
						 
				 
			
				
					
						
							
							
								kibigo! 
							
						 
					 
					
						
						
						
						
							
						
						
							bdbbd06dad 
							
						 
					 
					
						
						
							
							Finalized theme loading and stuff  
						
						
						
						
					 
					
						2017-11-20 22:13:37 -08:00 
						 
				 
			
				
					
						
							
							
								kibigo! 
							
						 
					 
					
						
						
						
						
							
						
						
							585758a373 
							
						 
					 
					
						
						
							
							Themed prefetching  
						
						
						
						
					 
					
						2017-11-16 21:37:08 -08:00 
						 
				 
			
				
					
						
							
							
								Ondřej Hruška 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							9330ea1f4d 
							
						 
					 
					
						
						
							
							Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream  
						
						
						
						
					 
					
						2017-09-28 09:12:17 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							472df24579 
							
						 
					 
					
						
						
							
							When web UI URL used while logged out, redirect to static page ( #4954 )  
						
						
						
						
					 
					
						2017-09-15 00:57:08 +02:00 
						 
				 
			
				
					
						
							
							
								Gô Shoemake 
							
						 
					 
					
						
						
						
						
							
						
						
							b61e3daf98 
							
						 
					 
					
						
						
							
							Multiple frontend support ( #110 )  
						
						... 
						
						
						
						* Initial multiple frontend support
* Removed unnecessary require()
* Moved styles/images out of common 
						
						
					 
					
						2017-07-30 19:28:21 +02:00 
						 
				 
			
				
					
						
							
							
								Sorin Davidoi 
							
						 
					 
					
						
						
						
						
							
						
						
							0c7c188c45 
							
						 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e19eefe219 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							864e3f8d9c 
							
						 
					 
					
						
						
							
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							ed7dc1704d 
							
						 
					 
					
						
						
							
							Bind web UI access tokens to sessions ( #3940 )  
						
						... 
						
						
						
						* Add overview of active sessions
* Better display of browser/platform name
* Improve how browser information is stored and displayed for sessions overview
* Fix test
* Fix  #2347  - Bind web UI access token to session
When you logout, session also destroys the access token, so it's no longer
valid. If access token is destroyed some other way, the session is also
destroyed, requiring a re-login.
Fix  #1681  - Add scheduler to remove revoked access tokens and grants
* Fix test 
						
						
					 
					
						2017-06-25 23:51:32 +02:00 
						 
				 
			
				
					
						
							
							
								Yamagishi Kazutoshi 
							
						 
					 
					
						
						
						
						
							
						
						
							c25426ca47 
							
						 
					 
					
						
						
							
							Fix Doorkeeper error ( #2534 )  
						
						... 
						
						
						
						* Fix Doorkeeper error
* use Doorkeeper::OAuth::Scopes.from_string 
						
						
					 
					
						2017-04-27 18:04:28 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen 
							
						 
					 
					
						
						
						
						
							
						
						
							6d70a80263 
							
						 
					 
					
						
						
							
							Onboarding modal ( #1883 )  
						
						... 
						
						
						
						* Basic onboarding modal that's shown to users once
* Lay out pages 2 through 5, add images, style modals (#1509 )
* Lay out pages 2 through 5
Added images and laid out pages 2 through 5 in the jsx file. SCSS will
come, still working on just seeing if this works at all.
* Fix jsx errors, add images to modal pages, style modal pages
* Add animations to onboarding pager changes, improve wording and styling
* Finishing touches on the onboarding
* Add missing propTypes
* Update wording 
						
						
					 
					
						2017-04-16 20:32:00 +02:00 
						 
				 
			
				
					
						
							
							
								Marcin Cieślak 
							
						 
					 
					
						
						
						
						
							
						
						
							1c8477eab2 
							
						 
					 
					
						
						
							
							Give SINGLE_USER a chance to register ( #1820 )  
						
						... 
						
						
						
						An attempt to open a brand new Mastodon instance configured
as SINGLE_USER_MODE=true will cause an exception.
Enable temporary registration if we have no users in the database
Fixes  #1817  
						
						
					 
					
						2017-04-15 16:46:27 +02:00 
						 
				 
			
				
					
						
							
							
								Joachim Viide 
							
						 
					 
					
						
						
						
						
							
						
						
							ef879a8839 
							
						 
					 
					
						
						
							
							Send initial state in a <script type="application/json"> tag ( #1806 )  
						
						
						
						
					 
					
						2017-04-15 02:32:42 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							75f80bef10 
							
						 
					 
					
						
						
							
							Persist UI settings, add missing localizations for German  
						
						
						
						
					 
					
						2017-01-09 14:00:55 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1357c1cb3d 
							
						 
					 
					
						
						
							
							Add single user mode  
						
						
						
						
					 
					
						2016-12-06 17:19:26 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							fdc17bea58 
							
						 
					 
					
						
						
							
							Fix rubocop issues, introduce usage of frozen literal to improve performance  
						
						
						
						
					 
					
						2016-11-15 16:56:29 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e40a3d80 
							
						 
					 
					
						
						
							
							Adding OAuth access scopes, fixing OAuth authorization UI, adding rate limiting  
						
						... 
						
						
						
						to the API 
						
						
					 
					
						2016-10-22 19:39:44 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							927333f4f8 
							
						 
					 
					
						
						
							
							Improve code style  
						
						
						
						
					 
					
						2016-09-29 21:28:21 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							e63aebff7a 
							
						 
					 
					
						
						
							
							Adding landing page  
						
						
						
						
					 
					
						2016-09-27 23:12:33 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							7e14eefc81 
							
						 
					 
					
						
						
							
							Replace logo,  fix   #57  - delete/unreblog/unfavourite API,  fix   #45  - app  
						
						... 
						
						
						
						registration API 
						
						
					 
					
						2016-09-26 23:56:53 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							92afd29650 
							
						 
					 
					
						
						
							
							The frontend will now be an OAuth app, auto-authorized. The frontend will use an access token for API requests  
						
						... 
						
						
						
						Adding better errors for the API controllers, posting a simple status works from the frontend now 
						
						
					 
					
						2016-08-26 19:12:19 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							49520d6e62 
							
						 
					 
					
						
						
							
							Adding React.js, Redux, revamping dashboard  
						
						
						
						
					 
					
						2016-08-24 17:56:44 +02:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							5764d52b04 
							
						 
					 
					
						
						
							
							Fix Sidekiq pooling issues. Remove API docs from homepage, replace with  
						
						... 
						
						
						
						a basic home timeline 
						
						
					 
					
						2016-03-25 16:10:14 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							1aa477ac2f 
							
						 
					 
					
						
						
							
							Customized more doorkeeper views, only logged in users can create oauth apps  
						
						
						
						
					 
					
						2016-03-12 19:46:06 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							aab9f57e36 
							
						 
					 
					
						
						
							
							Adding config for puma, dashboard layout, fixing some queries  
						
						
						
						
					 
					
						2016-03-12 16:21:53 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							6c4c84b161 
							
						 
					 
					
						
						
							
							Distrubute statuses as a fan-out-on-write system, with optional precomputing  
						
						
						
						
					 
					
						2016-03-08 20:20:45 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							3824c58853 
							
						 
					 
					
						
						
							
							Adding GNU Public license, adding home timeline, reblog/favourite counters  
						
						
						
						
					 
					
						2016-03-06 17:52:23 +01:00 
						 
				 
			
				
					
						
							
							
								Eugen Rochko 
							
						 
					 
					
						
						
						
						
							
						
						
							709c6685a9 
							
						 
					 
					
						
						
							
							Made some progress  
						
						
						
						
					 
					
						2016-02-22 16:00:20 +01:00