Merge branch 'master' into l10n_master
Showing
- .travis.yml 3 additions, 8 deletions.travis.yml
- appveyor.yml 41 additions, 0 deletionsappveyor.yml
- gulpfile.ts 2 additions, 0 deletionsgulpfile.ts
- locales/en.yml 2 additions, 2 deletionslocales/en.yml
- locales/index.ts 1 addition, 0 deletionslocales/index.ts
- locales/ja.yml 49 additions, 0 deletionslocales/ja.yml
- package.json 35 additions, 40 deletionspackage.json
- src/build/fa.ts 1 addition, 4 deletionssrc/build/fa.ts
- src/client/app/boot.js 1 addition, 1 deletionsrc/client/app/boot.js
- src/client/app/common/scripts/can-hide-text.ts 16 additions, 0 deletionssrc/client/app/common/scripts/can-hide-text.ts
- src/client/app/common/scripts/streaming/home.ts 11 additions, 0 deletionssrc/client/app/common/scripts/streaming/home.ts
- src/client/app/common/views/components/acct.vue 19 additions, 0 deletionssrc/client/app/common/views/components/acct.vue
- src/client/app/common/views/components/avatar.vue 1 addition, 1 deletionsrc/client/app/common/views/components/avatar.vue
- src/client/app/common/views/components/index.ts 2 additions, 0 deletionssrc/client/app/common/views/components/index.ts
- src/client/app/common/views/components/url-preview.vue 11 additions, 6 deletionssrc/client/app/common/views/components/url-preview.vue
- src/client/app/common/views/widgets/calendar.vue 95 additions, 106 deletionssrc/client/app/common/views/widgets/calendar.vue
- src/client/app/common/views/widgets/rss.vue 6 additions, 4 deletionssrc/client/app/common/views/widgets/rss.vue
- src/client/app/desktop/views/components/drive.file.vue 2 additions, 2 deletionssrc/client/app/desktop/views/components/drive.file.vue
- src/client/app/desktop/views/components/home.vue 24 additions, 24 deletionssrc/client/app/desktop/views/components/home.vue
- src/client/app/desktop/views/components/media-image.vue 1 addition, 1 deletionsrc/client/app/desktop/views/components/media-image.vue
Loading
Please register or sign in to comment