Permalink
Switch branches/tags
Nothing to show
Commits on Jan 2, 2011
  1. fixed network search

    geometer committed with vasiliy-bout Jan 2, 2011
    (cherry picked from commit b452e65a50b0bd6c1d8d38215563fa1efb9fd99e)
Commits on Dec 30, 2010
  1. InvalidStateException has been fixed(?)

    geometer committed with vasiliy-bout Dec 30, 2010
    (cherry picked from commit 8be5c6e0fd13c651ef9a5da7be4783443f9a9a1e)
Commits on Dec 29, 2010
  1. TODO changes

    vasiliy-bout committed Dec 29, 2010
  2. 0.98.7

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 057d5f50309cdcc11e072c8a20fc2c29410f793c)
    
    Conflicts:
    
    	AndroidManifest.xml
  3. KillerCallback instead of KillerService

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit ad9da693894318f52085b4ce8d713e5a22c5097c)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/FBReader.java
    	src/org/geometerplus/android/fbreader/library/KillerCallback.java
  4. compilation issue has been fixed

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit d7e937f8b1ae20d2e0a835bb2f370ff7d81393cf)
  5. 0.98.6

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 1641186349d363b3a763f64979de15d9ddf81f61)
    
    Conflicts:
    
    	AndroidManifest.xml
  6. fixed a problem with KillerService restarting

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 32e86c2c3f5c439f585591af9c2323a744c84ec3)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/library/KillerService.java
  7. Status bar is always visible on PanDigital devices (changes were not …

    vasiliy-bout committed Dec 29, 2010
    …used) ; 0.98.5
    
    (cherry picked from commit d7750b94d6ff897be390feea72ce2611e04b9c03)
    
    Conflicts:
    
    	AndroidManifest.xml
    	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
  8. Code cleanup

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 5f402557379630e3cee3de4758ad78cbeb5e491b)
  9. 0.98.4

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit a5f6dfbc2811eb31dd9c393e86ff58626ae82a9a)
    
    Conflicts:
    
    	AndroidManifest.xml
  10. new option (not in use at this momnet); updated Hungarian resources

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit d75e9264550d100bc707f26fd4af65e752c4ed02)
    
    Conflicts:
    
    	assets/resources/application/hu.xml
    	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
    	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidApplication.java
  11. additional checks in activity onCreate; cleanup

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit 666925c1200cd3bc1f7d968d8d4b9c17942cbc52)
  12. Resources sync

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit efe6fe52f197ce41f2150d055c583587db4bcbc5)
  13. 'open dictionary on finger tap' option has been added

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 87b25a737cc331deab512c4849afabe4f2b56271)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
  14. Reload button action in BookInfoActivity

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit 217ce7f34eb3423dc517a24af077d45e100b473a)
  15. added a database instance field in BaseActivity

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit c3ad6e5d84bc1b01b6ac671b6e6a39ecc2cfda3f)
  16. version is changed to 0.98.3

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 5b2b53f029479faa697bcfd0e3952ba494100e14)
    
    Conflicts:
    
    	AndroidManifest.xml
  17. Hungary translation has been updated

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit d1a7b7c1bb2a5fddf1b7bf66ae07a202e3dbfaf4)
    
    Conflicts:
    
    	assets/resources/application/hu.xml
  18. database memory/speed improvements

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit 91ac0ac41a7c47578725ba061d5c29525201b224)
  19. unused methods have been removed

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 71b770b0c687c42e6e57dbb6288a79b3c353e99b)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/library/InitializationService.java
  20. don't collect archive entries inside epub's; that should drastically …

    geometer committed with vasiliy-bout Dec 29, 2010
    …decrease memory usage :)
    
    (cherry picked from commit b3aef5c958b4d4684bc6a1eb461bd00155961a39)
  21. Merge

    vasiliy-bout committed Dec 29, 2010
  22. :library process should be killed before displaying a book

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 34f33c2d630346bd51e96be20016212de79759d0)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/FBReader.java
  23. a class that kills :library process has been implemented

    geometer committed with vasiliy-bout Dec 29, 2010
    (cherry picked from commit 5d3d4edae054b295836be84d297b355925f66518)
  24. stopping InitializationService if text view is visible again; debug info

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 919faac940a9cb44856e02bbc85f6d2edaa30f04)
    
    Conflicts:
    
    	src/org/geometerplus/android/fbreader/FBReader.java
    	src/org/geometerplus/android/fbreader/library/InitializationService.java
  25. updated Hungary resources

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit 7fb0271d068b21294639e4a69da4dd0fa5244a4c)
    
    Conflicts:
    
    	assets/resources/application/hu.xml
  26. extra System.gc call

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit d3260b78fbf39f1f89009d5e5377cfba6e2e135d)
    
    Conflicts:
    
    	AndroidManifest.xml
  27. updated TODO; selecting word by finger tap

    vasiliy-bout committed Dec 29, 2010
    (cherry picked from commit f71f9ac618ef92e510889b6be78f883c777245b5)
    
    Conflicts:
    
    	AndroidManifest.xml
    	src/org/geometerplus/fbreader/fbreader/FBView.java
    	src/org/geometerplus/zlibrary/core/xml/ZLXMLParser.java
    	src/org/geometerplus/zlibrary/text/view/ZLTextElementRegion.java
    	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
    	src/org/geometerplus/zlibrary/ui/android/view/ZLAndroidWidget.java
  28. updated Czech resources

    geometer committed with vasiliy-bout Dec 26, 2010
    (cherry picked from commit d4350e468bbf03e96bc70adbc955b859fd5f1315)
  29. updated ChangeLog; method has been moved from NetworkCatalogActions t…

    geometer committed with vasiliy-bout Dec 26, 2010
    …o PackageUtil
    
    (cherry picked from commit 4f820d5610d5fba9ffd7fcecdde79ea39c429946)
  30. VERSION is changed to 0.98 for pre-releases; 'refill account' from me…

    vasiliy-bout committed Dec 29, 2010
    …nu has been implemented
    
    (cherry picked from commit 7b8fc1297fdd89d11879b52ef552ff7511921dff)
    
    Conflicts:
    
    	AndroidManifest.xml
  31. updated i18n archives script

    geometer committed with vasiliy-bout Dec 25, 2010
    (cherry picked from commit e9167d9f255a52b814988812add475d52360f7cc)