Commit Graph

5713 Commits

Author SHA1 Message Date
Henry Jameson f0c4bb1193 Merge remote-tracking branch 'upstream/develop' into themes-accent
* upstream/develop: (33 commits)
  add emoji reactions to changelog
  fix emoji reaction classes broken in develop
  review changes
  Fix password and email update
  remove unnecessary anonymous function
  Apply suggestion to src/services/api/api.service.js
  remove logs/commented code
  remove favs count from react button
  remove mock data
  change emoji reactions to use new format
  Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE)
  Fix missing TWKN when logged in, but server is set to private mode.
  Fix follower request fetching
  Add domain mutes to changelog
  Implement domain mutes v2
  change changelog to reflect actual release history of frontend
  Fix #750 , fix error messages and captcha resetting
  Optimize Notifications Rendering
  update CHANGELOG
  Use last seen notif instead of first unseen notif for sinceId
  ...
2020-01-28 20:44:13 +02:00
Shpuld Shpuldson c54111797a add emoji reactions to changelog 2020-01-28 17:54:40 +02:00
Shpuld Shpuldson 29806c9629 fix emoji reaction classes broken in develop 2020-01-28 17:53:47 +02:00
lain 73253b87bf Merge branch 'feat/emoji-reactions' into 'develop'
Emoji reactions

See merge request pleroma/pleroma-fe!1049
2020-01-28 15:24:56 +00:00
Shpuld Shpuldson 6afff4f8c2 review changes 2020-01-28 17:09:25 +02:00
HJ 4a11ee9768 Merge branch 'fix-password-and-email-update' into 'develop'
Fix email and password forms in user settings

See merge request pleroma/pleroma-fe!1050
2020-01-28 11:13:17 +00:00
eugenijm 566f013ac4 Fix password and email update 2020-01-28 06:12:32 +03:00
Henry Jameson b63e679a31 removed one color TODO 2020-01-28 02:03:21 +02:00
Henry Jameson 53a15eec7d add theme to list 2020-01-28 01:31:37 +02:00
Henry Jameson 526b43eba6 Kenomo (see: #624) theme. Ability to define link color for post contents. Fixes 2020-01-28 01:29:20 +02:00
Henry Jameson 18ca2a035b fix rgba function, whoops 2020-01-28 00:26:10 +02:00
Shpuld Shpuldson 4e04079739 Merge branch 'feat/emoji-reactions' of git.pleroma.social:pleroma/pleroma-fe into feat/emoji-reactions 2020-01-27 18:44:25 +02:00
Shpuld Shpuldson e6291e4ee1 remove unnecessary anonymous function 2020-01-27 18:43:26 +02:00
lain cb205036f9 Apply suggestion to src/services/api/api.service.js 2020-01-27 14:18:15 +00:00
Shpuld Shpuldson e4e3a28838 remove logs/commented code 2020-01-27 15:49:05 +02:00
Henry Jameson 5313833d80 lint 2020-01-27 04:24:00 +02:00
Henry Jameson 7c074b8741 fix rgba css generation, add some tests to automatically verify that themes are
generated properly
2020-01-27 04:20:13 +02:00
Shpuld Shpuldson 0de627baae remove favs count from react button 2020-01-26 16:18:57 +02:00
Shpuld Shpuldson c4beac5f89 Merge branch 'develop' into feat/emoji-reactions 2020-01-26 15:59:59 +02:00
Shpuld Shpuldson 7cfe1b05e8 remove mock data 2020-01-26 15:57:40 +02:00
Shpuld Shpuldson a018ea622c change emoji reactions to use new format 2020-01-26 15:45:12 +02:00
HJ b0b0fc403a Merge branch 'event-target-fix' into 'develop'
Polyfills for EventTarget and CustomEvent

Closes #756

See merge request pleroma/pleroma-fe!1048
2020-01-24 12:42:54 +00:00
Henry Jameson d7e7f47b66 fix transparent color not affecting downstream slots 2020-01-24 00:56:47 +02:00
Henry Jameson 75fa07626d fix icons in menus 2020-01-24 00:39:21 +02:00
Henry Jameson b96993e4dd improved selectedMenu again 2020-01-24 00:36:32 +02:00
Henry Jameson 53576df72a popover/selected menu improvements 2020-01-24 00:02:16 +02:00
eugenijm 2c61eb8e7f Added polyfills for EventTarget (needed for Safari) and CustomEvent (needed for IE) 2020-01-24 00:55:13 +03:00
Henry Jameson f7ea12c905 separate actual theme data from theme framework 2020-01-23 23:37:58 +02:00
Henry Jameson c1f2457112 revert fgText -> text after some consideration. case was fixed already in other way 2020-01-23 22:48:32 +02:00
Henry Jameson f85a3e3f6d style the dropdown menus better 2020-01-23 22:42:59 +02:00
Henry Jameson c752f56d0b v l1 compatibility 2020-01-23 22:26:49 +02:00
Henry Jameson a69723badf fix snapshot mismatch message for file 2020-01-23 22:04:05 +02:00
HJ deb2ddb398 Merge branch 'fix/federated-timeline-when-private-mode' into 'develop'
Fix missing TWKN when logged in, but server is set to private mode.

Closes #759

See merge request pleroma/pleroma-fe!1047
2020-01-23 18:10:55 +00:00
Mark Felder 9d8dbd8340 Fix missing TWKN when logged in, but server is set to private mode. 2020-01-23 12:00:50 -06:00
Henry Jameson 64fc07f080 removed unused constant, using getOpacitySlot now 2020-01-23 00:36:38 +02:00
Henry Jameson 7354b6f706 fixed get(Layer|Opacity)Slot not working properly which broke Mojave theme 2020-01-23 00:35:56 +02:00
Henry Jameson 8de7eabd8f v2 compatibility fixes 2020-01-22 23:26:24 +02:00
Henry Jameson c7f42b7799 made it actually work, the forceSnapshot 2020-01-22 02:53:40 +02:00
Henry Jameson d98e31af45 snapshot/source mismatch case 2020-01-22 02:44:39 +02:00
Henry Jameson c1e3632f42 fix shadows not being valid from the get-go 2020-01-22 02:15:47 +02:00
Henry Jameson 644ce497a0 lightBg -> highlight because it causes issues with v2 2020-01-22 01:28:46 +02:00
Henry Jameson 803edcb53a dismiss warning when loading theme 2020-01-22 01:28:17 +02:00
Henry Jameson 1191207aa5 more help strings 2020-01-22 00:53:51 +02:00
Henry Jameson cf1149d8c5 updated changelog, slightly 2020-01-22 00:41:21 +02:00
Henry Jameson 9336140486 massively improved initial theme loading code, added checks and warnings when
loading theme files (import/localStorage/defaults)
2020-01-22 00:37:19 +02:00
Shpuld Shpludson ad8eb88323 Merge branch 'fix-follow-requests' into 'develop'
Fix follower request fetching

Closes pleroma#1523 and #757

See merge request pleroma/pleroma-fe!1046
2020-01-21 16:31:41 +00:00
lain 8080981fcd Fix follower request fetching 2020-01-21 16:51:49 +01:00
Henry Jameson 93dfb4d352 fix shadow picker preview, change hint 2020-01-20 02:00:13 +02:00
Henry Jameson a7b6c79136 eslint 2020-01-20 01:45:48 +02:00
Henry Jameson 2b36a62c56 fix tests, integrate depenentless sorting into toposort for easier testing and
better guarantees
2020-01-20 01:44:11 +02:00