Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								666409dce0
								
							
						 | 
						
							
							
								
								Merge branch 'better-black-conf' into 'develop'
							
							
							
							
							
							
							
							Unified black conf
See merge request funkwhale/funkwhale!675 
							
						 | 
						
							2019-03-15 12:11:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								302031b4e3
								
							
						 | 
						
							
							
								
								Unified black conf
							
							
							
							
							
						 | 
						
							2019-03-15 12:11:05 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								3501e8ca56
								
							
						 | 
						
							
							
								
								Merge branch '758-authenticate-fetches' into 'develop'
							
							
							
							
							
							
							
							Fix #758: Ensure all our ActivityPub fetches are authenticated
Closes #758
See merge request funkwhale/funkwhale!674 
							
						 | 
						
							2019-03-15 12:08:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								da3710ff08
								
							
						 | 
						
							
							
								
								Fix #758: Ensure all our ActivityPub fetches are authenticated
							
							
							
							
							
						 | 
						
							2019-03-15 12:08:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								0cec13a78e
								
							
						 | 
						
							
							
								
								Merge branch '582-document-backup' into 'develop'
							
							
							
							
							
							
							
							Add backup instructions for multi container and debian
Closes #582
See merge request funkwhale/funkwhale!671 
							
						 | 
						
							2019-03-15 10:54:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Renon
							
						 | 
						
							
							
							
							
							
								
							
							
								b0a26bc7e9
								
							
						 | 
						
							
							
								
								Add backup instructions for multi container and debian
							
							
							
							
							
						 | 
						
							2019-03-15 10:54:23 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								8b47af8b81
								
							
						 | 
						
							
							
								
								Merge branch '629-cookie-auth' into 'develop'
							
							
							
							
							
							
							
							Resolve "Use cookies instead of local storage for auth in Web UI"
Closes #629
See merge request funkwhale/funkwhale!666 
							
						 | 
						
							2019-03-13 16:50:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								c395076fce
								
							
						 | 
						
							
							
								
								Resolve "Use cookies instead of local storage for auth in Web UI"
							
							
							
							
							
						 | 
						
							2019-03-13 16:50:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								c0055b3b20
								
							
						 | 
						
							
							
								
								Merge branch 'doc/remove_content' into 'develop'
							
							
							
							
							
							
							
							add a section about content removal in the doc
See merge request funkwhale/funkwhale!645 
							
						 | 
						
							2019-03-13 13:24:15 +01:00 | 
						
					
				
					
						
							
							
								 
								deltadelta
							
						 | 
						
							
							
							
							
							
								
							
							
								06154bc6f0
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'doc/remove_content'
							
							
							
							
							
							
							
							# Conflicts:
#   docs/users/upload.rst 
							
						 | 
						
							2019-03-13 13:24:15 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								609472a1c4
								
							
						 | 
						
							
							
								
								Merge branch 'remove-unused-envvar' into 'develop'
							
							
							
							
							
							
							
							Removed unused env var in dev.yml
See merge request funkwhale/funkwhale!670 
							
						 | 
						
							2019-03-13 13:17:24 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								6eee1bd771
								
							
						 | 
						
							
							
								
								Removed unused env var in dev.yml
							
							
							
							
							
						 | 
						
							2019-03-13 10:26:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								0254fd9c6a
								
							
						 | 
						
							
							
								
								Merge branch 'envvar-fix' into 'develop'
							
							
							
							
							
							
							
							Add required envvar for dev environment
See merge request funkwhale/funkwhale!668 
							
						 | 
						
							2019-03-13 10:25:01 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								acffa846ed
								
							
						 | 
						
							
							
								
								Merge branch 'fix-port-binding-issues-in-dev' into 'develop'
							
							
							
							
							
							
							
							Fix port binding issues in dev
See merge request funkwhale/funkwhale!669 
							
						 | 
						
							2019-03-13 10:20:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								2561d9d114
								
							
						 | 
						
							
							
								
								Fix port binding issues in dev
							
							
							
							
							
						 | 
						
							2019-03-13 10:20:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Damien Nicolas
							
						 | 
						
							
							
							
							
							
								
							
							
								5c6524242f
								
							
						 | 
						
							
							
								
								Add required envvar for dev environment
							
							
							
							
							
						 | 
						
							2019-03-13 10:15:33 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								9a14be9c47
								
							
						 | 
						
							
							
								
								Merge branch 'contribution-yarn-fix-i18n' into 'develop'
							
							
							
							
							
							
							
							Add missing command from contributing guide
Closes #754
See merge request funkwhale/funkwhale!667 
							
						 | 
						
							2019-03-13 09:59:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								8adf8e4b6d
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'develop'
							
							
							
							
							
							
							
							Rework documentation layout and create new guides
