fristi/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Packages Projects Releases Wiki Activity
2765 commits 11 branches 24 tags 20 MiB
Commit graph

2765 commits

This branch
This branch
All branches
Author SHA1 Message Date
HJ 0659d2fd3a Merge branch 'patch-1' into 'develop' 
Make select tag use --inputText as text color

See merge request pleroma/pleroma-fe!693
 2019-03-20 13:12:51 +00:00
Marcin Mikołajczak 4ace0866da Make select tag use --inputText as text color 2019-03-20 11:52:58 +00:00
dave 96c88b334c #444 - remote follow clean up 2019-03-19 14:41:50 -04:00
dave 07b8115a37 #444 - show remote follow button when logged out 2019-03-19 14:36:27 -04:00
jasper 3108722eda Add button to save without cropping 2019-03-18 18:19:42 -07:00
dave 13e727b5ee #436: sync notification with timeline 2019-03-18 14:42:09 -04:00
dave 060d3b0713 #436: implement is_seen logic 2019-03-18 12:30:34 -04:00
dave 55d7bd6d4e Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-18 10:37:26 -04:00
dave 5717d97182 #442 - update placeholder linebreak 2019-03-18 10:35:13 -04:00
dave 543cc0d285 #442 - clean up Bio placeholder text 2019-03-17 16:59:08 -04:00
HJ 96f9eab700 Merge branch 'mastoapi/emojis' into 'develop' 
MastoAPI: emoji support

See merge request pleroma/pleroma-fe!659
 2019-03-17 14:08:01 +00:00
dave 241503346f #436: clean up based on comment 2019-03-17 10:08:01 -04:00
Henry Jameson 4cdfd5fb86 post-merge fixes 2019-03-17 14:41:05 +02:00
Henry Jameson 30c0cafff1 Merge remote-tracking branch 'upstream/develop' into mastoapi/emojis 
* upstream/develop: (34 commits)
  after store: fix setting postFormats field
  fix user-card avatar falling into permament failed state
  fix flake id users not fetching correctly
  fix console error
  afterStoreSetup: Move log in and theme load to afterStoreSetup.
  afterStoreSetup: Handle 404 cases.
  afterStoreSetup: Emoji and nodeinfo refactor.
  afterStoreSetup: refactor TOS and panel fetching, handle 404s.
  afterStoreSetup: refactor.
  Load persistedStated with async/await.
  whoops
  レインせんぱいにサンキュー
  fix embedded relationship card parsing
  actually use embedded relationship if it's present
  instead of filtering nulls, let's just not have them in the first place
  #434 - fix plain text issue
  Add floating post-status button on mobile
  Update user settings icon to pencil
  I18n: Update Czech translation
  user_card.vue: Copy over .status-content img styling
  ...
 2019-03-17 13:32:56 +02:00
Exilat 7babbce522 [i18n] Update oc.json 2019-03-15 17:23:30 +00:00
dave e5786f32a7 #436: merge develop 2019-03-15 11:28:33 -04:00
taehoon 6e60873a3d Switch to mastoapi for user search 2019-03-15 11:03:11 -04:00
HJ 9364964b01 Merge branch 'mastoapi/user-stuff' into 'develop' 
Transition to MastoAPI: user data

See merge request pleroma/pleroma-fe!655
 2019-03-15 13:14:41 +00:00
lambda 92eb55c7bc Merge branch 'bugfix/nodeinfo-post-formats' into 'develop' 
after store: fix setting postFormats field

See merge request pleroma/pleroma-fe!683
 2019-03-15 13:03:35 +00:00
lambda c626f84336 Merge branch 'afterstore-refactor' into 'develop' 
afterStoreSetup: Move log in and theme load to afterStoreSetup.

See merge request pleroma/pleroma-fe!680
 2019-03-15 13:03:19 +00:00
dave 8ade93bb4d #436: update test 2019-03-14 22:36:11 -04:00
dave 935aae054f #436: add is_local for statuses 2019-03-14 22:07:42 -04:00
HJ ebc6a75d30 Merge branch 'issue-434-plain-text' into 'develop' 
#434 - fix plain text issue

Closes #434

See merge request pleroma/pleroma-fe!675
 2019-03-14 22:03:33 +00:00
William Pitcock f93d4a3754 after store: fix setting postFormats field 2019-03-14 21:35:45 +00:00
Henry Jameson 71c12fa3a5 fix user-card avatar falling into permament failed state 2019-03-14 23:07:28 +02:00
Henry Jameson 6420c93e98 fix flake id users not fetching correctly 2019-03-14 23:07:28 +02:00
shpuld 0a86d39ba9 remove notifications from sidebar, make notifications appear on login only 2019-03-14 20:40:56 +02:00
dave 97a3f9c0f5 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma-fe into issue-436-mastoapi-notifications 2019-03-14 14:24:23 -04:00
Henry Jameson 885a3a77df fix console error 2019-03-14 18:50:51 +02:00
dave 52326e6551 #436: remove clear & dismiss UI updates 2019-03-14 11:57:24 -04:00
shpuld f19284357e make nav bar slide, move mobile post status to mobile nav 2019-03-14 17:46:04 +02:00
dave 06fda27511 #436: update unit testing 2019-03-14 08:06:40 -04:00
dave e5e1d4c643 #436: fix notification order, follow type link issue, duplicate key 2019-03-14 07:55:39 -04:00
Edijs 3c5c09c74f Merge branch 'develop' into feature/version-info 2019-03-13 15:24:09 -07:00
dave 93a2510ede #436: update is_local 2019-03-13 15:43:48 -04:00
dave 78951964fb #436: update entity_normalizer 2019-03-13 15:34:45 -04:00
dave 2f7d890ad2 #436: add dismiss button, disable is_seen part 2019-03-13 14:08:03 -04:00
lain 5318227c37 afterStoreSetup: Move log in and theme load to afterStoreSetup. 2019-03-13 13:29:34 +01:00
lambda 9fd44e4a52 Merge branch 'afterstore-refactor' into 'develop' 
Afterstore refactor

See merge request pleroma/pleroma-fe!679
 2019-03-13 12:08:28 +00:00
lain 48ac96cfc7 afterStoreSetup: Handle 404 cases. 2019-03-13 12:41:39 +01:00
lain 446785ddce afterStoreSetup: Emoji and nodeinfo refactor. 2019-03-13 12:26:40 +01:00
lain f535ccd925 afterStoreSetup: refactor TOS and panel fetching, handle 404s. 2019-03-13 12:10:57 +01:00
lain c030e62254 afterStoreSetup: refactor. 2019-03-13 11:57:30 +01:00
lain 1387dfb889 Load persistedStated with async/await. 2019-03-13 11:29:45 +01:00
shpuld 7ce8fe9214 merge develop, add mobile nav component 2019-03-12 23:50:54 +02:00
dave cd9a7dd488 #436: integrate mastoAPI notifications 2019-03-12 17:16:57 -04:00
Henry Jameson 644eba87fe whoops 2019-03-12 22:14:41 +02:00
Henry Jameson 27cbe3ca65 レインせんぱいにサンキュー 2019-03-12 22:10:22 +02:00
Henry Jameson ce8b5fcd11 fix embedded relationship card parsing 2019-03-12 21:49:03 +02:00
Henry Jameson b9877a4323 actually use embedded relationship if it's present 2019-03-11 23:45:24 +02:00