Commit Graph

3657 Commits

Author SHA1 Message Date
Your New SJW Waifu 7813ad4086 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-11 11:59:54 -05:00
HJ 8b2d873057 Merge branch 'es-translate' into 'develop'
[i18n] spanish new strings translations

See merge request pleroma/pleroma-fe!968
2019-10-10 17:02:34 +00:00
Your New SJW Waifu ee07fad6e4 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-08 14:13:50 -05:00
HJ 7d3330b7b6 Merge branch 'issue/679' into 'develop'
[#679] fix follow request on search page

See merge request pleroma/pleroma-fe!970
2019-10-08 19:06:57 +00:00
Your New SJW Waifu 34566e99d9 test 2019-10-08 12:15:33 -05:00
Your New SJW Waifu a0aaedd845 Open in new tab 2019-10-08 12:06:13 -05:00
Your New SJW Waifu 0696b145eb hyperlink fix 2019-10-08 11:49:48 -05:00
Your New SJW Waifu 7db56b0311 Fix imageSrc 2019-10-08 11:26:11 -05:00
Your New SJW Waifu 5df3db9605 maybe this'll fix ii 2019-10-08 11:08:38 -05:00
Your New SJW Waifu 435f825e2e whatever 2019-10-08 11:03:56 -05:00
Your New SJW Waifu 3c866ef350 I think this is the last of the formatting changes 2019-10-08 10:53:24 -05:00
Your New SJW Waifu 3c00fd0e32 Formatting fixes 2019-10-08 10:49:32 -05:00
Your New SJW Waifu 22925bdb1f More formatting fixes 2019-10-08 10:45:06 -05:00
Your New SJW Waifu a28a5c67c4 More whitespace fixes 2019-10-08 10:36:26 -05:00
Your New SJW Waifu a49ca59d34 Fix whitespace 2019-10-08 10:22:48 -05:00
Your New SJW Waifu 6d20a59aba new banner image, automatic banner updates courtesy of @moonman 2019-10-08 10:13:07 -05:00
Maksim Pechnikov 78e8a49f40 fix follow request on search page 2019-10-08 17:07:01 +03:00
tarteka 16c03995cb [i18n] spanish new strings translations
update to translate the latest text strings
2019-10-07 21:21:16 +02:00
Your New SJW Waifu 62019a14a5 Increase default attachment preview to a more reasonable number 2019-10-05 10:51:29 -05:00
HJ 122323f35c Merge branch 'docs/add-links' into 'develop'
Minor documentation improvements

See merge request pleroma/pleroma-fe!965
2019-10-04 14:30:29 +00:00
rinpatch c07bf59da7 Move the epigraph after the heading so MkDocs can pick up the heading 2019-10-04 17:24:36 +03:00
rinpatch 2060dd8377 Add links to directions in the beginning of CONFIGURATION.md 2019-10-04 17:12:14 +03:00
Your New SJW Waifu 1338f85773 Make banner link open in new tab 2019-10-03 13:27:10 -05:00
Your New SJW Waifu 08aa9089ba Whitespace fixes 2019-10-03 13:14:00 -05:00
Your New SJW Waifu fdd4ebea3d Banner fix 2019-10-03 13:06:50 -05:00
Your New SJW Waifu cb05395e38 Better default text 2019-10-03 13:01:21 -05:00
Your New SJW Waifu bb413c3bff Forgot to add new files 2019-10-03 12:56:17 -05:00
Your New SJW Waifu 75ba90a276 Merge remote-tracking branch 'upstream/develop' into develop 2019-10-03 12:52:00 -05:00
Your New SJW Waifu ca7fd49f69 Added spoopy banner 2019-10-03 12:51:11 -05:00
rinpatch e82405ae35 Merge branch 'docs-sync' into 'develop'
CI: trigger doc rebuild on commits to develop

See merge request pleroma/pleroma-fe!964
2019-10-03 16:09:54 +00:00
rinpatch 4b8c9a03f2 CI: trigger doc rebuild on commits to develop 2019-10-03 18:48:16 +03:00
HJ 84dbc86624 Merge branch 'admin-link' into 'develop'
Add Admin panel link to navigation for admins

See merge request pleroma/pleroma-fe!954
2019-10-02 20:12:44 +00:00
taehoon 33759e4153 update admin url 2019-10-02 13:28:16 -04:00
Your New SJW Waifu ee500fe4fb Merge remote-tracking branch 'upstream/develop' into develop 2019-10-01 13:07:02 -05:00
taehoon 7e5a3fa09f update copy 2019-10-01 07:36:42 -04:00
taehoon 503f086487 add trailing slash to admin url 2019-10-01 07:36:42 -04:00
taehoon d9b01643e2 open in a new tab 2019-10-01 07:36:42 -04:00
taehoon 093fcee902 add admin link to the side drawer 2019-10-01 07:36:41 -04:00
taehoon 4f75ad9905 add admin link to nav 2019-10-01 07:36:41 -04:00
taehoon 57fedd63ca add gauge icon 2019-10-01 07:36:41 -04:00
kaniini f3fdc92f15 Merge branch 'fix-regex-normalizer' into 'develop'
fix regex shortcode problem

Closes #675

See merge request pleroma/pleroma-fe!963
2019-10-01 06:29:31 +00:00
Henry Jameson a2923570c3 fix regex shortcode problem 2019-09-30 23:45:03 +03:00
Your New SJW Waifu ec7526e0b3 Merge remote-tracking branch 'upstream/develop' into develop 2019-09-30 14:45:56 -05:00
Shpuld Shpludson bcfdd68e70 Merge branch 'i18n/update-ja_pedantic' into 'develop'
i18n/Update Pedantic Japanese Messages

See merge request pleroma/pleroma-fe!962
2019-09-30 05:09:05 +00:00
Hakaba Hitoyo 194979783e i18n/Update Pedantic Japanese Messages 2019-09-30 05:09:05 +00:00
Shpuld Shpludson b90137631f Merge branch 'i18n/update-ja' into 'develop'
i18n/Update Japanese Messages

See merge request pleroma/pleroma-fe!961
2019-09-30 05:07:57 +00:00
Hakaba Hitoyo 087a5b612d i18n/Update Japanese Messages 2019-09-30 05:07:57 +00:00
Shpuld Shpludson 767b965780 Merge branch '672' into 'develop'
Make post status modal state persistent unless reply user is changed

Closes #672

See merge request pleroma/pleroma-fe!959
2019-09-30 05:05:12 +00:00
taehoon 50d9ed0007 reset post status form only when reply user is changed 2019-09-28 16:35:39 -04:00
Your New SJW Waifu b9814a2afd Merge remote-tracking branch 'upstream/develop' into develop 2019-09-27 07:32:43 -05:00