See merge request funkwhale/funkwhale!661 
							
						 | 
						
							2019-03-13 09:55:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Ciarán Ainsworth
							
						 | 
						
							
							
							
							
							
								
							
							
								21fb39dd61
								
							
						 | 
						
							
							
								
								Update docs/developers/index.rst, docs/developers/subsonic.rst files
							
							
							
							
							
							
							
							Deleted developers/index.rst, developers/subsonic.rst files 
							
						 | 
						
							2019-03-13 09:55:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								979eac9db9
								
							
						 | 
						
							
							
								
								Merge branch '731-list-item-style-in-footer-not-displayed-correctly' into 'develop'
							
							
							
							
							
							
							
							Resolve "List item style in Footer not displayed correctly"
Closes #731
See merge request funkwhale/funkwhale!665 
							
						 | 
						
							2019-03-13 09:54:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Ciarán Ainsworth
							
						 | 
						
							
							
							
							
							
								
							
							
								f6629c0dc7
								
							
						 | 
						
							
							
								
								Added a link to changelog for version, added some CSS to change color of instance/keyboard shortcuts
							
							
							
							
							
						 | 
						
							2019-03-13 09:54:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Damien Nicolas
							
						 | 
						
							
							
							
							
							
								
							
							
								96ee712e60
								
							
						 | 
						
							
							
								
								Add missing command from contributing guide
							
							
							
							
							
						 | 
						
							2019-03-13 09:54:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								5648ee29bd
								
							
						 | 
						
							
							
								
								Merge branch 'fix-factories' into 'develop'
							
							
							
							
							
							
							
							Fix Factories for dev data
See merge request funkwhale/funkwhale!664 
							
						 | 
						
							2019-03-12 14:15:58 +01:00 | 
						
					
				
					
						
							
							
								 
								gordon
							
						 | 
						
							
							
							
							
							
								
							
							
								1a3e7a5e0d
								
							
						 | 
						
							
							
								
								Fix Factories for dev data
							
							
							
							
							
						 | 
						
							2019-03-12 14:15:58 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								4a9e7fa701
								
							
						 | 
						
							
							
								
								Merge branch 'coc' into 'develop'
							
							
							
							
							
							
							
							Added mentions of Code of Conduct in readme and issue templates
See merge request funkwhale/funkwhale!663 
							
						 | 
						
							2019-03-11 15:22:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								71188d4578
								
							
						 | 
						
							
							
								
								Merge branch 'develop' into 'coc'
							
							
							
							
							
							
							
							# Conflicts:
#   README.rst 
							
						 | 
						
							2019-03-11 15:22:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								41fa4f62cf
								
							
						 | 
						
							
							
								
								Merge branch '751-moderation-rule-cancel' into 'master'
							
							
							
							
							
							
							
							Fix #751: saving moderation policy when clicking on "Cancel"
See merge request funkwhale/funkwhale!662 
							
						 | 
						
							2019-03-11 10:55:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								4230b4f1f4
								
							
						 | 
						
							
							
								
								Fix #751: saving moderation policy when clicking on "Cancel"
							
							
							
							
							
						 | 
						
							2019-03-11 10:46:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								89bcecd4b4
								
							
						 | 
						
							
							
								
								Merge branch 'refactor-visibilty-labels' into 'develop'
							
							
							
							
							
							
							
							#748 Consistently make use of the labels in mixins/Translations.vue for visibility settings
See merge request funkwhale/funkwhale!660 
							
						 | 
						
							2019-03-11 10:11:00 +01:00 | 
						
					
				
					
						
							
							
								 
								jovuit
							
						 | 
						
							
							
							
							
							
								
							
							
								e923913d5d
								
							
						 | 
						
							
							
								
								Moved privacy/visibility labels out of Form.vue to use the ones in
							
							
							
							
							
							
							
							mixins/Translations.vue 
							
						 | 
						
							2019-03-11 10:11:00 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								c56346289e
								
							
						 | 
						
							
							
								
								Merge branch '652-escaping' into 'master'
							
							
							
							
							
							
							
							Fixed #652: escaping issues in translated strings
See merge request funkwhale/funkwhale!658 
							
						 | 
						
							2019-03-08 15:23:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								b0ebbabf20
								
							
						 | 
						
							
							
								
								Fixed #652: escaping issues in translated strings
							
							
							
							
							
						 | 
						
							2019-03-08 15:20:31 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								e243c79288
								
							
						 | 
						
							
							
								
								Merge branch '744' into 'develop'
							
							
							
							
							
							
							
							#744: Rename TRANSLATORS to TRANSLATORS.rst for Gitlab formatting preview
