2733 Commits

Author SHA1 Message Date
Sean Mac Gillicuddy
5d5d01174a Merge remote-tracking branch 'origin/develop' into release/3.4.1 2020-10-09 09:41:10 +01:00
translatewiki.net
2b2a889cd2 Localisation updates from https://translatewiki.net. 2020-10-08 15:55:30 +02:00
Sean Mac Gillicuddy
f5786929c3 bump version 2020-10-08 10:39:59 +01:00
Sean Mac Gillicuddy
4da05de2da Merge branch 'release/3.4.0' into release/3.4.1 2020-10-08 10:39:19 +01:00
Seán Mac Gillicuddy
bebdca40d9
Merge pull request #2409 from gouri-panda/Feature/gouri-panda/2324_convert_HotspotNotificationManager_java_to_kotlin
Feature/gouri-panda/2324 converted HotspotNotificationManager  java to kotlin
2020-10-08 10:27:19 +01:00
Seán Mac Gillicuddy
53ab3ed0e1
Merge pull request #2392 from gouri-panda/Feature/gouri-panda/2363_bug_in_file_transfer
Feature/gouri-panda/2363_fix_file_transfer
2020-10-08 09:38:43 +01:00
gouri-panda
dbd4ff160b #2363 added progress bar in file transfer 2020-10-07 15:58:10 +05:30
Seán Mac Gillicuddy
f0d57bc37e
Merge pull request #2420 from kiwix/translatewiki
Localisation updates from https://translatewiki.net.
2020-10-07 09:19:16 +01:00
Sean Mac Gillicuddy
a644d39688 #2223 Added "How to update zim files?" to Kiwix, Wikipedia offline app - add new section for non custom only 2020-10-06 12:38:09 +01:00
translatewiki.net
76bd7c3c49 Localisation updates from https://translatewiki.net. 2020-10-05 15:59:02 +02:00
gouri-panda
c67689f360 #2324 removed target intent 2020-10-05 14:04:35 +05:30
gouri-panda
3d2d66eac0 #2363 bug fixed and ability to share files over wifi 2020-10-02 21:21:23 +05:30
translatewiki.net
1cb70479a7 Localisation updates from https://translatewiki.net. 2020-10-02 09:08:09 +02:00
gouri-panda
607565d019 #2324 removed comment 2020-09-30 15:20:44 +05:30
gouri-panda
e125796c65 #2324 converted HotspotNotificationManagerToKotlin 2020-09-30 15:19:04 +05:30
Seán Mac Gillicuddy
0413f6f684
Merge pull request #2394 from kiwix/feature/one-activity
Feature/one activity
2020-09-30 09:34:53 +01:00
translatewiki.net
39625acf9a Localisation updates from https://translatewiki.net. 2020-09-28 17:17:46 +02:00
HissPirat
ff30c14e2e Merge branch 'feature/one-activity' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2341-fix-one-activity-memory-leaks 2020-09-27 16:31:22 +02:00
HissPirat
70bd33ca0d #2235 merge with develop 2020-09-27 16:29:56 +02:00
HissPirat
6a58b566c7 #2235 fixed settings tests and removed PACKES_IMPORT_LAYOUT from project.xml 2020-09-27 16:24:04 +02:00
Seán Mac Gillicuddy
ca19c49165
Merge pull request #2397 from kiwix/translatewiki
Localisation updates from https://translatewiki.net.
2020-09-25 10:40:28 +01:00
Seán Mac Gillicuddy
5f2c0553f4
Merge pull request #2396 from kiwix/feature/macgills/2375-custom-back-navigation
#2375 Fix Back Navigation in custom apps
2020-09-25 08:46:53 +01:00
translatewiki.net
e5a003e295 Localisation updates from https://translatewiki.net. 2020-09-24 15:57:15 +02:00
Sean Mac Gillicuddy
fb475d5078 #2375 Fix Back Navigation in custom apps - move common functionality down - use same NavHostFragment - align packages in core 2020-09-24 12:21:36 +01:00
Sean Mac Gillicuddy
3f19ea3364 #2300 Missing wrap in library - remove bottom 2 lines - divide spaces with chains 2020-09-24 10:48:33 +01:00
gouri-panda
cba0f7e154 #2363 added handsake again on connection refused 2020-09-23 16:46:32 +05:30
gouri-panda
2caaec9c1b #2363 prevented from crash 2020-09-23 03:22:32 +05:30
HissPirat
7e0931f743 different local file transfer title depending on mode 2020-09-22 13:13:23 +02:00
HissPirat
46de76560f #2280 file sharing is now directly started in localFileTransfer fragment 2020-09-22 10:11:53 +02:00
gouri-panda
3ad374090f #2333 bug fixed 2020-09-20 21:33:49 +05:30
HissPirat
e284c245a7 #2280 minor cleanup of setup function 2020-09-19 10:56:26 +02:00
HissPirat
44b67ea436 Merge branch 'develop' of https://github.com/kiwix/kiwix-android into feature/Frans-Lukas/2280-localfiletransfer-to-fragment 2020-09-19 10:55:31 +02:00
HissPirat
9574d24738 #2280 restored difference between receiver and sender mode in local file transfer fragment 2020-09-19 10:53:48 +02:00
HissPirat
ab063df42f #2280 merge with one-activity 2020-09-18 11:15:53 +02:00
HissPirat
fa328121d5 #2280 moved callbacks resetting to onDestroyView of fragment and removed test ignore 2020-09-16 10:46:51 +02:00
HissPirat
1c27071e18 #2280 seeing if ignoring intro fragment test results in inst. test fix. 2020-09-15 16:08:41 +02:00
HissPirat
a1603be211 #2280 requested fixes 2020-09-14 16:16:11 +02:00
HissPirat
ee5e686b3d #2319 requested fixes 2020-09-14 15:53:20 +02:00
s-ayush2903
664cc62120
Close #2200 Fixed OnlineLibrary issue, now it works well and fine. Mentions #2201 2020-09-14 16:04:37 +05:30
HissPirat
b5717d18e8 #2280 argument passing to local file transfer fragment now works 2020-09-13 15:20:07 +02:00
HissPirat
b311788566 #2280 merge with one-activity 2020-09-13 14:23:47 +02:00
HissPirat
07392daf78 #2319 maybe sleeping will fix inst. tests as they are working locally but not on github 2020-09-13 13:49:58 +02:00
HissPirat
3eb7bc53d3 #2319 fixed PR comments and renamed activity_search.xml 2020-09-13 13:40:00 +02:00
HissPirat
4fd92e62d7 #2319 merge with one activity 2020-09-13 13:18:52 +02:00
HissPirat
1385baf348 merge with develop 2020-09-13 13:13:32 +02:00
Sean Mac Gillicuddy
adeb6ee2ca #1664 Add a cache to avoid checking filesystem too often (might be slow) - save result to hidden file 2020-09-10 12:05:30 +01:00
Seán Mac Gillicuddy
01a6f186b1
Merge pull request #2367 from s-ayush2903/feature/s-ayush2903/#2339-Mege-LibFragment-with-OnlineLibFragment
feat: Merged lib fragment with online lib fragment
2020-09-10 10:40:14 +01:00
Seán Mac Gillicuddy
83f5f5e5ca
Merge pull request #2328 from s-ayush2903/tests/s-ayush2903/#1745-Rewrite-SettingsTest-with-Robot
tests: Revamped SettingsActivityTest and used Robot
2020-09-09 11:47:52 +01:00
s-ayush2903
5f6553853d
Resolved Conflicts 2020-09-09 15:56:14 +05:30
s-ayush2903
e980e5b08d
Made init assertion more Verbose and verifiable 2020-09-09 15:38:01 +05:30