MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,364 Commits 93 Branches 98 Tags 83 MiB
Commit Graph

2364 Commits

Author SHA1 Message Date
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
Eliot Berriot 8ac38ba7e6 Merge branch '765-disc-number-subsonic' into 'master' 
Fix #765: Include disc number in Subsonic responses

See merge request funkwhale/funkwhale!681
 2019-03-20 17:16:18 +01:00
Eliot Berriot 5715773fa7
Fix #765: Include disc number in Subsonic responses 2019-03-20 17:13:40 +01:00
Eliot Berriot 12113c6ef2 Merge branch 'cherry-pick-develop' into 'master' 
Cherry pick develop

See merge request funkwhale/funkwhale!680
 2019-03-20 16:54:01 +01:00
Elza Gelez 546ee9c9f5
Fix playlist icon padding on the homepage 2019-03-20 16:23:20 +01:00
Eliot Berriot d89e83298b
Merge branch '735-table-truncate' into 'develop' 
Fix #735: library view doesn't like long titles names

Closes #735

See merge request funkwhale/funkwhale!640
 2019-03-20 16:22:41 +01:00
Eliot Berriot 83a9a6b01a
Use shorter format for ago dates 2019-03-20 16:22:13 +01:00
jovuit ed1fdc85c1
#511: Resolve "Page title not updated when changing the language" 2019-03-20 16:21:36 +01:00
Eliot Berriot 33190613a2
Fix #737: delivering of local activities causing unintended side effects, such as rollbacking changes 2019-03-20 16:21:03 +01:00
Eliot Berriot 4ef52ebc9f
Slightly smaller sidebar on small desktop to leave more space for content 2019-03-20 16:20:35 +01:00
Eliot Berriot 4f98e5ae7f
Fix too wide padding on small screens 2019-03-20 16:20:29 +01:00
Ciarán Ainsworth bfe471d5e4
Resolve "Document the documentation process" 2019-03-20 16:14:04 +01:00
Ciarán Ainsworth 472943927a
Update docs/developers/index.rst, docs/developers/subsonic.rst files 
Deleted developers/index.rst, developers/subsonic.rst files
 2019-03-20 16:13:41 +01:00
Ciarán Ainsworth df8b98674e
Resolve #630: "Do not allow tab closure during upload" 2019-03-20 16:00:27 +01:00
Renon 53d1a5c9f9
Add backup instructions for multi container and debian 2019-03-20 16:00:07 +01:00
deltadelta 735dcac6c6
Merge branch 'develop' into 'doc/remove_content' 2019-03-20 15:59:36 +01:00
Eliot Berriot 03afc927b5 Merge branch '125-document-the-documentation-process' into 'develop' 
Resolve "Document the documentation process"

Closes #125

See merge request funkwhale/funkwhale!679
 2019-03-20 13:29:33 +01:00
Ciarán Ainsworth 507387e8e3 Resolve "Document the documentation process" 2019-03-20 13:29:33 +01:00
Eliot Berriot 75785ee001
Fixed typo 2019-03-20 11:40:25 +01:00
Eliot Berriot b12c823dd9
Merge branch 'master' into develop 2019-03-20 11:36:16 +01:00
Eliot Berriot b70636c2d8
Fixed a small federation issue when empty library summary 2019-03-19 17:53:17 +01:00
Eliot Berriot 584c29bff6
Fixed broken dependency 2019-03-19 17:47:12 +01:00
Eliot Berriot b1caabbe24 Merge branch 'develop' into 'develop' 
Add Gentoo/openrc initscripts

See merge request funkwhale/funkwhale!678
 2019-03-18 10:10:05 +01:00
Alexander 460e3f4a4b Revert "Update README.md" 
This reverts commit d6d609af767bc74eff3ca59a64b302a197397e10
 2019-03-18 10:10:05 +01:00
Eliot Berriot 7b9343bc89 Merge branch '630-do-not-allow-tab-closure-during-upload' into 'develop' 
Resolve "Do not allow tab closure during upload"

Closes #630

See merge request funkwhale/funkwhale!673
 2019-03-18 10:09:28 +01:00
Ciarán Ainsworth 77b41fc0b4 Resolve #630: "Do not allow tab closure during upload" 2019-03-18 10:09:28 +01:00
Eliot Berriot 1486d6301e Merge branch '662' into 'develop' 
#662: last tasks on translation context

Closes #662

See merge request funkwhale/funkwhale!659
 2019-03-18 10:07:58 +01:00
jovuit 86534e7392 Common context for duplicates 
Removes unnecessary `...` for more coherence
 2019-03-18 10:07:58 +01:00
Eliot Berriot 196995682b Merge branch 'revert-666' into 'develop' 
Revert "Merge branch '629-cookie-auth' into 'develop'"

Closes #755

See merge request funkwhale/funkwhale!676
 2019-03-15 15:57:29 +01:00