2346 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Kelson	9fa55c3d8b	#1236 Kiwix is written in Kotlin	2019-06-29 10:12:02 +02:00
Isaac Hutt	0539d56849	Merge pull request #1198 from kiwix/feature/NoteKeeper ... GSoC 2019 Deliverable: Note Keeper	2019-06-26 21:23:51 +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
Sean Mac Gillicuddy	c6491281e2	#1200 remove hotfix line, expnd feature line	2019-06-24 16:00:53 +01:00
Isaac Hutt	5fbe546dd5	Merge branch 'master' into feature/NoteKeeper	2019-06-23 17:40:54 +01:00
Kelson	50ad2e00d6	Create FUNDING.yml	2019-06-22 07:55:42 +02:00
Sean Mac Gillicuddy	209cf78311	Increase timeout to 1 minute	2019-06-21 15:23:08 +01:00
Aditya-Sood	5723554c53	Refactor: Use Field-injection for SharedPreferenceUtil in AddNoteDialog and ConfirmationAlertDialogFragment ... * Replaced previously used constructor-injection with field-injection * Minor refactoring: Remove extra super() calls & use same names for constructor parameters as member variables	2019-06-20 21:52:34 +05:30
Aditya-Sood	62c4655622	Refactor: Avoid adding AddNoteDialog to back-stack and related code changes	2019-06-20 21:22:26 +05:30
Aditya-Sood	77c30ac518	Refactor: Correct the use of string resources	2019-06-20 18:35:08 +05:30
Sean Mac Gillicuddy	e42a7320ae	#1200 explain how the branching model will work post 2.5	2019-06-20 13:17:19 +01:00
Aditya-Sood	7b8bd2b406	Refactor: Moved ConfirmationAlertDialogFragment to a separate file from AddNoteDialog ... ConfirmationAlertDialogFragment is now a generic helper class for displaying a 2-button (positive & negative) confirmation dialog fragment on top of an existing dialog fragment	2019-06-20 17:03:30 +05:30
Sean Mac Gillicuddy	3a329a95f0	Prevent builds of pushed branches unless it is a tag	2019-06-20 11:42:45 +01:00
macgills	55aa28e7d2	Merge pull request #1192 from kiwix/macgills/2.5-mergeable-to-dev ... Merge 2.5 to dev	2019-06-20 09:55:30 +01:00
Aditya-Sood	ffba82e0c7	Refactor: Extract the display of all toasts (related to AddNoteDialog) to a common method showToast()	2019-06-20 13:27:47 +05:30
Sean Mac Gillicuddy	5431afa1f7	Merge branch 'release' into macgills/2.5-mergeable-to-dev ... # Conflicts: # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/java/org/kiwix/kiwixmobile/di/modules/NetworkModule.java # app/src/main/res/xml/network_security_config.xml	2019-06-19 11:55:07 +01:00
macgills	7da84c0b90	Merge pull request #1204 from kiwix/macgills/hotfix/use-http ... - Use http instead of https - Increase read timeout - bump abi codes … 2.5.1	2019-06-19 09:34:02 +01:00
Sean Mac Gillicuddy	e680155430	- add network security config from master	2019-06-18 13:05:08 +01:00
Sean Mac Gillicuddy	f7b263280b	- Use http instead of https - Increase read timeout - bump abi codes to remove shadowing complaint - increase version to 2.5.1	2019-06-18 12:39:03 +01:00
macgills	d91e500897	Merge pull request #1194 from kiwix/macgills/#1193-migrate-db ... Macgills/#1193 migrate db	2019-06-18 10:05:53 +01:00
Sean Mac Gillicuddy	6f0eecf79b	#1193 fix null pointer in test	2019-06-17 17:43:15 +01:00
Sean Mac Gillicuddy	0099e45dfd	#1193 fix tests and ignore broken one	2019-06-17 17:09:11 +01:00
Sean Mac Gillicuddy	d9b45ddeaa	#1193 correct migration of zimId	2019-06-17 16:57:31 +01:00
Sean Mac Gillicuddy	22b651a79e	Merge branch 'macgills/2.5-mergeable-to-dev' into macgills/#1193-migrate-db	2019-06-17 16:06:26 +01:00
Sean Mac Gillicuddy	51aa3a4939	- Readd deleted depndency - fix import	2019-06-17 15:42:34 +01:00
Sean Mac Gillicuddy	08099255ee	fix lint errors	2019-06-17 15:34:49 +01:00