2588 Commits

Author SHA1 Message Date
Sean Mac Gillicuddy
47a56f8238 #1114 suppress lint errors 2019-07-29 12:02:38 +01:00
Seán Mac Gillicuddy
b66890a469
Merge pull request #1306 from kiwix/feature/macgills/#101-proguard
#101 Add R8 configuration
2019-07-29 11:38:30 +01:00
Seán Mac Gillicuddy
7263d0c028
Merge pull request #1317 from kiwix/hotfix/macgills/fix-build-with-trusty
Stop jdk installation failure
2019-07-29 10:13:39 +01:00
Sean Mac Gillicuddy
444fa311ba Stop jdk installation failure 2019-07-29 09:26:10 +01:00
Seán Mac Gillicuddy
5e984d6d8a
Merge pull request #1296 from kiwix/feature/macgills/#1295-recursive-file-search
#1295 Make FileSearch recursive
2019-07-26 10:53:20 +01:00
Sean Mac Gillicuddy
222c303299 #1307 update readme 2019-07-26 10:40:54 +01:00
Sean Mac Gillicuddy
677cd2cdac #1307 improve dev flow of interacting with pre-commit hook 2019-07-26 10:25:53 +01:00
Seán Mac Gillicuddy
01939f8a4a
Merge pull request #1314 from kiwix/hotfix/macgills/fix-build
Remove tools/platform tools
2019-07-26 09:42:09 +01:00
Sean Mac Gillicuddy
2646772718 Remove tools/platform tools 2019-07-26 09:25:37 +01:00
Sean Mac Gillicuddy
5756b3894a #1307 remove tool/platform tools as they are already provided 2019-07-25 12:45:20 +01:00
Sean Mac Gillicuddy
9fceeb09c0 #1307 try different emulator to avoid build error 2019-07-25 12:45:20 +01:00
Sean Mac Gillicuddy
31840ed88a #1307 majority of kotlin inspections raised to error level and fixed - lint baseline regenerated - ide formatter/lint and ktlint aligned 2019-07-25 12:45:19 +01:00
Sean Mac Gillicuddy
4131e30e26 #1307 ktlint formatting applied 2019-07-25 12:45:19 +01:00
Sean Mac Gillicuddy
a596e34ace #1370 install git hooks on prebuild - update editorconfig from project codestyle settings 2019-07-25 12:45:18 +01:00
Sean Mac Gillicuddy
97d6932062 Squashed commit:
[e6b4786c] Revert "#1307 add ktlint"

This reverts commit 8101df0481c1979421da868a1a58646375929458.

[8101df04] #1307 add ktlint

[2035e717] Revert "#1307 test commit"

This reverts commit 4558f7a3ff93470b30f06dfc8d7a553994ca826d. (+1 squashed commits)

Squashed commits:

