pleroma-fe/src
Henry Jameson d7973b0b80 Merge remote-tracking branch 'upstream/develop' into async_follow
* upstream/develop: (45 commits)
  fix chrome
  Prevent html-minifier to remove placeholder comment in index.html template
  Add placeholder to insert server generated metatags. Related to #430
  added condition to check for logined user
  fix gradients and minor artifacts
  keep track of new instance options
  fix old MR
  oof
  get rid of slots
  fix timeago font
  added hide_network option, fixed properties naming
  Fix fetching new users, add storing local users in usersObjects with their screen_name as well as id, so that they could be fetched zero-state with screen-name link.
  improve notification subscription
  Refactor arrays to individual options
  Reset enableFollowsExport to true after 2 sec when an export file is available to download
  Write a unit test for fileSizeFormatService
  add checkbox to disable web push
  I am dumb
  Handle errors from server
  Moved upload errors in user_settings to an array. Moved upload error strings to its separate section in i18n
  ...
2018-12-14 17:17:58 +03:00
..
assets Make nsfw image easier to understand. 2018-05-16 13:01:17 +02:00
boot Merge branch 'feature/file-size-checking' into 'develop' 2018-12-13 21:02:17 +00:00
components Merge remote-tracking branch 'upstream/develop' into async_follow 2018-12-14 17:17:58 +03:00
i18n Merge remote-tracking branch 'upstream/develop' into async_follow 2018-12-14 17:17:58 +03:00
lib Merge remote-tracking branch 'upstream/develop' into feature/theming2 2018-11-26 05:21:58 +03:00
modules keep track of new instance options 2018-12-13 20:41:01 +03:00
services Resolve merge conflict 2018-12-13 17:22:19 +03:00
_variables.scss checkbox radius 2018-11-23 07:28:53 +03:00
App.js Merge remote-tracking branch 'upstream/develop' into feature/theming2 2018-11-26 05:21:58 +03:00
App.scss fix chrome 2018-12-14 14:35:56 +03:00
App.vue Merge remote-tracking branch 'upstream/develop' into mobile-back 2018-12-13 17:50:36 +03:00
main.js fix old MR 2018-12-13 20:25:46 +03:00
sw.js add checkbox to disable web push 2018-12-13 00:03:50 +07:00