Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								52200998c9
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into feature/activitypub
							
							
							
							
							
						 | 
						
							2018-02-11 09:50:55 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e2ca77eec
								
							
						 | 
						
							
							
								
								update frontend
							
							
							
							
							
						 | 
						
							2018-02-09 17:14:11 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								103eca482c
								
							
						 | 
						
							
							
								
								update frontend
							
							
							
							
							
						 | 
						
							2018-02-07 13:44:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								61c16193de
								
							
						 | 
						
							
							
								
								Merge branch 'move-backend-images' into 'develop'
							
							
							
							
							
							
							
							Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60 
							
						 | 
						
							2018-02-03 13:05:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								ea6d1b2b17
								
							
						 | 
						
							
							
								
								move avi.png & banner.png from /priv/static/static to /priv/static/images
							
							
							
							
							
						 | 
						
							2018-02-03 20:43:14 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9a9766d648
								
							
						 | 
						
							
							
								
								Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
							
							
							
							
							
						 | 
						
							2018-02-02 17:14:58 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								2203fa2fdb
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2018-02-02 17:14:23 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								e47f60c053
								
							
						 | 
						
							
							
								
								provide instance thumbnail at /api/v1/instance (debug)
							
							
							
							
							
						 | 
						
							2018-01-31 23:04:34 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								10753178ea
								
							
						 | 
						
							
							
								
								provide instance thumbnail at /api/v1/instance (debug)
							
							
							
							
							
						 | 
						
							2018-01-31 22:57:43 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								a4335e391f
								
							
						 | 
						
							
							
								
								provide instance thumbnail at /api/v1/instance
							
							
							
							
							
						 | 
						
							2018-01-31 22:51:25 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								8db83c3dc0
								
							
						 | 
						
							
							
								
								Merge branch 'feature/longfox' into 'develop'
							
							
							
							
							
							
							
							add longfox emojis
See merge request pleroma/pleroma!53 
							
						 | 
						
							2018-01-27 11:57:34 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hakaba Hitoyo
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e1d4819ca
								
							
						 | 
						
							
							
								
								add longfox emojis
							
							
							
							
							
						 | 
						
							2018-01-27 08:38:48 +09:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								e97864bfcb
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2018-01-26 15:12:34 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								5957c6517d
								
							
						 | 
						
							
							
								
								Fix config.
							
							
							
							
							
						 | 
						
							2018-01-26 14:31:52 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								cd3210c9b8
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2018-01-26 14:28:27 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									eal
								
							 
						 | 
						
							
							
							
							
								
							
							
								14b086eec2
								
							
						 | 
						
							
							
								
								Add a default profile picture and banner.
							
							
							
							
							
							
							
							This removes the placehold.it dependency. 
							
						 | 
						
							2018-01-15 22:18:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								4a13b84887
								
							
						 | 
						
							
							
								
								Add recipients field to activities.
							
							
							
							
							
							
							
							Also do some very basic checks for AP message insertion. 
							
						 | 
						
							2017-12-12 18:07:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								74e92152b7
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-12-05 12:11:46 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								b652dc5f2e
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-12-05 11:53:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								d01243c16e
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-12-04 19:12:31 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Lain Iwakura
								
							 
						 | 
						
							
							
							
							
								
							
							
								50dca016f2
								
							
						 | 
						
							
							
								
								Add count index for local users.
							
							
							
							
							
						 | 
						
							2017-11-30 15:00:12 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								44f7154fb9
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-24 08:37:41 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ad90da07f5
								
							
						 | 
						
							
							
								
								untoot.
							
							
							
							
							
						 | 
						
							2017-11-22 16:10:03 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lambda
								
							 
						 | 
						
							
							
							
							
								
							
							
								698a75cb39
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'develop'
							
							
							
							
							
							
							
							Pleroma-Dark default theme for the Mastodon Frontend
