Skip to content
Permalink
Branch: develop-on-gli…
Commits on Jun 19, 2019
  1. fix count system

    Kirishima21 committed Jun 19, 2019
  2. fix list UI

    Kirishima21 committed Jun 19, 2019
  3. translation ja

    Kirishima21 committed Jun 19, 2019
  4. new version code

    Kirishima21 committed Jun 19, 2019
Commits on Jun 18, 2019
  1. fix regular expression

    Kirishima21 committed Jun 18, 2019
  2. Merge branch 'master' into develop-on-glitch

    Kirishima21 committed Jun 18, 2019
    # Conflicts:
    #	app/javascript/flavours/glitch/features/compose/index.js
    #	app/javascript/flavours/glitch/features/getting_started/index.js
    #	app/javascript/flavours/glitch/features/ui/components/tabs_bar.js
    #	app/javascript/flavours/glitch/styles/components/columns.scss
    #	app/javascript/flavours/glitch/styles/components/index.scss
    #	app/javascript/flavours/glitch/util/async-components.js
    #	app/javascript/mastodon/locales/ar.json
    #	app/javascript/mastodon/locales/ast.json
    #	app/javascript/mastodon/locales/bg.json
    #	app/javascript/mastodon/locales/bn.json
    #	app/javascript/mastodon/locales/ca.json
    #	app/javascript/mastodon/locales/co.json
    #	app/javascript/mastodon/locales/cy.json
    #	app/javascript/mastodon/locales/de.json
    #	app/javascript/mastodon/locales/el.json
    #	app/javascript/mastodon/locales/eo.json
    #	app/javascript/mastodon/locales/es.json
    #	app/javascript/mastodon/locales/eu.json
    #	app/javascript/mastodon/locales/fa.json
    #	app/javascript/mastodon/locales/fi.json
    #	app/javascript/mastodon/locales/fr.json
    #	app/javascript/mastodon/locales/gl.json
    #	app/javascript/mastodon/locales/he.json
    #	app/javascript/mastodon/locales/hr.json
    #	app/javascript/mastodon/locales/hu.json
    #	app/javascript/mastodon/locales/hy.json
    #	app/javascript/mastodon/locales/id.json
    #	app/javascript/mastodon/locales/io.json
    #	app/javascript/mastodon/locales/ja.json
    #	app/javascript/mastodon/locales/ka.json
    #	app/javascript/mastodon/locales/ko.json
    #	app/javascript/mastodon/locales/lv.json
    #	app/javascript/mastodon/locales/ms.json
    #	app/javascript/mastodon/locales/nl.json
    #	app/javascript/mastodon/locales/no.json
    #	app/javascript/mastodon/locales/pl.json
    #	app/javascript/mastodon/locales/ru.json
    #	app/javascript/mastodon/locales/sl.json
    #	app/javascript/mastodon/locales/sq.json
    #	app/javascript/mastodon/locales/sr-Latn.json
    #	app/javascript/mastodon/locales/sr.json
    #	app/javascript/mastodon/locales/sv.json
    #	app/javascript/mastodon/locales/ta.json
    #	app/javascript/mastodon/locales/th.json
    #	app/javascript/mastodon/locales/uk.json
    #	app/javascript/mastodon/locales/whitelist_de.json
    #	app/javascript/mastodon/locales/zh-CN.json
    #	app/javascript/mastodon/locales/zh-HK.json
    #	config/locales/activerecord.ar.yml
    #	config/locales/activerecord.ca.yml
    #	config/locales/activerecord.da.yml
    #	config/locales/activerecord.de.yml
    #	config/locales/activerecord.el.yml
    #	config/locales/activerecord.es.yml
    #	config/locales/activerecord.eu.yml
    #	config/locales/activerecord.fa.yml
    #	config/locales/activerecord.gl.yml
    #	config/locales/activerecord.nl.yml
    #	config/locales/activerecord.pl.yml
    #	config/locales/activerecord.sk.yml
    #	config/locales/activerecord.zh-CN.yml
    #	config/locales/ar.yml
    #	config/locales/ast.yml
    #	config/locales/bg.yml
    #	config/locales/bn.yml
    #	config/locales/ca.yml
    #	config/locales/co.yml
    #	config/locales/cs.yml
    #	config/locales/cy.yml
    #	config/locales/da.yml
    #	config/locales/de.yml
    #	config/locales/devise.ar.yml
    #	config/locales/devise.ca.yml
    #	config/locales/devise.cs.yml
    #	config/locales/devise.eo.yml
    #	config/locales/devise.es.yml
    #	config/locales/devise.eu.yml
    #	config/locales/devise.he.yml
    #	config/locales/devise.hr.yml
    #	config/locales/devise.id.yml
    #	config/locales/devise.ko.yml
    #	config/locales/devise.nl.yml
    #	config/locales/devise.sk.yml
    #	config/locales/devise.sr-Latn.yml
    #	config/locales/devise.sr.yml
    #	config/locales/devise.th.yml
    #	config/locales/devise.zh-CN.yml
    #	config/locales/devise.zh-HK.yml
    #	config/locales/devise.zh-TW.yml
    #	config/locales/doorkeeper.ar.yml
    #	config/locales/doorkeeper.bg.yml
    #	config/locales/doorkeeper.ca.yml
    #	config/locales/doorkeeper.cy.yml
    #	config/locales/doorkeeper.da.yml
    #	config/locales/doorkeeper.de.yml
    #	config/locales/doorkeeper.es.yml
    #	config/locales/doorkeeper.fa.yml
    #	config/locales/doorkeeper.fi.yml
    #	config/locales/doorkeeper.fr.yml
    #	config/locales/doorkeeper.he.yml
    #	config/locales/doorkeeper.hr.yml
    #	config/locales/doorkeeper.hu.yml
    #	config/locales/doorkeeper.id.yml
    #	config/locales/doorkeeper.io.yml
    #	config/locales/doorkeeper.it.yml
    #	config/locales/doorkeeper.ka.yml
    #	config/locales/doorkeeper.kk.yml
    #	config/locales/doorkeeper.nl.yml
    #	config/locales/doorkeeper.no.yml
    #	config/locales/doorkeeper.pt.yml
    #	config/locales/doorkeeper.ro.yml
    #	config/locales/doorkeeper.ru.yml
    #	config/locales/doorkeeper.sk.yml
    #	config/locales/doorkeeper.sv.yml
    #	config/locales/doorkeeper.th.yml
    #	config/locales/doorkeeper.uk.yml
    #	config/locales/doorkeeper.zh-CN.yml
    #	config/locales/doorkeeper.zh-HK.yml
    #	config/locales/doorkeeper.zh-TW.yml
    #	config/locales/el.yml
    #	config/locales/eo.yml
    #	config/locales/es.yml
    #	config/locales/eu.yml
    #	config/locales/fa.yml
    #	config/locales/fi.yml
    #	config/locales/fr.yml
    #	config/locales/gl.yml
    #	config/locales/he.yml
    #	config/locales/hr.yml
    #	config/locales/hu.yml
    #	config/locales/id.yml
    #	config/locales/io.yml
    #	config/locales/it.yml
    #	config/locales/ja.yml
    #	config/locales/ka.yml
    #	config/locales/kk.yml
    #	config/locales/ko.yml
    #	config/locales/lt.yml
    #	config/locales/lv.yml
    #	config/locales/ms.yml
    #	config/locales/nl.yml
    #	config/locales/no.yml
    #	config/locales/oc.yml
    #	config/locales/pl.yml
    #	config/locales/pt-BR.yml
    #	config/locales/pt.yml
    #	config/locales/ro.yml
    #	config/locales/ru.yml
    #	config/locales/simple_form.ar.yml
    #	config/locales/simple_form.ast.yml
    #	config/locales/simple_form.bg.yml
    #	config/locales/simple_form.ca.yml
    #	config/locales/simple_form.co.yml
    #	config/locales/simple_form.cy.yml
    #	config/locales/simple_form.da.yml
    #	config/locales/simple_form.de.yml
    #	config/locales/simple_form.el.yml
    #	config/locales/simple_form.eo.yml
    #	config/locales/simple_form.es.yml
    #	config/locales/simple_form.eu.yml
    #	config/locales/simple_form.fa.yml
    #	config/locales/simple_form.fi.yml
    #	config/locales/simple_form.fr.yml
    #	config/locales/simple_form.gl.yml
    #	config/locales/simple_form.he.yml
    #	config/locales/simple_form.hr.yml
    #	config/locales/simple_form.hu.yml
    #	config/locales/simple_form.id.yml
    #	config/locales/simple_form.io.yml
    #	config/locales/simple_form.it.yml
    #	config/locales/simple_form.ka.yml
    #	config/locales/simple_form.kk.yml
    #	config/locales/simple_form.ko.yml
    #	config/locales/simple_form.nl.yml
    #	config/locales/simple_form.no.yml
    #	config/locales/simple_form.oc.yml
    #	config/locales/simple_form.pl.yml
    #	config/locales/simple_form.pt-BR.yml
    #	config/locales/simple_form.pt.yml
    #	config/locales/simple_form.ro.yml
    #	config/locales/simple_form.ru.yml
    #	config/locales/simple_form.sk.yml
    #	config/locales/simple_form.sl.yml
    #	config/locales/simple_form.sq.yml
    #	config/locales/simple_form.sr-Latn.yml
    #	config/locales/simple_form.sr.yml
    #	config/locales/simple_form.sv.yml
    #	config/locales/simple_form.th.yml
    #	config/locales/simple_form.tr.yml
    #	config/locales/simple_form.uk.yml
    #	config/locales/simple_form.zh-CN.yml
    #	config/locales/simple_form.zh-HK.yml
    #	config/locales/simple_form.zh-TW.yml
    #	config/locales/sk.yml
    #	config/locales/sl.yml
    #	config/locales/sq.yml
    #	config/locales/sr-Latn.yml
    #	config/locales/sr.yml
    #	config/locales/sv.yml
    #	config/locales/te.yml
    #	config/locales/th.yml
    #	config/locales/tr.yml
    #	config/locales/uk.yml
    #	config/locales/zh-CN.yml
    #	config/locales/zh-HK.yml
    #	config/locales/zh-TW.yml