Closes #744
See merge request funkwhale/funkwhale!656 
							
						 | 
						
							2019-03-08 12:56:39 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								9034044319
								
							
						 | 
						
							
							
								
								Merge branch 'context-population' into 'develop'
							
							
							
							
							
							
							
							Context population
See merge request funkwhale/funkwhale!657 
							
						 | 
						
							2019-03-08 12:48:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e6adba602d
								
							
						 | 
						
							
							
								
								Populated empty contextualized translations
							
							
							
							
							
						 | 
						
							2019-03-08 12:44:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								85ea7fb993
								
							
						 | 
						
							
							
								
								Updated translation catalog
							
							
							
							
							
						 | 
						
							2019-03-08 12:44:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								72606388ff
								
							
						 | 
						
							
							
								
								Fixed broken extraction of contexts
							
							
							
							
							
						 | 
						
							2019-03-08 12:44:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								755f574b23
								
							
						 | 
						
							
							
								
								Merge branch 'context-integration' into 'develop'
							
							
							
							
							
							
							
							Context integration
See merge request funkwhale/funkwhale!655 
							
						 | 
						
							2019-03-08 12:14:34 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								593a1fe53b
								
							
						 | 
						
							
							
								
								Added script to populate translated and contextualized strings if possible
							
							
							
							
							
						 | 
						
							2019-03-08 12:10:37 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								54f7cc6e39
								
							
						 | 
						
							
							
								
								Merge branch 'translations-integration' into 'develop'
							
							
							
							
							
							
							
							Translations integration
See merge request funkwhale/funkwhale!654 
							
						 | 
						
							2019-03-08 11:04:49 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								b4827b1298
								
							
						 | 
						
							
							
								
								Translated using Weblate (Arabic)
							
							
							
							
							
							
							
							Currently translated at 91.4% (593 of 649 strings)
Translation: Funkwhale/Funkwhale's server front-end
Translate-URL: https://translate.funkwhale.audio/projects/funkwhale/front/ar/ 
							
						 | 
						
							2019-03-08 11:04:48 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								95c2e018dd
								
							
						 | 
						
							
							
								
								Merge branch '747-full-artist-embed' into 'develop'
							
							
							
							
							
							
							
							Fix #747: Support embedding full artist discographies
Closes #747
See merge request funkwhale/funkwhale!653 
							
						 | 
						
							2019-03-08 10:40:45 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								8ae00b0698
								
							
						 | 
						
							
							
								
								Fix #747: Support embedding full artist discographies
							
							
							
							
							
						 | 
						
							2019-03-08 10:34:50 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								1d787904f4
								
							
						 | 
						
							
							
								
								Merge branch 'master' into develop
							
							
							
							
							
						 | 
						
							2019-03-08 09:40:55 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								41ffff9afc
								
							
						 | 
						
							
							
								
								Merge branch 'null-position-federation' into 'master'
							
							
							
							
							
							
							
							Fixed a crash when federating a track with unspecified position
See merge request funkwhale/funkwhale!652 
							
						 | 
						
							2019-03-08 09:40:46 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								f73c7714c6
								
							
						 | 
						
							
							
								
								Fixed a crash when federating a track with unspecified position
							
							
							
							
							
						 | 
						
							2019-03-08 09:29:43 +01:00 | 
						
					
				
					
						
							
							
								 
								Jo Vuit
							
						 | 
						
							
							
							
							
							
								
							
							
								fa50f2ca0c
								
							
						 | 
						
							
							
								
								Rename TRANSLATORS to TRANSLATORS.rst for Gitlab formatting preview
							
							
							
							
							
						 | 
						
							2019-03-07 19:32:07 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								e2c88b989c
								
							
						 | 
						
							
							
								
								Merge branch 'master' into develop
							
							
							
							
							
						 | 
						
							2019-03-07 17:28:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
							
							
								
							
							
								3429366805
								
							
						 | 
						
							
							
								
								Merge branch '745-letsencrypt-documentation' into 'master'
							
							
							
							
							
							
							
							Fix #745: Added documentation to set up let's encrypt certificate
See merge request funkwhale/funkwhale!651 
							
						 | 
						
							2019-03-07 17:28:10 +01:00 | 
						
					
				
					
						
							
							
								 
								Eliot Berriot
							
						 | 
						
							
							
							
								
								
							
							
							
								
							
							
								ca55dcbc52
								
							
						 | 
						
							
							
								
								Fix #745: Added documentation to set up let's encrypt certificate
							
							
							
							
							
						 | 
						
							2019-03-07 17:24:32 +01:00 |