pleroma-fe, branch HEAD
My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
c3fcbbd918ddef4e3f574a464fd10f4899bb2dce
2021-03-01T18:15:46Z
2021-03-01T18:15:46Z
[2.3.0] Merge branch 'rc/2.3.0' into 'master'
Shpuld Shpludson
shp@cock.li
commit c3fcbbd918ddef4e3f574a464fd10f4899bb2dce
parent 320418d524a33c20d7d769c8d67a25be81f251ec
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 1 Mar 2021 18:15:46 +0000
Merge branch 'rc/2.3.0' into 'master'
2.3.0 to MASTER
See merge request pleroma/pleroma-fe!1366
320418d524a33c20d7d769c8d67a25be81f251ec
2021-01-18T13:44:31Z
2021-01-18T13:44:31Z
[2.2.3] Merge branch 'rc/2.2.3' into 'master'
Shpuld Shpludson
shp@cock.li
commit 320418d524a33c20d7d769c8d67a25be81f251ec
parent a39866308cd7c8cb0d30a04a5215d1fae8bf8d47
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 18 Jan 2021 13:44:31 +0000
Merge branch 'rc/2.2.3' into 'master'
rc 2.2.3 to MASTER
See merge request pleroma/pleroma-fe!1328
a39866308cd7c8cb0d30a04a5215d1fae8bf8d47
2020-12-22T16:00:12Z
2020-12-22T16:00:12Z
[2.2.2] Merge branch 'rc/2.2.2' into 'master'
Shpuld Shpludson
shp@cock.li
commit a39866308cd7c8cb0d30a04a5215d1fae8bf8d47
parent a7567ce6d01781b4b1ff47f805b4a9a5109e960b
Author: Shpuld Shpludson <shp@cock.li>
Date: Tue, 22 Dec 2020 16:00:12 +0000
Merge branch 'rc/2.2.2' into 'master'
prepare master for 2.2.2
See merge request pleroma/pleroma-fe!1315
a7567ce6d01781b4b1ff47f805b4a9a5109e960b
2020-11-11T20:32:44Z
2020-11-11T20:32:44Z
[2.2.1] set patch date to correct
Shpuld Shpuldson
shp@cock.li
commit a7567ce6d01781b4b1ff47f805b4a9a5109e960b
parent 8e87e3d88bef3691b625c0a25407aa08bdf983ad
Author: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 11 Nov 2020 22:32:44 +0200
set patch date to correct
6aa276374fdb0d20bd4c5e33aed1f67843d122d4
2020-11-06T17:35:01Z
2020-11-06T17:35:01Z
[2.2.0] update changelog for 2.2.0
Shpuld Shpuldson
shp@cock.li
commit 6aa276374fdb0d20bd4c5e33aed1f67843d122d4
parent 23232e1c8f35d7ddc8adb7a6dbf813b2831c90ec
Author: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 6 Nov 2020 19:35:01 +0200
update changelog for 2.2.0
b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
2020-09-17T17:26:22Z
2020-09-17T17:26:22Z
[2.1.2] Merge branch 'rc/2.1.2' into 'master'
Shpuld Shpludson
shp@cock.li
commit b225c3578f3c89af5ed3a0be3f8f3a6bbcedcc7d
parent 938887ef91a12dcaaaaa0884af4e76abd1c6c679
Author: Shpuld Shpludson <shp@cock.li>
Date: Thu, 17 Sep 2020 17:26:22 +0000
Merge branch 'rc/2.1.2' into 'master'
Merge 2.1.2 to MASTER
See merge request pleroma/pleroma-fe!1236
938887ef91a12dcaaaaa0884af4e76abd1c6c679
2020-09-08T09:46:19Z
2020-09-08T09:46:19Z
[2.1.1] Merge branch 'rc/2.1.1' into 'master'
Shpuld Shpludson
shp@cock.li
commit 938887ef91a12dcaaaaa0884af4e76abd1c6c679
parent e768ec1fca2f7580d111b0878a9695b0c8b9dbb1
Author: Shpuld Shpludson <shp@cock.li>
Date: Tue, 8 Sep 2020 09:46:19 +0000
Merge branch 'rc/2.1.1' into 'master'
Update master with 2.1.1
See merge request pleroma/pleroma-fe!1231
e768ec1fca2f7580d111b0878a9695b0c8b9dbb1
2020-08-27T14:45:03Z
2020-08-27T14:45:03Z
[2.1.0] Merge branch '2.1.0-rc0' into 'master'
Shpuld Shpludson
shp@cock.li
commit e768ec1fca2f7580d111b0878a9695b0c8b9dbb1
parent 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
Author: Shpuld Shpludson <shp@cock.li>
Date: Thu, 27 Aug 2020 14:45:03 +0000
Merge branch '2.1.0-rc0' into 'master'
2.1.0 into master
See merge request pleroma/pleroma-fe!1217
5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
2020-05-12T17:36:05Z
2020-05-12T17:36:05Z
[2.0.5] Merge branch 'rc/2.0.5' into 'master'
Shpuld Shpludson
shp@cock.li
commit 5d49edc823ba2ea3e34d4fd6c5efcc84ef9712f7
parent a0f780c4550b77d4574e0de8932a2dff288784a3
Author: Shpuld Shpludson <shp@cock.li>
Date: Tue, 12 May 2020 17:36:05 +0000
Merge branch 'rc/2.0.5' into 'master'
Update MASTER for 2.0.5 patch
See merge request pleroma/pleroma-fe!1105
a0f780c4550b77d4574e0de8932a2dff288784a3
2020-05-02T14:17:27Z
2020-05-02T14:17:27Z
[2.0.3] Merge branch 'rc/2.0.3' into 'master'
Shpuld Shpludson
shp@cock.li
commit a0f780c4550b77d4574e0de8932a2dff288784a3
parent 8e049297ff6a125298ba9d06a3a4a563b231360f
Author: Shpuld Shpludson <shp@cock.li>
Date: Sat, 2 May 2020 14:17:27 +0000
Merge branch 'rc/2.0.3' into 'master'
Update MASTER with 2.0.3 for real
See merge request pleroma/pleroma-fe!1099
8e049297ff6a125298ba9d06a3a4a563b231360f
2020-04-08T13:12:42Z
2020-04-08T13:12:42Z
[2.0.2] Merge branch 'develop' into 'master'
Shpuld Shpludson
shp@cock.li
commit 8e049297ff6a125298ba9d06a3a4a563b231360f
parent 38455294120a27d254b6cbe237a1adcf9d27e6af
Author: Shpuld Shpludson <shp@cock.li>
Date: Wed, 8 Apr 2020 13:12:42 +0000
Merge branch 'develop' into 'master'
Update master for 2.0.2
See merge request pleroma/pleroma-fe!1088
7c26435e66fd7e142ea4b88fbe51eede32eeb5ce
2019-03-11T18:53:34Z
2019-03-11T18:53:34Z
[0.9.999] Merge branch 'develop' into 'master'
Shpuld Shpludson
shp@cock.li
commit 7c26435e66fd7e142ea4b88fbe51eede32eeb5ce
parent 7e9c8c3d219aa3b787c5606efbb54a73c1738b07
Author: Shpuld Shpludson <shp@cock.li>
Date: Mon, 11 Mar 2019 18:53:34 +0000
Merge branch 'develop' into 'master'
Update master with bugfixes (and other changes)
See merge request pleroma/pleroma-fe!673
7e9c8c3d219aa3b787c5606efbb54a73c1738b07
2019-03-07T15:11:11Z
2019-03-07T15:11:11Z
[0.9.99] Merge branch 'develop' into 'master'
Shpuld Shpludson
shp@cock.li
commit 7e9c8c3d219aa3b787c5606efbb54a73c1738b07
parent 4800169f36e0a71c322b9707a797c3b1ad48bf58
Author: Shpuld Shpludson <shp@cock.li>
Date: Thu, 7 Mar 2019 15:11:11 +0000
Merge branch 'develop' into 'master'
Update master
See merge request pleroma/pleroma-fe!646
4800169f36e0a71c322b9707a797c3b1ad48bf58
2019-02-22T16:34:29Z
2019-02-22T16:34:29Z
[0.9.9] Merge branch 'cherry-pick-254b0afa' into 'master'
Shpuld Shpludson
shp@cock.li
commit 4800169f36e0a71c322b9707a797c3b1ad48bf58
parent 533597fe259344c763ea06f8be71f34491c4d4e9
Author: Shpuld Shpludson <shp@cock.li>
Date: Fri, 22 Feb 2019 16:34:29 +0000
Merge branch 'cherry-pick-254b0afa' into 'master'
Merge default content-type fix into master
See merge request pleroma/pleroma-fe!609
8ddf2de6be679bf59d3dcd0b7c7b0aa27a80a781
2018-08-22T22:43:24Z
2018-08-27T14:17:38Z
[pre-20180911] static/config.json: Personnal config
Haelwenn (lanodan) Monnier
contact@hacktivis.me
commit 8ddf2de6be679bf59d3dcd0b7c7b0aa27a80a781
parent 85842c8a0275c84621a56358f0ccdcd73be67651
Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
Date: Thu, 23 Aug 2018 00:43:24 +0200
static/config.json: Personnal config