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

7192 Commits

Author SHA1 Message Date
Eliot Berriot 524794c81f Merge branch 'tag-data' into 'master' 
Added a small json file in documentation to get releases info

See merge request funkwhale/funkwhale!700
 2019-04-01 11:41:18 +02:00
Eliot Berriot cf51d37a47
Added a small json file in documentation to get releases info 2019-04-01 11:36:13 +02:00
Eliot Berriot 3a95957dfe Merge branch 'eliotberriot-master-patch-38666' into 'master' 
Added missing library_id parameter on in-place import documentation

See merge request funkwhale/funkwhale!699
 2019-04-01 09:50:15 +02:00
Eliot Berriot 537f18cf08 Added missing library_id parameter on in-place import documentation 2019-04-01 09:45:54 +02:00
Eliot Berriot 7bb0fa2e64 Merge branch '777-library-pruning' into 'develop' 
Fix #777: Added a prune_library management command to remove obsolete metadata

Closes #777

See merge request funkwhale/funkwhale!698
 2019-03-27 17:07:23 +01:00
Eliot Berriot 5916a1ba99
Fix #777: Added a prune_library management command to remove obsolete metadata 2019-03-27 17:04:10 +01:00
Eliot Berriot 96010917fb Merge branch 'migration-to-loomio' into 'develop' 
Updated forum urls

See merge request funkwhale/funkwhale!697
 2019-03-27 13:49:02 +01:00
Eliot Berriot 8a5c85a823 Merge branch 'discard-unhandled-activities' into 'develop' 
Fix #776: Don't store unhandled ActivityPub messages in database

Closes #776

See merge request funkwhale/funkwhale!696
 2019-03-27 13:46:08 +01:00
Eliot Berriot 9e8c223021
Updated forum urls 2019-03-27 13:45:52 +01:00
Eliot Berriot 583a6ddf08 Merge branch '740-skipped-track-position' into 'develop' 
Fix #740: Do not consider tracks as duplicates during import if they have different positions

Closes #740

See merge request funkwhale/funkwhale!695
 2019-03-27 12:58:29 +01:00
Eliot Berriot ca7b39c692
Fix #740: Do not consider tracks as duplicates during import if they have different positions 2019-03-27 12:54:29 +01:00
Eliot Berriot 46f1d96206
Fix #776: Don't store unhandled ActivityPub messages in database 2019-03-27 12:53:35 +01:00
Eliot Berriot b9b1e1e26a Merge branch '772-skipped-release' into 'develop' 
Fix #772: Prevent skipping on file import if album_mbid is different

Closes #772

See merge request funkwhale/funkwhale!694
 2019-03-27 12:16:55 +01:00
Eliot Berriot 31227b8641
Fix #772: Prevent skipping on file import if album_mbid is different 2019-03-27 12:13:25 +01:00
Eliot Berriot 659c355ad8
API doc introduction 2019-03-26 17:21:44 +01:00
Eliot Berriot f8e30736a2 Merge branch 'more-api-docs-again' into 'master' 
More api docs again

See merge request funkwhale/funkwhale!693
 2019-03-26 17:13:08 +01:00
Eliot Berriot dcb9ca04a1
Documented /users and /auth endpoints 2019-03-26 15:38:14 +01:00
Eliot Berriot 26e8281733 Merge branch 'more-api-docs' into 'master' 
More api docs

See merge request funkwhale/funkwhale!692
 2019-03-26 15:04:36 +01:00
Eliot Berriot a1817f6473
Documented /listen endpoint 2019-03-26 15:01:19 +01:00
Eliot Berriot 800dd5ba18
Documented /favorites endpoint 2019-03-26 13:58:47 +01:00
Eliot Berriot 5b74448e66
Documented /uploads endpoint 2019-03-26 12:32:04 +01:00
Eliot Berriot 4aabcf8d57
Libraries endpoint documentation 2019-03-26 11:40:53 +01:00
Eliot Berriot d5712ea2fb Merge branch 'revert-5a97dde3' into 'develop' 
Revert "Merge branch '769-ci-changes' into 'develop'"

See merge request funkwhale/funkwhale!691
 2019-03-26 10:48:58 +01:00
Eliot Berriot 37b878270e Revert "Merge branch '769-ci-changes' into 'develop'" 
This reverts merge request !689
 2019-03-26 10:45:52 +01:00
Eliot Berriot 5a97dde3dc Merge branch '769-ci-changes' into 'develop' 
Fix #769: run CI jobs only when relevant

