Commit Graph

2090 Commits

Author SHA1 Message Date
Jo Vuit 74149fc4a9 Added 'Noun' as a possible detail part for string context 2019-02-10 14:16:59 +01:00
Jo Vuit ee23e145b6 Replaced detail part of string context 'Name' by 'Noun', which is the correct word in English... 2019-02-10 14:15:40 +01:00
Jo Vuit 56a5a5ed76 Added context strings for i18n 2019-02-07 18:14:48 +01:00
Eliot Berriot 5758ab4c43
Merge branch 'master' into develop 2019-02-07 16:40:56 +01:00
Eliot Berriot d702f8f69f Merge branch '696-yarn-build-osx' into 'master'
Fix #696: Embed component name that could lead to issue when developping on OSX

See merge request funkwhale/funkwhale!587
2019-02-07 16:28:57 +01:00
Eliot Berriot c15b4381bb
Fix #696: Embed component name that could lead to issue when developping on OSX 2019-02-07 16:23:14 +01:00
Eliot Berriot b04cb61d4a Merge branch '662-favorites-Track' into 'develop'
Add context (#662)

See merge request funkwhale/funkwhale!585
2019-02-07 16:21:20 +01:00
Eliot Berriot 949c76307e Merge branch '697-denied-upload' into 'master'
Fix #697: Downgraded channels dependency to 2.1.6 to fix denied uploads

See merge request funkwhale/funkwhale!586
2019-02-07 16:20:31 +01:00
Eliot Berriot 741199c551
Fix #697: Downgraded channels dependency to 2.1.6 to fix denied uploads 2019-02-07 16:17:51 +01:00
Jo Vuit 3bed93d6c6 Add context 2019-02-07 16:15:50 +01:00
Eliot Berriot 711a667d26 Merge branch '662-context-documentation' into 'develop'
See #662: documentation about i18n / contexts, and first contextualized strings

See merge request funkwhale/funkwhale!581
2019-02-07 15:16:01 +01:00
Eliot Berriot 2bc7b00b54 Merge branch 'patch-1' into '662-context-documentation'
Nest multiple component parts by a dot instead of a /

See merge request funkwhale/funkwhale!582
2019-02-07 14:36:51 +01:00
Eliot Berriot 7d52de5cb4 Update CONTRIBUTING.rst 2019-02-07 14:33:27 +01:00
jovuit 3ca17d3fa1 Nest multiple component parts by a dot instead of a / 2019-02-07 14:26:00 +01:00
Eliot Berriot 2fe403ed9a
See #662: documentation about i18n / contexts, and first contextualized strings 2019-02-05 17:59:22 +01:00
Eliot Berriot bf67f37903 Merge branch 'patch-1' into 'develop'
Update /usr/bin/nologin to /usr/sbin/nologin

See merge request funkwhale/funkwhale!580
2019-02-05 14:41:20 +01:00
Zach Halasz d1d034fa86 Update /usr/bin/nologin to /usr/sbin/nologin 2019-02-04 06:53:28 +01:00
Eliot Berriot 6ebd1af4ab Merge branch 'similar-radio-improvements' into 'develop'
Removed popularity weight in similar radio, to avoid filter bubbles

See merge request funkwhale/funkwhale!579
2019-01-31 14:58:10 +01:00
Eliot Berriot c16258ed14
Removed popularity weight in similar radio, to avoid filter bubbles 2019-01-31 14:55:05 +01:00
Eliot Berriot e6a5f69f5b Merge branch 'markov-radio' into 'develop'
[Experimental] Added a new "Similar" radio based on users history (suggested by @gordon)

See merge request funkwhale/funkwhale!578
2019-01-30 16:57:36 +01:00
Eliot Berriot 5ce4cc8379
[Experimental] Added a new "Similar" radio based on users history (suggested by @gordon) 2019-01-30 16:54:35 +01:00
Eliot Berriot 602a4c3b29 Merge branch 'system-actor' into 'develop'
System actor

See merge request funkwhale/funkwhale!577
2019-01-30 11:54:43 +01:00
Eliot Berriot 253f026dc0 System actor 2019-01-30 11:54:43 +01:00
Eliot Berriot 2f100ab9a7
Fixed a bad reference in swagger docs 2019-01-29 17:46:37 +01:00
Eliot Berriot c73ce96f4d
Enabled custom domain to use with the swagger API 2019-01-29 17:33:44 +01:00
Eliot Berriot a39c0a671d Merge branch 'api-docs' into 'master'
Api docs

See merge request funkwhale/funkwhale!576
2019-01-29 17:16:39 +01:00
Eliot Berriot 5857ad638e Api docs 2019-01-29 17:16:39 +01:00
Eliot Berriot 20d66ffec5
Fixed styling issue in changelog 2019-01-29 14:36:35 +01:00
Eliot Berriot 8963218bb0
Merge branch 'master' into develop 2019-01-29 14:26:28 +01:00
Eliot Berriot 56eca7b46e
Merge branch 'release/0.18.1' 2019-01-29 14:25:48 +01:00
Eliot Berriot 4a197e5475
Version bump and changelog for 0.18.1 2019-01-29 14:25:19 +01:00
Eliot Berriot 640ed90b42
Fixed a few typos with Docker/postgres upgrade instructions 2019-01-29 14:18:47 +01:00
Eliot Berriot 591df661e0
Merge branch 'master' into develop 2019-01-29 14:00:27 +01:00
Eliot Berriot e3d8c74825 Merge branch 'upload-docs' into 'master'
Added user upload documentation

See merge request funkwhale/funkwhale!575
2019-01-29 12:28:25 +01:00
Eliot Berriot e9eb4e330a
Added user upload documentation 2019-01-29 12:21:39 +01:00
Eliot Berriot 9be7613046 Merge branch 'translations-integration' into 'develop'
Translations integration

See merge request funkwhale/funkwhale!574
2019-01-29 10:52:17 +01:00
Eliot Berriot d65b2fbb60 Translations integration 2019-01-29 10:52:17 +01:00
Eliot Berriot 00891afb61 Merge branch '668-misaligned-icon' into 'master'
Fix #668: list icon alignement on landing page

See merge request funkwhale/funkwhale!573
2019-01-29 10:41:30 +01:00
Eliot Berriot c5aa7ada4f
Fixed extra v-translate call 2019-01-29 10:40:19 +01:00
Eliot Berriot 46a93d6a8d
Fix #668: list icon alignement on landing page 2019-01-29 10:34:35 +01:00
Eliot Berriot cd2f264b56 Merge branch '678-breach' into 'master'
Fix #678: Removed potential BREACH exploit because of Gzip compression

See merge request funkwhale/funkwhale!572
2019-01-29 10:24:32 +01:00
Eliot Berriot fa5676ed6e
Fix #678: Removed potential BREACH exploit because of Gzip compression 2019-01-29 10:21:57 +01:00
Eliot Berriot 7df97263e5
Merge branch 'develop' 2019-01-29 10:06:04 +01:00
Eliot Berriot 6813f972cc Merge branch '688-transcode-inplace' into 'develop'
Resolve "In-place imports cannot be transcoded"

Closes #688

See merge request funkwhale/funkwhale!571
2019-01-29 09:32:35 +01:00
Vierkantor 0efdb6d980 Resolve "In-place imports cannot be transcoded" 2019-01-29 09:32:35 +01:00
Eliot Berriot db8427f30c Merge branch 'patch-1' into 'develop'
Document upgrading the Postgres database files.

See merge request funkwhale/funkwhale!570
2019-01-28 09:48:06 +01:00
interfect 092d97efaa Document upgrading the Postgres database files. 2019-01-28 09:48:06 +01:00
Eliot Berriot 8d9f29268a Merge branch 'fixed-wrong-docker-proxy-template' into 'master'
Fixed wrong URL in documentation for funkwhale_proxy.conf file when deploying using Docker

See merge request funkwhale/funkwhale!569
2019-01-27 14:48:09 +01:00
Eliot Berriot b989ae0e60
Fixed wrong URL in documentation for funkwhale_proxy.conf file when deploying using Docker 2019-01-27 14:45:38 +01:00
Eliot Berriot 4bfb169114 Merge branch 'disable-makemigrations' into 'master'
Fix #685: Disable makemigrations in production and misleading message when running migrate

See merge request funkwhale/funkwhale!568
2019-01-26 22:04:28 +01:00