summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2440 from syuilo/developsyuilo2018-08-243-5/+7
|\
| * 8.3.1syuilo2018-08-241-2/+2
| * Fix bugsyuilo2018-08-242-1/+3
| * Refactorsyuilo2018-08-241-2/+2
* | Merge pull request #2439 from syuilo/developsyuilo2018-08-246-24/+78
|\|
| * 8.3.0syuilo2018-08-241-2/+2
| * Merge branch 'develop' of https://github.com/syuilo/misskey into developsyuilo2018-08-242-2/+6
| |\
| | * Merge pull request #2438 from mei23/mei-0824-basehtmlccsyuilo2018-08-241-2/+1
| | |\
| | | * ベースHTMLは immutableキャッシュしないようにするmei232018-08-241-2/+1
| | * | Merge pull request #2436 from mei23/mei-0824-api404syuilo2018-08-241-0/+5
| | |\ \
| | | * | Return 404 for unknown APImei232018-08-241-0/+5
| | | |/
| * | / Improve chartsyuilo2018-08-243-20/+70
| |/ /
* | / Merge pull request #2437 from syuilo/developsyuilo2018-08-2412-376/+257
|\| | | |/ |/|
| * 8.2.0syuilo2018-08-241-2/+2
| * Better chartssyuilo2018-08-2412-374/+255
| * Merge pull request #2435 from syuilo/mastersyuilo2018-08-240-0/+0
| |\ | |/ |/|
* | 8.1.0 (#2426)syuilo2018-08-236-150/+253
* | Merge pull request #2423 from syuilo/developsyuilo2018-08-238-46/+227
|\ \
| | * 8.1.0 (#2426) (#2434)syuilo2018-08-240-0/+0
| | * Merge branch 'develop' of https://github.com/syuilo/misskey into developsyuilo2018-08-231-1/+1
| | |\
| | | * Merge pull request #2423 from syuilo/develop (#2425)syuilo2018-08-230-0/+0
| | | * Merge pull request #2424 from acid-chicken/patch-4syuilo2018-08-231-1/+1
| | | |\
| | | | * Update url-preview.vueAcid Chicken (硫酸鶏)2018-08-231-1/+1
| | |_|/ | |/| |
| | * | 8.1.0syuilo2018-08-231-2/+2
| | |/
| | * 一時間ごとのグラフも見れるようにsyuilo2018-08-234-147/+250
| |/
| * 1時間単位での集計を追加syuilo2018-08-235-44/+212
| * Merge branch 'develop' of https://github.com/syuilo/misskey into developsyuilo2018-08-231-1/+1
| |\
| | * Merge pull request #2419 from rinsuki/patch-1syuilo2018-08-231-1/+1
| | |\
| | | * https://misskey.xyz/notes/5b7e20bd248403003019b860 の修正rinsuki2018-08-231-1/+1
| | |/
| * / Fix bug: Check following request existancesyuilo2018-08-232-1/+14
| |/
| * Merge pull request #2416 from syuilo/mastersyuilo2018-08-231-2/+2
| |\ | |/ |/|
* | Merge pull request #2372 from syuilo/greenkeeper/vue-js-modal-1.3.18syuilo2018-08-231-1/+1
|\ \
| * | fix(package): update vue-js-modal to version 1.3.18greenkeeper[bot]2018-08-201-1/+1
* | | Merge pull request #2400 from syuilo/greenkeeper/webpack-4.17.1syuilo2018-08-231-1/+1
|\ \ \
| * | | fix(package): update webpack to version 4.17.1greenkeeper[bot]2018-08-221-1/+1
* | | | Merge pull request #2414 from syuilo/developsyuilo2018-08-232-2/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | 7.4.1syuilo2018-08-231-1/+1
| * | | Merge branch 'develop' of https://github.com/syuilo/misskey into developsyuilo2018-08-231-2/+2
| |\ \ \
| | * \ \ Merge pull request #2413 from syuilo/mastersyuilo2018-08-231-2/+2
| | |\ \ \ | |_|/ / / |/| | | |
* | | | | Merge branch 'master' of https://github.com/syuilo/misskeysyuilo2018-08-2320-692/+565
|\ \ \ \ \
| * \ \ \ \ Merge pull request #2412 from syuilo/developsyuilo2018-08-2320-692/+565
| |\ \ \ \ \ | | | |/ / / | | |/| | |
* | / | | | 7.4.0syuilo2018-08-231-2/+2
|/ / / / /
| | * / / 互換性の修正syuilo2018-08-231-1/+10
| |/ / /
| * | | コントロールパネルから招待制のオンオフを切り替えら...syuilo2018-08-232-0/+51
| * | | Add control panel link in navsyuilo2018-08-233-4/+10
| * | | Fix #2410syuilo2018-08-231-0/+2
| * | | Fix bugsyuilo2018-08-232-4/+4
| * | | Merge branch 'develop' of https://github.com/syuilo/misskey into developsyuilo2018-08-2312-4428/+4416
| |\ \ \
| | * \ \ Merge pull request #2409 from syuilo/l10n_developsyuilo2018-08-2312-4428/+4416
| | |\ \ \
| | | * | | New translations ja-JP.yml (Japanese, Kansai)syuilo2018-08-231-305/+304