[4558f7a3] #1307 test commit
2019-07-25 12:45:18 +01:00
Sean Mac Gillicuddy
648597521c #1307 Add inspections and codestyles to vcs 2019-07-24 12:41:33 +01:00
Seán Mac Gillicuddy
249c00ec03
Merge pull request #1305 from kiwix/hotfix/1302
Hotfix: Add "no zim open" check for Add Note Dialog in case of fresh install
2019-07-24 09:51:45 +01:00
Sean Mac Gillicuddy
36767eeab7 #101 revert using offer method on processors 2019-07-23 16:49:00 +01:00
Sean Mac Gillicuddy
f5401200a7 #101 Add R8 configuration 2019-07-23 16:47:07 +01:00
Sean Mac Gillicuddy
5af99c10d6 #1292 run automated inspection fixes 2019-07-23 14:08:56 +01:00
Seán Mac Gillicuddy
f6b31dba56
Merge pull request #1298 from kiwix/feature/macgills/#1297-real-version-code
#1297 Read VersionCode from Manifest
2019-07-23 10:05:32 +01:00
Aditya-Sood
74b8016261 Restyle: Reformat code style 2019-07-22 19:13:44 +05:30
Aditya-Sood
74f837a395 Refactor: Fix lint errors 2019-07-22 18:54:13 +05:30
Aditya-Sood
76d20d1271 Bug fix: Add Note Dialog
Prevent 'Add Note Dialog' from opening if no zim file is currently open
2019-07-22 17:18:20 +05:30
Seán Mac Gillicuddy
6aa5ac210f
Merge pull request #1115 from ShridharGoel/swipe-down
Swipe down on toolbar to open tabs switcher
2019-07-19 11:45:23 +01:00
Seán Mac Gillicuddy
9c1d36657a
Merge pull request #1299 from kiwix/readme-links-fix
Fix README links
2019-07-19 11:09:26 +01:00
Kelson
9d2a3fdaa7 Fix README links 2019-07-19 12:03:05 +02:00
Sean Mac Gillicuddy
0125bc1c75 #1297 Read VersionCode from Manifest 2019-07-19 10:51:23 +01:00
Sean Mac Gillicuddy
28b7a2d756 #1295 Make FileSearch recursive 2019-07-19 09:44:21 +01:00
Sean Mac Gillicuddy
d87037acdb #1292 fix lint errors 2019-07-18 13:42:18 +01:00
Sean Mac Gillicuddy
3dfe0e9573 #1292 test sideeffect 2019-07-18 13:42:03 +01:00
Sean Mac Gillicuddy
8fdf980b74 #1292 fix selection bug in multi selection 2019-07-18 13:05:41 +01:00
Sean Mac Gillicuddy
97edd97d25 #1292 Rewrite of LanguageActivity 2019-07-18 12:51:01 +01:00
macgills
6ed73447c1
Merge pull request #1287 from kiwix/feature/macgills/update-docs
Update commitstyle and contributing
2019-07-16 14:58:20 +01:00
macgills
0ebd592d6f
Merge pull request #1284 from kiwix/feature/jhbiggs/#973-bottom-toolbar
Feature/jhbiggs/#973 bottom toolbar
2019-07-16 14:19:04 +01:00
Sean Mac Gillicuddy
1f7b615bff #973 remove extra transaltions 2019-07-16 12:19:14 +01:00
macgills
dc267d25e4
Merge pull request #1291 from jhbiggs/develop
Develop: delete unused strings per @macgills's suggestions
2019-07-16 10:26:18 +01:00
Justin Biggs
edab6bc26a
Merge pull request #3 from jhbiggs/master
other changes already added, plus my final change deleting unused strings
2019-07-15 10:55:10 -05:00
Justin Biggs
3b0e76550d delete unused strings per @macgills suggestion 2019-07-15 08:43:16 -07:00
macgills
5641a54176
Merge pull request #1281 from kiwix/feature/macgills/#1258-leakcanary-ci
#1258 upgrade leakcanary to 2.0 and fix strict mode issues
2019-07-15 11:17:18 +01:00
Sean Mac Gillicuddy
9f1149b507 Merge remote-tracking branch 'origin/develop' into feature/macgills/#1258-leakcanary-ci
# Conflicts:
#	app/build.gradle
2019-07-15 09:50:54 +01:00
macgills
38009d63d1
Merge pull request #1280 from kiwix/feature/macgills/#1279-android-storage-devices
#1279 add android storage devices, fix resource leak, visibility issu…
2019-07-15 09:46:28 +01:00
Sean Mac Gillicuddy
02bfae7067 Update commitstyle and contributing 2019-07-12 14:28:27 +01:00
Sean Mac Gillicuddy
b61f5913b5 #1258 reorder travis command 2019-07-12 14:22:09 +01:00
Kelson
f84684d2b2
Merge pull request #1286 from kiwix/feature/macgills/#1214-chmod-ssh-key
#1214 Change mode of ssh key
2019-07-12 14:09:55 +02:00
Sean Mac Gillicuddy
5607102456 #1214 Change mode of ssh key 2019-07-12 12:32:12 +01:00
Sean Mac Gillicuddy
1ee18f4eb4 #1258 inject test schedulers 2019-07-12 11:58:28 +01:00
Sean Mac Gillicuddy
3ab77f5ccd Merge branch 'develop' into feature/macgills/#1258-leakcanary-ci
# Conflicts:
#	app/build.gradle
2019-07-12 11:26:31 +01:00
Sean Mac Gillicuddy
f593ab9620 #1258 reduce severity of unknown nullness and reprioritise travis executions for linting 2019-07-12 10:21:24 +01:00
macgills
f25d26439c
Merge pull request #1285 from kiwix/feature/macgills/#1278-show-name-of-deletion
Feature/macgills/#1278 show name of deletion
2019-07-12 09:25:00 +01:00