kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-08-03 10:46:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,328 Commits 68 Branches 45 Tags
Commit Graph

2328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Sean Mac Gillicuddy
d88b39eec9 Merge branch 'release' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	.travis.yml
 2019-06-17 15:16:06 +01:00
Sean Mac Gillicuddy
09ba7a34a5 tidy up dependencies 2019-06-17 15:12:47 +01:00
Sean Mac Gillicuddy
dc6b1ff63c Merge branch 'develop' into macgills/2.5-mergeable-to-dev 2019-06-17 14:54:57 +01:00
Sean Mac Gillicuddy
d10c2e3b60 - increase numbering for abi splits to resolve error on play store 2.5.0 2019-06-17 12:25:41 +01:00
Sean Mac Gillicuddy
f35c2e44f4 -attempt draft release - remove branchname as tags do not build on a branch 2019-06-17 11:39:42 +01:00
Sean Mac Gillicuddy
4924eea71c -build release variant so apks can be uploaded to github releases - playstore does not accept universal apks for abi splits that have a total mapping for the available code, deactivate 2019-06-17 09:44:35 +01:00
Aditya-Sood
891cb950ca Refactor: Use ButterKnife to initialise views in AddNoteDialog 2019-06-16 21:49:12 +05:30
Aditya-Sood
11d3e8dea3 Refactor: Use injection (Dagger) for SharedPreferenceUtil in AddNoteDialog 2019-06-16 19:22:13 +05:30
Aditya-Sood
873eb2bce8 Refactor: Refer comments by @macgills in PR #1198 2019-06-15 23:02:56 +05:30
Sean Mac Gillicuddy
d2726c80b9 set play publisher to be enabled because branchname is unreliable on travis 2019-06-14 16:44:33 +01:00
Sean Mac Gillicuddy
d4363ae951 disable body of github release, broken on travis 2019-06-14 16:32:37 +01:00
Sean Mac Gillicuddy
14df2a1dbd update deployment to be on any tag 2019-06-14 15:45:40 +01:00
macgills
5fd479c9fb
Merge pull request #1185 from kiwix/macgills/2.5-kotlin 
2.5
 2019-06-14 14:56:26 +01:00
macgills
1a37cb0f09
Merge pull request #1199 from kiwix/macgills/2.5-contribution-update 
Update CONTRIBUTING.md
 2019-06-14 13:27:33 +01:00
Kelson
92cf08c233 Remove SquiDB from README.md 2019-06-14 13:53:49 +02:00
Kelson
a24818ff9a Light reformatting of CONTRIBUTING.md 2019-06-14 13:52:12 +02:00
Sean Mac Gillicuddy
54eed3fc9c Merge branch 'macgills/2.5-kotlin' into macgills/2.5-mergeable-to-dev 
# Conflicts:
#	.travis.yml
#	app/build.gradle
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/components/TestComponent.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/di/modules/TestJNIModule.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/DownloadTest.java
#	app/src/androidTestKiwix/java/org/kiwix/kiwixmobile/tests/NetworkTest.java
#	app/src/main/AndroidManifest.xml
#	build.gradle
 2019-06-14 12:14:19 +01:00
Sean Mac Gillicuddy
3ddebc3096 Update CONTRIBUTING.md 2019-06-14 11:06:29 +01:00