2369 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sean Mac Gillicuddy	0b081b8663	#1214 fix file separators	2019-07-08 14:33:13 +01:00
Sean Mac Gillicuddy	0c9ada66db	#1214 upload debug nightlies and tagged releases to download.kiwix.org	2019-07-08 11:31:25 +01:00
Kelson	5251cf1383	Merge pull request #1249 from kiwix/feature/macgills/#1248-strict-mode ... #1248 enable Strict Mode on debug	2019-07-04 07:52:20 +02:00
Sean Mac Gillicuddy	33dc1111a6	Merge branch 'develop' into feature/macgills/#1248-strict-mode	2019-07-03 15:38:36 +01:00
macgills	8953642eda	Merge pull request #1256 from kiwix/feature/macgills/fix-build ... Fix build with lower target emulator	2019-07-03 15:35:57 +01:00
Sean Mac Gillicuddy	acbba3eecc	Use memory conservation	2019-07-03 14:34:32 +01:00
Sean Mac Gillicuddy	6c5bca88c3	cut out preomptimisation of starting emulator before script	2019-07-03 14:14:12 +01:00
Kelson	c1a7f30c83	Merge pull request #1257 from kiwix/feature/macgills/#1251-stalebot-prs ... #1251 add config for prs	2019-07-03 15:10:35 +02:00
Sean Mac Gillicuddy	9ff08d1f24	#1251 add config for prs	2019-07-03 14:05:20 +01:00
Sean Mac Gillicuddy	c0e930eb95	Fix build with lower target emulator	2019-07-03 13:02:39 +01:00
macgills	7bbcb530d0	Merge pull request #1247 from kiwix/master ... Update Develop with changes done only to master	2019-07-03 12:12:09 +01:00
Sean Mac Gillicuddy	a8930a33e9	Merge remote-tracking branch 'origin/develop'	2019-07-02 09:40:03 +01:00
Sean Mac Gillicuddy	682bcf6be1	Merge remote-tracking branch 'origin/develop' into feature/macgills/#1248-strict-mode	2019-07-02 09:38:25 +01:00
macgills	62987fa4ed	Merge pull request #1234 from kiwix/feature/macgills/#1214-universal-apk-upload ... #1214 upload universal apk to download.kiwix on nightly build and to …	2019-07-02 09:36:06 +01:00
Sean Mac Gillicuddy	ddefce9ff4	Merge branch 'feature/macgills/#1251-stale-prs' into feature/macgills/#1214-universal-apk-upload	2019-07-01 15:25:26 +01:00
Sean Mac Gillicuddy	76f085681e	#1214 update secrets with ssh key	2019-07-01 14:18:21 +01:00
Sean Mac Gillicuddy	f0cac913db	#1248 enable Strict Mode on debug	2019-07-01 13:20:23 +01:00
macgills	e5501e3f01	Merge pull request #1237 from kiwix/feature/NoteKeeper ... Addition to #1198	2019-07-01 12:03:24 +01:00
Sean Mac Gillicuddy	09f8299781	Merge branch 'develop' ... # Conflicts: # CONTRIBUTING.md	2019-07-01 12:01:21 +01:00
macgills	866cb48060	Merge pull request #1213 from kiwix/hotfix/up-read-timeout-for-low-end-devices ... Increase timeout to 1 minute	2019-07-01 11:53:52 +01:00
macgills	a51f964a43	Merge pull request #1220 from kiwix/feature/macgills/#1219-density-splits ... #1219 support density splits	2019-07-01 10:19:13 +01:00
macgills	7b97931994	Merge pull request #1230 from kiwix/feature/macgills/#1229-remove-build-types ... PR: #1229 BuildTypes removed	2019-07-01 10:09:25 +01:00
Kelson	9b3c827261	Merge pull request #1241 from kiwix/feature/kelson42/#1236-use-kotlin ... Feature/kelson42/#1236 use kotlin	2019-07-01 11:06:04 +02:00
Aditya-Sood	085ed7f7bd	Refactor AddNoteDialog ... - Added @NonNull annotations & replaced return values accordingly - Use ternary operator	2019-06-30 18:19:43 +05:30
Kelson	9fa55c3d8b	#1236 Kiwix is written in Kotlin	2019-06-29 10:12:02 +02:00
Aditya-Sood	865b579057	Bug fix: Correct the usage of close icon ... MainActivity, AnimationUtils & tab_switcher.xml were using the "ic_close_white_24dp" (whose colouring was corrected in a previous commit of this branch from black to white, which caused the 'Close all tabs' button to appear completely white without any icons)	2019-06-27 20:40:46 +05:30
Aditya-Sood	f568857952	Refactor & documentation ... - Refactor: AddNoteDialog - Doucumentation: AddNoteDialog & ZimContentProvider	2019-06-27 17:13:30 +05:30
Aditya-Sood	ea3490e048	Increment: Change path for storage of note files ... Code now uses ".../Kiwix/Notes/ZimFileName/ArticleUrl.txt" instead of ".../Notes/ZimFileTitle/ArticleTitle.txt" for storing notes - Changed because multiple zim files can have the same ZimFileTitle, whereas ZimFileName is the actual name of the zim file (& hence unique). - Chose ArticleUrl over ArticleTitle for greater stability (as article urls, being a core part of Kiwix, will always exist and hence are less likely to break the app)	2019-06-27 16:50:52 +05:30
Isaac Hutt	0539d56849	Merge pull request #1198 from kiwix/feature/NoteKeeper ... GSoC 2019 Deliverable: Note Keeper	2019-06-26 21:23:51 +01:00
Sean Mac Gillicuddy	65a28a2f66	#1214 upload universal apk to download.kiwix on nightly build and to Github Releases on a tagged release	2019-06-26 15:09:14 +01:00
Kelson	63599fa685	Merge pull request #1233 from kiwix/https ... Replace a few HTTP links with HTTPS	2019-06-26 15:53:18 +02:00
Kelson	23347677d0	More links using HTTPS in README	2019-06-26 15:40:37 +02:00
Kelson	624dbe58ef	Merge pull request #1232 from kiwix/macgills/feature/fix-contributing-branching ... Escape angle brackets	2019-06-26 13:03:47 +02:00
Sean Mac Gillicuddy	51d1729d51	Escape angle brackets	2019-06-26 11:27:43 +01:00
Sean Mac Gillicuddy	62d456ecc4	#1219 use the density from the output file	2019-06-26 10:42:45 +01:00
Sean Mac Gillicuddy	a1094285fb	#1229 BuildTypes removed	2019-06-26 10:29:22 +01:00
Sean Mac Gillicuddy	b4e28323e5	Merge branch 'develop' into feature/macgills/#1219-density-splits	2019-06-26 09:34:45 +01:00
macgills	2481ead365	Merge pull request #1225 from kiwix/feature/macgills/#1224-fix-crash-reporting ... #1224 use correct fileProvider suffix	2019-06-26 09:32:39 +01:00
Sean Mac Gillicuddy	5635a50920	#1224 remove extraneous dash in .travis.yml	2019-06-25 15:52:30 +01:00
Sean Mac Gillicuddy	afb62ba9f1	#1224 attempt to fix build	2019-06-25 15:16:59 +01:00
macgills	5274ba81c0	Merge pull request #1227 from kiwix/feature/macgills/#1226-stalebot ... #1226 create stalebot configuration	2019-06-25 14:18:18 +01:00
Sean Mac Gillicuddy	c21703a4b3	#1226 create stalebot configuration	2019-06-25 13:25:32 +01:00
Aditya-Sood	87b389109b	Merge branch 'feature/NoteKeeper' of https://github.com/kiwix/kiwix-android into feature/NoteKeeper	2019-06-25 16:57:37 +05:30
Aditya-Sood	993dd3f9d0	Correct merging error	2019-06-25 16:53:38 +05:30
Sean Mac Gillicuddy	4bf2d2a3f9	#1224 use correct fileProvider suffix	2019-06-25 11:18:46 +01:00
Aditya-Sood	aa64d91c1f	Merge branch 'develop' into feature/NoteKeeper	2019-06-25 15:31:40 +05:30
Kelson	7d5c7c0c87	Merge pull request #1209 from kiwix/macgills/#1200-explain-branching-model ... #1200 explain how the branching model will work post 2.5	2019-06-24 21:06:19 +02:00
Sean Mac Gillicuddy	3c3d1ce1cf	#1219 support densit splits	2019-06-24 17:27:08 +01:00
Sean Mac Gillicuddy	0d945eec9c	Merge branch 'master' into macgills/#1200-explain-branching-model	2019-06-24 16:14:37 +01:00
macgills	f1dcc82103	Merge pull request #1208 from kiwix/macgills/update-travis-for-build-pushed-option ... Prevent builds of pushed branches unless it is a tag	2019-06-24 16:11:21 +01:00