17 Commits

Author SHA1 Message Date
Rani Sargees
4d8f44ddae merge double upstream 2020-05-02 23:39:46 -04:00
arkon
264e04368b Update issue templates 2020-05-02 15:07:47 -04:00
arkon
7bd9b21e5a Update issue templates 2020-05-01 18:18:29 -04:00
arkon
ce13a5152b Update issue templates 2020-04-04 10:21:19 -04:00
NerdNumber9
5fbe1a8614 Upstream merge 2019-03-31 00:23:44 -04:00
inorichi
0afd77d110
Update ISSUE_TEMPLATE.md 2019-03-22 19:26:04 +01:00
NerdNumber9
5cfdbbce7a Merge branch 'master' of https://github.com/inorichi/tachiyomi
# Conflicts:
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/manga/info/MangaInfoController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderPresenter.kt
2018-07-08 15:51:26 -04:00
Carlos
136e90638a Update ISSUE_TEMPLATE.md (#1509)
* Update ISSUE_TEMPLATE.md

Put the extensions/repo information more front and center in the template.

* Update ISSUE_TEMPLATE.md
2018-06-27 11:42:51 +02:00
NerdNumber9
a71ae29c98 Add Tsumino captcha display and merge branch 'master' of upstream
# Conflicts:
#	.github/readme-images/app-icon.png
#	.github/readme-images/screens.png
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java
2018-02-24 11:13:43 -05:00
Ken Swenson
aa7dfb7bee Update README.md (#1241)
Include CONTRIBUTING.md guidelines as collapseable elements.
Remove white background from screenshots
Optimize app-icon.png and screens.png using `optipng -o2`
2018-02-17 13:01:46 +01:00
NerdNumber9
908128b55d Merge upstream changes 2017-11-29 21:53:02 -05:00
Jozef Hollý
537693f5cf README, CONTRIBUTING and ISSUE_TEMPLATE, Discord (#952)
* Include discord, change issue segment

* Update CONTRIBUTING.md

* Update ISSUE_TEMPLATE.md
2017-08-28 09:42:44 +02:00
NerdNumber9
9dbb59f337 Upstream merge
Internal permission change
Fix url adder
2017-05-04 23:38:17 -04:00
Jozef Hollý
d577bf300c Fix formatting issues when people ignore instructions 2016-04-02 14:34:27 +02:00
Jozef Hollý
3cf61f2f93 Update ISSUE_TEMPLATE.md 2016-03-05 15:10:11 +01:00
inorichi
110df59197 Release 0.1.4 2016-02-21 15:59:07 +01:00
J2ghz
9786074119 Move github files to .github/ 2016-02-20 12:06:53 +01:00