1. 14 Dec, 2018 5 commits
    • HJ's avatar
      13fbef45
    • HJ's avatar
      Merge remote-tracking branch 'upstream/develop' into async_follow · d7973b0b
      HJ authored
      * 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
        ...
      d7973b0b
    • HJ's avatar
      Merge branch 'fix-chrome' into 'develop' · 5b6c1aa9
      HJ authored
      fix chrome
      
      See merge request !420
      5b6c1aa9
    • HJ's avatar
      fix chrome · ac80cf86
      HJ authored
      ac80cf86
    • HJ's avatar
      Merge branch 'placeholder_for_server_generated_meta' into 'develop' · 54e34c68
      HJ authored
      Add placeholder to insert server generated metatags
      
      See merge request !419
      54e34c68
  2. 13 Dec, 2018 32 commits
  3. 12 Dec, 2018 3 commits