darkkirb/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity
3901 commits 8 branches 25 tags 16 MiB
Commit graph

3901 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Maksim Pechnikov
188b6f56ed added acccount_actions component 2019-09-30 20:36:14 +03: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
Henry Jameson
20fc259350 fixed default values for multi-choice configurations, should also fix warnings 2019-09-30 00:04:43 +03:00
Henry Jameson
39b71e5dd6 Removed all whole mess of manual watch/data declaration, now fully automatic 2019-09-29 23:47:26 +03:00
Henry Jameson
979e170bd6 created mergedConfig getter to avoid obnoxious checks for undefined everywhere 2019-09-29 22:33:15 +03:00
taehoon
50d9ed0007 reset post status form only when reply user is changed 2019-09-28 16:35:39 -04:00
kaniini
aadd36f3ec Merge branch 'refactor-who-to-follow' into 'develop' 
Small refactoring in who to follow page

See merge request pleroma/pleroma-fe!932
 2019-09-26 22:32:40 +00:00
Hakaba Hitoyo
bc17839e52 Small refactoring in who to follow page 2019-09-26 22:32:39 +00:00
kaniini
9ef0e65b25 Merge branch 'feature/add-discoverable-preference' into 'develop' 
Feature/Add _Allow user discovery services_ preference

See merge request pleroma/pleroma-fe!947
 2019-09-26 22:31:28 +00:00
Hakaba Hitoyo
194dd88118 Feature/Add _Allow user discovery services_ preference 2019-09-26 22:31:28 +00:00
kaniini
4369ce6f1b Merge branch 'hide-followers-follows-count' into 'develop' 
Added a setting to hide follow/follower count from the user profile

See merge request pleroma/pleroma-fe!951
 2019-09-26 22:20:01 +00:00
Maksim Pechnikov
19cb98b85f Merge branch 'develop' into feature/following_reblogs 2019-09-26 21:14:31 +03:00
Maksim Pechnikov
c02433b7e6 revert font 2019-09-26 16:35:00 +03:00
HJ
501208d350 Merge branch 'emoji-selector-update' into 'develop' 
Emoji selector update

Closes #101

See merge request pleroma/pleroma-fe!895
 2019-09-26 05:27:59 +00:00
Henry Jameson
836cb817d1 fix tests 2019-09-25 20:54:07 +03:00
Henry Jameson
a3305799c7 Merge remote-tracking branch 'upstream/develop' into emoji-selector-update 
* upstream/develop: (42 commits)
  Fix formatting in oc.json
  avoid using global class
  fix logo moving bug when lightbox is open
  Reserve scrollbar gap when body scroll is locked
  setting display: initial makes trouble, instead, toggle display: none using classname
  lock body scroll
  add body-scroll-lock directive
  install body-scroll-lock
  wire up props with PostStatusModal
  rename component
  recover autofocusing behavior
  refactor MobilePostStatusModal using new PostStatusModal
  add new module and modal to post new status
  remove needless condition
  add mention button
  wire up user state with global store
  collapse fav/repeat notifications from muted users
  do not collapse thread muted posts in conversation
  detect thread-muted posts
  do not change word based muting logic
  ...
 2019-09-25 20:26:49 +03:00
Henry Jameson
2f26e8acc5 eslint 2019-09-25 20:23:55 +03:00
Henry Jameson
e6d2cf77af fix emoji inputs in user-settings, styles update 2019-09-25 20:11:06 +03:00
Henry Jameson
0b300e1708 bump z-index so that picker/suggest doesn't get overlapped by mobile button 2019-09-25 20:01:06 +03:00
Henry Jameson
e805303d3a Scroll emoji picker into view if it's obstructed 2019-09-25 19:58:15 +03:00
Henry Jameson
e3ceae0989 very important fix 2019-09-25 19:32:30 +03:00
Henry Jameson
0d6a9f5a62 comment, cleanup and improve autoresize/autoscroll 2019-09-25 19:30:55 +03:00
Shpuld Shpuldson
e55645aec1 Fix formatting in oc.json 2019-09-25 10:25:44 +03:00
Shpuld Shpludson
170372b2bc Merge branch '616' into 'develop' 
Lock body scroll when lightbox is open

Closes #616

See merge request pleroma/pleroma-fe!886
 2019-09-25 07:16:23 +00:00
Shpuld Shpludson
49ea63ddf3 Merge branch 'develop' into 'develop' 
[i18n] Update for the Occitan language file

See merge request pleroma/pleroma-fe!901
 2019-09-25 07:12:34 +00:00
Shpuld Shpludson
7a1081aa66 Merge branch 'es-translate' into 'develop' 
[i18n] Update es translate

See merge request pleroma/pleroma-fe!944
 2019-09-25 07:10:11 +00:00
Shpuld Shpludson
4c55e0d1be Merge branch 'eu-translate' into 'develop' 
[i18n] update eu translate

See merge request pleroma/pleroma-fe!943
 2019-09-25 07:09:57 +00:00
Shpuld Shpludson
ccba92a27c Merge branch '639-2' into 'develop' 
Add "Mention user" button to user card

Closes #639

See merge request pleroma/pleroma-fe!955
 2019-09-25 06:41:26 +00:00
Shpuld Shpludson
61bb02ef06 Merge branch '657' into 'develop' 
Collapse fav/repeat notifications from muted users

Closes #657

See merge request pleroma/pleroma-fe!945
 2019-09-25 06:24:41 +00:00
Henry Jameson
0f55359b49 fix 2019-09-25 08:43:02 +03:00
Henry Jameson
4f563e6efb account for parent padding, too 2019-09-25 08:36:30 +03:00