kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								19263f30c3
								
							
						 | 
						
							
							
								
								Merge branch 'support-rel-ugc' into 'develop'
							
							
							
							
							
							
							
							Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679 
							
						 | 
						
							2019-09-23 22:41:31 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Rachel Fae Fox
								
							 
						 | 
						
							
							
							
							
								
							
							
								63af6951fa
								
							
						 | 
						
							
							
								
								add tunable for stream uploads, as needed for jortage to work.
							
							
							
							
							
						 | 
						
							2019-09-23 20:38:53 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d639cdcecb
								
							
						 | 
						
							
							
								
								Update "config/description.exs"
							
							
							
							
							
						 | 
						
							2019-09-19 14:56:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								cf3041220a
								
							
						 | 
						
							
							
								
								Add support for rel="ugc"
							
							
							
							
							
						 | 
						
							2019-09-19 14:56:10 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								3e972c0456
								
							
						 | 
						
							
							
								
								Add :shared_pack_cache_seconds_per_file to description.exs
							
							
							
							
							
						 | 
						
							2019-09-19 00:23:18 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								ee620ecbf1
								
							
						 | 
						
							
							
								
								Add caching for emoji pack sharing
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ekaterina Vaartis
								
							 
						 | 
						
							
							
							
							
								
							
							
								7e4c8b56ea
								
							
						 | 
						
							
							
								
								Add tests for emoji pack sharing
							
							
							
							
							
						 | 
						
							2019-09-19 00:16:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								32d64102cb
								
							
						 | 
						
							
							
								
								description.exs: uncomment type for email logo
							
							
							
							
							
						 | 
						
							2019-09-17 23:05:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								c0c5628200
								
							
						 | 
						
							
							
								
								description.exs: remove empty strings on descriptions
							
							
							
							
							
						 | 
						
							2019-09-17 23:05:26 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								50ec445b2c
								
							
						 | 
						
							
							
								
								description.exs: remove empty strings and arrays
							
							
							
							
							
						 | 
						
							2019-09-17 23:05:13 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Haelwenn (lanodan) Monnier
								
							 
						 | 
						
							
							
								
								
							
							
							
								
							
							
								35dcea3e13
								
							
						 | 
						
							
							
								
								Remove [true,false] for booleans, it is implicit
							
							
							
							
							
						 | 
						
							2019-09-17 21:47:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								d6ab78e610
								
							
						 | 
						
							
							
								
								Set account_field_value_length limit to 2048 by default
							
							
							
							
							
						 | 
						
							2019-09-16 21:48:01 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								96816ceaa2
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'revert-4fabf83a' into 'develop'"
							
							
							
							
							
							
							
							This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0. 
							
						 | 
						
							2019-09-16 17:55:04 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									kaniini
								
							 
						 | 
						
							
							
							
							
								
							
							
								c623b4324d
								
							
						 | 
						
							
							
								
								Revert "Merge branch 'streamer-refactoring' into 'develop'"
							
							
							
							
							
							
							
							This reverts merge request !1653 
							
						 | 
						
							2019-09-16 09:09:21 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Steven Fuchs
								
							 
						 | 
						
							
							
							
							
								
							
							
								aab264db82
								
							
						 | 
						
							
							
								
								Streamer refactoring
							
							
							
							
							
						 | 
						
							2019-09-16 07:44:03 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e127b9ab6d
								
							
						 | 
						
							
							
								
								[#1149] Rewritten readme as config/description.exs.
							
							
							
							
							
						 | 
						
							2019-09-14 16:28:59 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								6bcedb693c
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	docs/config.md
#	mix.lock 
							
						 | 
						
							2019-09-14 16:11:44 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								f884987ace
								
							
						 | 
						
							
							
								
								Merge branch 'admin-config-description' into 'develop'
							
							
							
							
							
							
							
							Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611 
							
						 | 
						
							2019-09-13 12:36:24 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								56828abf6d
								
							
						 | 
						
							
							
								
								Use Jason for rendering responses
							
							
							
							
							
							
							
							Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)) 
							
						 | 
						
							2019-09-11 23:06:31 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								e47089cf55
								
							
						 | 
						
							
							
								
								web_cache_ttl description
							
							
							
							
							
						 | 
						
							2019-09-11 09:32:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								10827eecad
								
							
						 | 
						
							
							
								
								formatting
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								5db2920644
								
							
						 | 
						
							
							
								
								Apply suggestion to config/description.exs
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alexander Strizhakov
								
							 
						 | 
						
							
							
							
							
								
							
							
								65bc9e66ad
								
							
						 | 
						
							
							
								
								Apply suggestion to config/description.exs
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								6721301086
								
							
						 | 
						
							
							
								
								some changes
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alex S
								
							 
						 | 
						
							
							
							
							
								
							
							
								171cefd889
								
							
						 | 
						
							
							
								
								description.exs
							
							
							
							
							
						 | 
						
							2019-09-11 09:25:33 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									minibikini
								
							 
						 | 
						
							
							
							
							
								
							
							
								11e12b5761
								
							
						 | 
						
							
							
								
								Add Pleroma.Plugs.Cache
							
							
							
							
							
						 | 
						
							2019-09-09 18:53:08 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								79cf629e1a
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-09-05 11:30:41 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ashlynn Anderson
								
							 
						 | 
						
							
							
							
							
								
							
							
								bd8b92ea5e
								
							
						 | 
						
							
							
								
								Remove dynamic config as default, add healthcheck
							
							
							
							
							
						 | 
						
							2019-09-03 09:31:52 -04:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								b49085c156
								
							
						 | 
						
							
							
								
								[#1149] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
							
							
							
							
							
						 | 
						
							2019-09-02 14:57:40 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								a90ea8ba15
								
							
						 | 
						
							
							
								
								[#1149] Addressed code review comments (code style, jobs pruning etc.).
							
							
							
							
							
						 | 
						
							2019-08-31 19:08:56 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								e890ea7e82
								
							
						 | 
						
							
							
								
								[#1149] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	config/config.exs 
							
						 | 
						
							2019-08-31 14:25:43 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								66c1966688
								
							
						 | 
						
							
							
								
								Disable rate limiter by default
							
							
							
							
							
						 | 
						
							2019-08-26 20:36:44 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								cc6c0b4ba6
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
							
							
							
							
							
						 | 
						
							2019-08-24 15:48:33 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c34126f89c
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-08-24 09:29:54 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									aries
								
							 
						 | 
						
							
							
							
							
								
							
							
								e5f76a54e6
								
							
						 | 
						
							
							
								
								Fix default config of account fields length
							
							
							
							
							
						 | 
						
							2019-08-23 21:28:52 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								581123f8bb
								
							
						 | 
						
							
							
								
								[#1149] Introduced quantum job scheduler. Documentation & config changes.
							
							
							
							
							
						 | 
						
							2019-08-23 18:28:23 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								c29686309e
								
							
						 | 
						
							
							
								
								[#1149] Upgraded oban from 0.6.0 to 0.7.1.
							
							
							
							
							
						 | 
						
							2019-08-23 09:23:10 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								7101ba1a21
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-08-22 21:01:28 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								256ff09aa8
								
							
						 | 
						
							
							
								
								[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
							
							
							# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/scheduled_activity_worker.ex
#	lib/pleroma/web/federator/retry_queue.ex
#	lib/pleroma/web/oauth/token/clean_worker.ex
#	test/user_test.exs
#	test/web/federator_test.exs 
							
						 | 
						
							2019-08-22 20:59:58 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								f740d786a3
								
							
						 | 
						
							
							
								
								Merge branch 'rate-limit-ap-routes' into 'develop'
							
							
							
							
							
							
							
							[#1174] Rate limit AP routes
See merge request pleroma/pleroma!1586 
							
						 | 
						
							2019-08-21 16:45:20 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d899d6197
								
							
						 | 
						
							
							
								
								Add :ap_routes rate limit
							
							
							
							
							
						 | 
						
							2019-08-20 22:10:36 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									lain
								
							 
						 | 
						
							
							
							
							
								
							
							
								8340fe8fcc
								
							
						 | 
						
							
							
								
								Merge branch 'digest-template' into 'develop'
							
							
							
							
							
							
							
							Improve digest email template
See merge request pleroma/pleroma!1565 
							
						 | 
						
							2019-08-20 12:55:51 +00:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								158231cd20
								
							
						 | 
						
							
							
								
								Add configurable colors and logo for the digest template
							
							
							
							
							
						 | 
						
							2019-08-16 18:32:25 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Ivan Tashkinov
								
							 
						 | 
						
							
							
							
							
								
							
							
								8778c16dac
								
							
						 | 
						
							
							
								
								Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
							
							
							
							
							
						 | 
						
							2019-08-14 21:44:50 +03:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								a2e1db5632
								
							
						 | 
						
							
							
								
								Increase max account fields limits
							
							
							
							
							
						 | 
						
							2019-08-14 14:58:38 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e457fcc479
								
							
						 | 
						
							
							
								
								Add :max_remote_account_fields config option
							
							
							
							
							
						 | 
						
							2019-08-14 14:58:06 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								2c35d4b0b0
								
							
						 | 
						
							
							
								
								Add configurable account field name length limit
							
							
							
							
							
						 | 
						
							2019-08-14 14:52:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								db3c05f6b4
								
							
						 | 
						
							
							
								
								Add configurable account field value length limit
							
							
							
							
							
						 | 
						
							2019-08-14 14:52:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Egor Kislitsyn
								
							 
						 | 
						
							
							
							
							
								
							
							
								e0ac5c7a66
								
							
						 | 
						
							
							
								
								Add custom profile fields
							
							
							
							
							
						 | 
						
							2019-08-14 14:52:54 +07:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									rinpatch
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ef31767f2
								
							
						 | 
						
							
							
								
								Merge branch 'feature/mrf-vocabulary' into 'develop'
							
							
							
							
							
							
							
							MRF Vocabulary
See merge request pleroma/pleroma!1559 
							
						 | 
						
							2019-08-13 22:51:15 +00:00 | 
						
						
							
							
							
								
							
							
						 |