See merge request pleroma/pleroma!27 
							
						 | 
						
							2017-11-22 14:19:27 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								d7b6fa79cb
								
							
						 | 
						
							
							
								
								Fixed in-reply CSS, also included full column width (to have timelines take the whole screen size.)
							
							
							
							
							
						 | 
						
							2017-11-22 14:12:04 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								0716f8e626
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-22 12:19:13 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								dae2949bcc
								
							
						 | 
						
							
							
								
								Fix a links... Retweet button still broken.
							
							
							
							
							
						 | 
						
							2017-11-20 17:19:22 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								0c68e75b93
								
							
						 | 
						
							
							
								
								Update pl-dark-masto-fe.css
							
							
							
							
							
						 | 
						
							2017-11-20 17:09:14 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								cb071745b5
								
							
						 | 
						
							
							
								
								Update pl-dark-masto-fe.css, fix notification_message and retweet
							
							
							
							
							
						 | 
						
							2017-11-20 16:54:32 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								f065689407
								
							
						 | 
						
							
							
								
								Update pl-dark-masto-fe.css
							
							
							
							
							
						 | 
						
							2017-11-19 19:04:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Hyper! (Stitch)
								
							 
						 | 
						
							
							
							
							
								
							
							
								97bb99edba
								
							
						 | 
						
							
							
								
								Add new file
							
							
							
							
							
						 | 
						
							2017-11-19 19:04:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f6495abf73
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-19 13:31:09 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								3d1360c4d6
								
							
						 | 
						
							
							
								
								Add mastodon emoji folder.
							
							
							
							
							
						 | 
						
							2017-11-16 09:35:14 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								773eba4f0b
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-14 09:34:28 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								d293ceb1b5
								
							
						 | 
						
							
							
								
								Add Mastodon frontend.
							
							
							
							
							
						 | 
						
							2017-11-12 14:23:05 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ccde03285d
								
							
						 | 
						
							
							
								
								add sort index for activities
							
							
							
							
							
						 | 
						
							2017-11-09 15:16:10 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9e60de695d
								
							
						 | 
						
							
							
								
								Fix migration for empty db.
							
							
							
							
							
						 | 
						
							2017-11-09 13:45:17 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bf261589f
								
							
						 | 
						
							
							
								
								Update activities in own migration.
							
							
							
							
							
						 | 
						
							2017-11-09 13:32:53 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								20b8b87743
								
							
						 | 
						
							
							
								
								Update in chunks.
							
							
							
							
							
						 | 
						
							2017-11-09 12:33:38 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f1d27a5fbb
								
							
						 | 
						
							
							
								
								Add actor column to activities.
							
							
							
							
							
						 | 
						
							2017-11-09 10:41:19 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								36557155af
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-08 16:16:29 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								f801b695d7
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-11-07 18:33:06 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								abfcf93dfc
								
							
						 | 
						
							
							
								
								Update fronted.
							
							
							
							
							
						 | 
						
							2017-11-07 18:27:08 +01:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								ab2d4503e7
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-10-26 13:30:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9af560083f
								
							
						 | 
						
							
							
								
								Use more efficient user note count update query.
							
							
							
							
							
						 | 
						
							2017-10-24 14:16:17 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								29c261e75b
								
							
						 | 
						
							
							
								
								Drop superflous index.
							
							
							
							
							
						 | 
						
							2017-10-24 11:07:21 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								9f417fd5e9
								
							
						 | 
						
							
							
								
								Speed up deletion and related queries.
							
							
							
							
							
						 | 
						
							2017-10-23 18:30:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								6af164f27b
								
							
						 | 
						
							
							
								
								Add password reset.
							
							
							
							
							
						 | 
						
							2017-10-19 17:37:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd100fd765
								
							
						 | 
						
							
							
								
								Update frontend.
							
							
							
							
							
						 | 
						
							2017-09-17 14:38:04 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Roger Braun
								
							 
						 | 
						
							
							
							
							
								
							
							
								62ca2617cd
								
							
						 | 
						
							
							
								
								Add tag index.
							
							
							
							
							
							
							
							This still isn't optimal, but at least it isn't super slow. 
							
						 | 
						
							2017-09-17 14:05:53 +02:00 | 
						
						
							
							
							
								
							
							
						 |