1. 15 Dec, 2018 2 commits
  2. 14 Dec, 2018 12 commits
    • Merge branch 'async_follow' into 'develop' · 4b30ce64
      Shpuld Shpludson authored
      Better "follow" button behavior
      
      Closes #133
      
      See merge request !396
    • Merge branch 'fix-hide-network' into 'develop' · 10a0296a
      HJ authored
      oof
      
      See merge request !422
    • oof · 7346c54d
      HJ authored
    • Merge branch 'fix-preload-nsfw' into 'develop' · 70ff9ce2
      HJ authored
      Fix preload images option being always disabled
      
      See merge request !421
    • 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
        ...
    • Merge branch 'search-mobile-fixes' into 'develop' · a158e75a
      HJ authored
      Fixes for user-finder on mobile
      
      Closes #188 and #179
      
      See merge request !389
    • more damage control · b4b819f4
      HJ authored
    • Merge remote-tracking branch 'upstream/develop' into search-mobile-fixes · bd745543
      HJ authored
      * upstream/develop: (176 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
        Fix typo that prevented scope copy from working.
        Refactor arrays to individual options
        Reset enableFollowsExport to true after 2 sec when an export file is available to download
        added check for activatePanel is function or not
        addressed PR comments
        activate panel on user screen click
        added not preload check so hidden toggles asap
        ...
    • Merge branch 'fix-chrome' into 'develop' · 5b6c1aa9
      HJ authored
      fix chrome
      
      See merge request !420
    • fix chrome · ac80cf86
      HJ authored
    • Merge branch 'placeholder_for_server_generated_meta' into 'develop' · 54e34c68
      HJ authored
      Add placeholder to insert server generated metatags
      
      See merge request !419
  3. 13 Dec, 2018 26 commits