1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 01:39:18 +02:00

Commit graph

  • 125b22d89d
    Merge 1a1d201d3f into e83aec9f94 Donkey 2020-09-07 20:53:45 +03:00
  • 1a1d201d3f Merge branch 'master' of https://github.com/Doonkey/FBReaderJ Donkey 2020-07-28 16:02:56 +08:00
  • 5ccdfa1c77 epub file's css style support Donkey 2020-07-28 16:02:11 +08:00
  • 268309d7aa epub file's css style support Donkey 2020-07-28 14:21:35 +08:00
  • 36efea989b
    Merge fe4dbfce83 into e83aec9f94 MORRIS1805 2019-10-31 21:23:05 +05:30
  • fe4dbfce83
    Update build.xml MORRIS1805 2019-10-31 21:22:22 +05:30
  • 1ae9a03a55
    Update ZLFile.cpp Donkey 2019-10-29 09:09:56 +08:00
  • d1ad49a2a9
    Merge 1eb1faba96 into e83aec9f94 Trottel 2019-06-06 06:07:06 +00:00
  • 1eb1faba96
    Update cs.xml Trottel 2019-06-06 08:06:55 +02:00
  • a5754356b1
    Merge 29f31978c1 into e83aec9f94 Trottel 2018-11-21 20:41:30 +00:00
  • 29f31978c1
    Update cs.xml Trottel 2018-11-21 21:41:22 +01:00
  • 8147a573f8 Merge 4127973536 into e83aec9f94 Mathias Monnerville 2017-06-11 21:02:41 +00:00
  • 988cb8572f Merge 9ccce4e8ff into e83aec9f94 Goldy (Gordon) 2017-06-11 21:02:41 +00:00
  • 4e9f375e9a Merge 1fb4b4cf1b into e83aec9f94 Zsombor 2017-06-11 21:02:41 +00:00
  • 680689b219 Merge edf413d323 into e83aec9f94 Zsombor 2017-06-11 21:02:41 +00:00
  • e83aec9f94 no https in rel identifiers :) master Nikolay Pultsin 2017-06-11 21:36:56 +01:00
  • 1c05d77110 Merge branch 'master' of github.com:geometer/FBReaderJ Nikolay Pultsin 2017-06-11 21:24:12 +01:00
  • 4c008fa5b8 unused strings Nikolay Pultsin 2017-06-11 21:23:56 +01:00
  • e14c912873 Merge pull request #448 from horus68/master Nikolay Pultsin 2017-06-11 21:23:17 +01:00
  • 85c6d82ba8 Merge pull request #452 from MilanKral/HTTPS Nikolay Pultsin 2017-06-11 21:22:38 +01:00
  • 11e55fa983 Merge pull request #451 from BeckyDTP/patch-1 Nikolay Pultsin 2017-06-11 21:16:09 +01:00
  • 1f3d43dbf2
    HTTPS urls Milan Kral 2017-06-07 13:29:35 +02:00
  • af753009c9 Compliance with the new translation (PL) Becky 2017-06-07 13:01:32 +02:00
  • 8c54f2be04 typo Horus68 2017-05-15 13:08:07 +01:00
  • 085844aa72 Portugguese help horus68 2017-05-15 11:26:59 +01:00
  • 05ddd4a1de Portuguese help horus68 2017-05-15 11:26:13 +01:00
  • 7293de2b13 Merge 0acb6ac433 into 466816bc47 Horus68 2017-05-15 10:14:44 +00:00
  • 720a691d51 Portuguese revisions horus68 2017-05-15 11:14:05 +01:00
  • 0acb6ac433 Merge remote-tracking branch 'refs/remotes/geometer/master' horus68 2017-05-15 10:56:06 +01:00
  • d6a081a853 Merge remote-tracking branch 'refs/remotes/geometer/master' horus68 2017-05-15 10:40:53 +01:00
  • 3189d905e3 Merge 900a523cf7 into 466816bc47 Man Parvesh Singh Randhawa 2017-05-08 06:17:09 +00:00
  • ce7d3f37ee Merge c1d57862d0 into 466816bc47 AlexFrost 2017-01-19 12:02:13 +00:00
  • 2ca9321717 Merge 445e449617 into 466816bc47 colinstonema 2016-12-07 05:38:10 +00:00
  • 56da02e1bb Merge 001634d905 into 466816bc47 Max Lyashuk 2016-12-07 05:38:10 +00:00
  • 7509ea9245 Merge 20e0c9109b into 466816bc47 Zsombor 2016-12-07 03:44:14 +00:00
  • 466816bc47 Merge branch 'master' of github.com:geometer/FBReaderJ Nikolay Pultsin 2016-12-02 06:11:23 +00:00
  • ff1d57bfca Merge pull request #432 from naofum/japanese-translation Nikolay Pultsin 2016-12-02 06:10:40 +00:00
  • b25fb8e2ec Updated Japanese translation naofum 2016-11-26 23:15:50 +09:00
  • 4f034dfcb5 updated Romanian resources Nikolay Pultsin 2016-10-23 10:24:21 +01:00
  • b58bc28470 formatting Nikolay Pultsin 2016-10-16 03:30:03 +01:00
  • ade6b0d30b Merge pull request #429 from aplicatii-romanesti/patch-6 Nikolay Pultsin 2016-10-16 03:25:31 +01:00
  • 5794f60dea Merge pull request #428 from aplicatii-romanesti/patch-5 Nikolay Pultsin 2016-10-16 03:25:11 +01:00
  • 4cfdb972fe diacritics and additional fixes www.bibliotecaortodoxa.ro 2016-10-14 14:13:23 +03:00
  • 72f35af415 now with diacritics www.bibliotecaortodoxa.ro 2016-10-14 12:35:24 +03:00
  • b3f64a6223 Merge pull request #425 from horus68/master Nikolay Pultsin 2016-09-26 04:44:49 +01:00
  • ea76058e9a Portuguese Portugal and Brazil horus68 2016-09-26 04:10:50 +01:00
  • 98d4feb259 Merge pull request #421 from Trottel/patch-34 Nikolay Pultsin 2016-09-25 11:52:21 +01:00
  • 436cd26c10 Merge pull request #400 from MaDill/master Nikolay Pultsin 2016-09-25 11:51:45 +01:00
  • 47de11ab2d Update cs.xml Trottel 2016-09-06 11:16:41 +02:00
  • 20e0c9109b Add new menu item: recently downloaded books Zsombor Gegesy 2016-05-28 20:22:11 +02:00
  • edf413d323 Fix to include the same android-support library as the main module Zsombor Gegesy 2016-05-04 08:18:49 +02:00
  • 67b4100159 Fix the NaturalOrderComparator problems Zsombor Gegesy 2016-05-04 07:36:25 +02:00
  • 1fb4b4cf1b Add new menu item: recently downloaded books Zsombor Gegesy 2016-05-28 20:22:11 +02:00
  • d104a19bd8 Set target to android-19 in all the submodules Zsombor Gegesy 2016-05-04 07:35:48 +02:00
  • 36b6dc13b9 Trying to fix the build Zsombor Gegesy 2016-05-04 07:19:35 +02:00
  • 6cd82f570d Update German translation MDL 2016-04-01 08:40:54 +02:00
  • f3b8e741d2 Merge branch 'geometer-master' 徐雪君 2016-02-08 20:19:54 +08:00
  • bc61d1438c Merge branch 'master' of https://github.com/geometer/FBReaderJ into geometer-master 徐雪君 2016-02-08 20:19:29 +08:00
  • 7ddccffc12 attempt to update converter script Steven Huang 2016-02-05 05:08:53 -08:00
  • 94ceca550b add docs Steven Huang 2016-02-05 04:11:24 -08:00
  • af98ab7853 Merge branch 'yota2' into microtypography microtypography Nikolay Pultsin 2016-02-02 20:39:21 +00:00
  • a2afd2f38d Merge branch 'ice-cream-sandwich' into kindle kindle Nikolay Pultsin 2016-02-02 20:39:20 +00:00
  • a5af5ed7a3 Merge branch 'master' into nook nook Nikolay Pultsin 2016-02-02 20:39:20 +00:00
  • 4949a02a68 Merge branch 'ice-cream-sandwich' into yota2 yota2 Nikolay Pultsin 2016-02-02 20:39:20 +00:00
  • 833bdb40f2 Merge branch 'master' into ice-cream-sandwich ice-cream-sandwich Nikolay Pultsin 2016-02-02 20:39:19 +00:00
  • b0782b20d4 formatting Nikolay Pultsin 2016-02-02 20:39:12 +00:00
  • effb9f50bf Merge branch 'yota2' into microtypography Nikolay Pultsin 2016-01-31 22:02:48 +00:00
  • 3d6bb8b915 Merge branch 'master' into nook Nikolay Pultsin 2016-01-31 22:02:48 +00:00
  • d16cc85083 Merge branch 'ice-cream-sandwich' into kindle Nikolay Pultsin 2016-01-31 22:02:47 +00:00
  • 49612dcfa0 Merge branch 'ice-cream-sandwich' into yota2 Nikolay Pultsin 2016-01-31 22:02:47 +00:00
  • 7341c74552 Merge branch 'master' into ice-cream-sandwich Nikolay Pultsin 2016-01-31 22:02:47 +00:00
  • 6886d2f41a Merge pull request #383 from fotock/master Nikolay Pultsin 2016-01-31 21:58:39 +00:00
  • e3f4f6e2ee Update zh.xml Shelley Shyan 2016-01-31 13:01:54 +08:00
  • 79ef727db1 Update zh.xml Shelley Shyan 2016-01-31 12:57:21 +08:00
  • 759287e73e Update zh.xml Shelley Shyan 2016-01-31 00:45:49 +08:00
  • 8804eedbd5 Update zh.xml Shelley Shyan 2016-01-31 00:02:34 +08:00
  • 9f5ac181c2 Merge branch 'yota2' into microtypography Nikolay Pultsin 2016-01-29 22:30:28 +00:00
  • bd4f51a60e Merge branch 'master' into nook Nikolay Pultsin 2016-01-29 22:30:27 +00:00
  • 2e29a57284 Merge branch 'ice-cream-sandwich' into kindle Nikolay Pultsin 2016-01-29 22:30:27 +00:00
  • 06a77b3121 Merge branch 'ice-cream-sandwich' into yota2 Nikolay Pultsin 2016-01-29 22:30:26 +00:00
  • 1e0a4ca724 Merge branch 'master' into ice-cream-sandwich Nikolay Pultsin 2016-01-29 22:30:26 +00:00
  • f87eb33153 typo in Italian Nikolay Pultsin 2016-01-29 22:30:16 +00:00
  • 611ee0fa6b Merge branch 'yota2' into microtypography Nikolay Pultsin 2016-01-24 14:16:19 +00:00
  • f748172a74 Merge branch 'master' into nook Nikolay Pultsin 2016-01-24 14:16:19 +00:00
  • f1cc1a1948 Merge branch 'ice-cream-sandwich' into kindle Nikolay Pultsin 2016-01-24 14:16:18 +00:00
  • 1196fc46a7 Merge branch 'ice-cream-sandwich' into yota2 Nikolay Pultsin 2016-01-24 14:16:18 +00:00
  • a9ffd675e7 Merge branch 'master' into ice-cream-sandwich Nikolay Pultsin 2016-01-24 14:16:18 +00:00
  • ab632aa8b5 understand both • and • in (x)htmls; use • in own htmls Nikolay Pultsin 2016-01-24 14:15:40 +00:00
  • 6c2fe0f28d Merge branch 'geometer-master' 徐雪君 2016-01-20 11:46:08 +08:00
  • 7ec8bec9f0 Merge branch 'master' of https://github.com/geometer/FBReaderJ into geometer-master 徐雪君 2016-01-20 11:45:41 +08:00
  • f595692c8c Merge branch 'yota2' into microtypography Nikolay Pultsin 2016-01-13 03:28:07 +00:00
  • feee99edf4 Merge branch 'master' into nook Nikolay Pultsin 2016-01-13 03:28:06 +00:00
  • ca76944445 Merge branch 'ice-cream-sandwich' into kindle Nikolay Pultsin 2016-01-13 03:28:06 +00:00
  • e80fcad6a0 Merge branch 'ice-cream-sandwich' into yota2 Nikolay Pultsin 2016-01-13 03:28:06 +00:00
  • ae01b56931 Merge branch 'master' into ice-cream-sandwich Nikolay Pultsin 2016-01-13 03:28:05 +00:00
  • 38d6bb170f fixed xml Nikolay Pultsin 2016-01-13 03:27:54 +00:00
  • 9e71861cc1 Merge branch 'yota2' into microtypography Nikolay Pultsin 2016-01-13 03:22:53 +00:00
  • 1c461b2482 Merge branch 'master' into nook Nikolay Pultsin 2016-01-13 03:22:52 +00:00
  • 4cc3895359 Merge branch 'ice-cream-sandwich' into kindle Nikolay Pultsin 2016-01-13 03:22:52 +00:00
  • 44124ce94d Merge branch 'ice-cream-sandwich' into yota2 Nikolay Pultsin 2016-01-13 03:22:51 +00:00