Closes #769

See merge request funkwhale/funkwhale!689
 2019-03-26 10:34:13 +01:00
Eliot Berriot eed8ac009f
Fix #769: run CI jobs only when relevant 2019-03-26 10:30:27 +01:00
Eliot Berriot 86ea3cf4f3 Merge branch '752-funkwhale-oauth-provider' into 'develop' 
Resolve "Implement a Oauth provider in Funkwhale"

Closes #752

See merge request funkwhale/funkwhale!672
 2019-03-25 17:02:51 +01:00
Eliot Berriot 4c13d47387 Resolve "Implement a Oauth provider in Funkwhale" 2019-03-25 17:02:51 +01:00
Eliot Berriot 1dc7304bd3 Merge branch '768-show-description-of-libraries-in-card' into 'develop' 
Resolve "Show 'description' of libraries in card"

See merge request funkwhale/funkwhale!688
 2019-03-22 09:41:35 +01:00
Ciarán Ainsworth 6e20f63f09 Resolve "Show 'description' of libraries in card" 2019-03-22 09:41:35 +01:00
Eliot Berriot eae337d4ed
Merge branch 'master' into develop 2019-03-21 11:31:16 +01:00
Eliot Berriot 65dd21d1a3
Fixed formatting issue in changelog 2019-03-21 11:30:41 +01:00
Eliot Berriot 1cedddf533
Fixed duplicated section in CONTRIBUTING 2019-03-21 10:49:07 +01:00
Eliot Berriot e587e5aebc
Merge branch 'master' into develop 2019-03-21 10:46:28 +01:00
Eliot Berriot 78734a86e3
Merge branch 'release/0.18.3' 2019-03-21 10:41:29 +01:00
Eliot Berriot c196016035
Version bump and changelog for 0.18.3 2019-03-21 10:41:14 +01:00
Eliot Berriot b49720caf5 Merge branch '570-inplace-quota' into 'master' 
Fix #570: Exclude in-place imported files from quota computation

See merge request funkwhale/funkwhale!687
 2019-03-21 10:35:01 +01:00
Eliot Berriot cc71d2bb20
Fix #570: Exclude in-place imported files from quota computation 2019-03-21 10:32:12 +01:00
Eliot Berriot 97ef15906d
Fixed remaining conflicts markers 2019-03-21 10:13:13 +01:00
Eliot Berriot 4310a7e372 Merge branch 'nested-proxy' into 'master' 
Updated mono-container documentation with compose file and NESTED_PROXY

See merge request funkwhale/funkwhale!686
 2019-03-21 10:11:28 +01:00
Eliot Berriot 5f9df61e7e
Updated mono-container documentation with compose file and NESTED_PROXY 2019-03-21 10:07:14 +01:00
Eliot Berriot 9a162c57ca
Merge branch 'master' into develop 2019-03-20 20:45:06 +01:00
Eliot Berriot 7d3b9717ea Merge branch '766-title-truncated' into 'master' 
Fix #766: Added title on hover for truncated content

See merge request funkwhale/funkwhale!685
 2019-03-20 20:40:26 +01:00
Eliot Berriot f9edbd9d7a
Fix #766: Added title on hover for truncated content 2019-03-20 20:34:07 +01:00
Eliot Berriot 641b62b524 Merge branch '767-broken-admin' into 'master' 
Fix #767: broken Activity and Actor modules in django admin

See merge request funkwhale/funkwhale!684
 2019-03-20 20:20:46 +01:00
Eliot Berriot 124a7c3dcf
Fix #767: broken Activity and Actor modules in django admin 2019-03-20 20:18:19 +01:00
Eliot Berriot a75d7e956e Merge branch '764-apache' into 'master' 
Fix #764: broken sample apache configuration

See merge request funkwhale/funkwhale!683
 2019-03-20 20:11:48 +01:00
Eliot Berriot 5c60550728
Fix #764: broken sample apache configuration 2019-03-20 20:08:22 +01:00
Eliot Berriot 039885e6fc Merge branch '757-flac-cover' into 'master' 
Fix #757: Ensure cover art from uploaded files is picked up properly on existing albums

See merge request funkwhale/funkwhale!682
 2019-03-20 19:38:41 +01:00
Eliot Berriot 429ffbf461 Fix #757: Ensure cover art from uploaded files is picked up properly on existing albums 2019-03-20 19:38:41 +01:00