Commit Graph

28 Commits

Author SHA1 Message Date
sadposter 6f5844cf8e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-15 14:11:26 +00:00
lain 2f31cef71f Merge branch 'feature/native-captcha' into 'develop'
Add native captcha and enable it by default.

Closes #1017 and #1405

See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
sadposter 803bce3668 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-12-12 17:48:36 +00:00
lain 756a029edf Update frontend 2019-12-12 17:05:22 +01:00
lain 2792672793 Revert "Merge branch 'admin-scope-support-code' into 'develop'"
This reverts merge request !2055
2019-12-12 09:37:02 +00:00
Ivan Tashkinov 84f0aec9aa Updated admin-fe bundle to 14cdc4a, pleroma-fe bundle to abb6747f. 2019-12-11 19:48:00 +03:00
sadposter 58f9ce0deb Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-10-10 10:28:16 +01:00
rinpatch a502155274 Bump pleroma-fe bundle to 122323f35c 2019-10-07 17:42:33 +03:00
sadposter cc5b65bd21 add lato 2019-09-13 15:27:51 +01:00
sadposter 94076a23e4 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-10 21:11:03 +01:00
rinpatch 16e6be340d Update frontend bundle to e75ac9dd 2019-09-06 11:31:44 +03:00
sadposter 357b1eac0f theme 2019-07-09 21:08:03 +01:00
rinpatch 431a41b459 Update bundled pleroma-fe to c4fcdc71 2019-06-19 00:04:00 +03:00
William Pitcock 52bdfced32 update pleroma frontend 2019-04-27 07:34:59 +00:00
lain 41511d1926 Update frontend 2019-03-20 08:58:25 +01:00
lain 88a40308d3 update frontend 2019-01-30 21:04:58 +01:00
lain 3e1816fcd5 update frontend 2018-12-17 21:13:04 +01:00
lain 72945b5b32 update frontend 2018-12-13 21:04:39 +01:00
hakabahitoyo ce8c7e77a1 update pleroma frontend 2018-08-26 21:08:03 +09:00
William Pitcock 7a11ea1ceb update pleroma frontend 2018-08-20 04:45:34 +00:00
lain 701f5df45c update frontend 2018-08-12 18:16:19 +02:00
lain dde5ad9e37 update frontend 2018-05-20 18:29:12 +02:00
lain e153b364a7 update frontend 2018-04-17 11:09:19 +02:00
lain a8dddd9279 update frontend 2018-04-11 21:55:38 +02:00
Roger Braun bd100fd765 Update frontend. 2017-09-17 14:38:04 +02:00
Roger Braun 5d8352a429 Update frontend. Persistent logins. 2017-07-02 13:09:50 +02:00
Roger Braun 01615a5bf7 Update frontend. 2017-06-04 10:25:56 +02:00
Roger Braun b57fa46e6a Add Pleroma-FE snapshot. 2017-04-04 17:21:11 +02:00