Commits on Jun 16, 2019
  1. Merge pull request tootsuite#1121 from ThibG/glitch-soc/merge-upstream

    ThibG committed Jun 16, 2019
    Merge upstream changes
  2. Fix check-i18n builds (tootsuite#11084)

    Gargron committed Jun 16, 2019
    * Fix check-i18n builds
    
    * Remove check for missing plural forms
Commits on Jun 15, 2019
  1. [Glitch] Change full logo to use primary text color of the given theme

    Gargron authored and ThibG committed Jun 8, 2019
    Port 20dda5c to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Commits on Jun 14, 2019
Commits on Jun 13, 2019
  1. Merge pull request tootsuite#1111 from ThibG/glitch-soc/merge-upstream

    ThibG committed Jun 13, 2019
    Merge upstream changes
  2. [Glitch] List attachments in boost modal

    ThibG committed Jun 13, 2019
    Port dd45c63 to glitch-soc
  3. [Glitch] Fix ordering of keyboard access between CW field, textarea a…

    ThibG committed Jun 13, 2019
    …nd emoji picker
    
    Port b4d67fe to glitch-soc
  4. [Glitch] Only show profile directory link when it's enabled

    ThibG committed Jun 12, 2019
    Port 1b4dcc3 to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  5. [Glitch] Fix border-bottom of active tab bars

    ThibG committed Jun 12, 2019
    Port faafc3a to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
  6. Fix notification badge

    ThibG committed Jun 12, 2019
  7. Fix multiple-column padding

    ThibG committed Jun 12, 2019
  8. Fix navigation panel

    ThibG committed Jun 12, 2019
  9. Fix and refactor SCSS

    ThibG committed Jun 12, 2019
  10. [Glitch] Fix position of search icon

    Gargron authored and ThibG committed Jun 8, 2019
    Port 9add88a to glitch-soc
    
    Signed-off-by: Thibaut Girka <thib@sitedethib.com>
Older
You can’t perform that action at this time.