MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,852 Commits 89 Branches 100 Tags 69 MiB
Commit Graph

6852 Commits

Author SHA1 Message Date
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
Eliot Berriot 16f7400df8 Merge branch 'eliotberriot-master-patch-97701' into 'master' 
Fixed wrong proxy config file in docker documentation

See merge request funkwhale/funkwhale!650
 2019-03-07 16:57:56 +01:00
Eliot Berriot 9c9cdd8bd6 Fixed wrong proxy config file in docker documentation 2019-03-07 16:55:08 +01:00
Eliot Berriot 491c79efa0
Merge branch 'master' into develop 2019-03-07 13:44:33 +01:00
Eliot Berriot 15eac69d41 Merge branch '743-unfollow-notification' into 'master' 
Fix #743: Do not send notification when rejecting a follow on a local library

See merge request funkwhale/funkwhale!649
 2019-03-07 12:16:40 +01:00
Eliot Berriot 3d94eddcfc
Fix #743: Do not send notification when rejecting a follow on a local library 2019-03-07 12:09:45 +01:00
Eliot Berriot fdcab5d232 Merge branch '729-notification-refresh' into 'master' 
Fix #729: Display new notifications immediatly on notifications page

See merge request funkwhale/funkwhale!648
 2019-03-07 11:07:01 +01:00
Eliot Berriot 9e6bbb4833
Fix #729: Display new notifications immediatly on notifications page 2019-03-07 11:03:51 +01:00
Eliot Berriot 9dcfc20571 Merge branch '716-upload-reorder' into 'master' 
Fix #716: constant and unpredictable reordering during file upload

See merge request funkwhale/funkwhale!647
 2019-03-07 10:38:17 +01:00
Eliot Berriot a3a7ec0873
Fix #716: constant and unpredictable reordering during file upload 2019-03-07 10:35:33 +01:00
Eliot Berriot 99b8ef2d02 Merge branch '713-mono-container-upgrade' into 'master' 
Fix #713: Added documentation on mono-container docker upgrade

See merge request funkwhale/funkwhale!646
 2019-03-07 10:12:14 +01:00
Eliot Berriot b75e30763c Merge branch 'frontend-fixes' into 'develop' 
Frontend fixes / improvements

See merge request funkwhale/funkwhale!644
 2019-03-07 10:09:53 +01:00