Skip to content

Commit

Permalink
Update SyncthingNative to v1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Catfriend1 committed Jun 5, 2019
1 parent 15ec6a9 commit 37fc9ae
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![License: MPLv2](https://img.shields.io/badge/License-MPLv2-blue.svg)](https://opensource.org/licenses/MPL-2.0)
<a href="https://github.com/Catfriend1/syncthing-android/releases" alt="GitHub release"><img src="https://img.shields.io/github/release/Catfriend1/syncthing-android/all.svg" /></a>
<a href="https://f-droid.org/de/packages/com.github.catfriend1.syncthingandroid" alt="F-Droid release"><img src="https://img.shields.io/f-droid/v/com.github.catfriend1.syncthingandroid.svg" /></a>
<a href="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid" alt="G-Play release"><img src="https://img.shields.io/badge/g--play-1.1.3.1-blue.svg" /></a>
<a href="https://play.google.com/store/apps/details?id=com.github.catfriend1.syncthingandroid" alt="G-Play release"><img src="https://img.shields.io/badge/g--play-1.1.4.1-blue.svg" /></a>
<a href="https://liberapay.com/~1534877" alt="LiberaPay"><img src="https://img.shields.io/liberapay/patrons/Syncthing-Fork.svg?style=social" /></a>
<a href="https://www.somsubhra.com/github-release-stats/?username=Catfriend1&repository=syncthing-android" alt="GitHub Stats"><img src="https://img.shields.io/github/downloads/Catfriend1/syncthing-android/total.svg" /></a>

Expand Down
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ android {
applicationId "com.github.catfriend1.syncthingandroid"
minSdkVersion 16
targetSdkVersion 28
versionCode 1010301
versionName "1.1.3.1"
versionCode 1010401
versionName "1.1.4.1"
testApplicationId 'com.github.catfriend1.syncthingandroid.test'
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
playAccountConfig = playAccountConfigs.defaultAccountConfig
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/play/en-GB/whatsnew
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
Enhancements
* Add support for SecScanQR barcode scanner
Notes
* Syncthing v1.1.3
* Syncthing v1.1.4
* Refer to GitHub for detailed change log.
2 changes: 1 addition & 1 deletion syncthing/src/github.com/syncthing/syncthing
Submodule syncthing updated 99 files
+2 −1 AUTHORS
+2 −2 cmd/strelaypoolsrv/gui/index.html
+1 −0 cmd/syncthing/main.go
+4 −4 go.mod
+13 −0 go.sum
+12 −0 gui/default/assets/css/overrides.css
+1 −0 gui/default/assets/lang/lang-bg.json
+26 −25 gui/default/assets/lang/[email protected]
+2 −1 gui/default/assets/lang/lang-cs.json
+1 −0 gui/default/assets/lang/lang-da.json
+7 −6 gui/default/assets/lang/lang-de.json
+1 −0 gui/default/assets/lang/lang-el.json
+1 −0 gui/default/assets/lang/lang-en-GB.json
+1 −0 gui/default/assets/lang/lang-en.json
+1 −0 gui/default/assets/lang/lang-eo.json
+26 −25 gui/default/assets/lang/lang-es-ES.json
+1 −0 gui/default/assets/lang/lang-es.json
+1 −0 gui/default/assets/lang/lang-fi.json
+1 −0 gui/default/assets/lang/lang-fr.json
+12 −11 gui/default/assets/lang/lang-fy.json
+1 −0 gui/default/assets/lang/lang-hu.json
+2 −1 gui/default/assets/lang/lang-it.json
+1 −0 gui/default/assets/lang/lang-ja.json
+1 −0 gui/default/assets/lang/lang-ko-KR.json
+1 −0 gui/default/assets/lang/lang-lt.json
+1 −0 gui/default/assets/lang/lang-nb.json
+4 −3 gui/default/assets/lang/lang-nl.json
+2 −1 gui/default/assets/lang/lang-pl.json
+1 −0 gui/default/assets/lang/lang-pt-BR.json
+2 −1 gui/default/assets/lang/lang-pt-PT.json
+1 −0 gui/default/assets/lang/lang-ru.json
+27 −26 gui/default/assets/lang/lang-sk.json
+3 −2 gui/default/assets/lang/lang-sv.json
+1 −0 gui/default/assets/lang/lang-uk.json
+1 −0 gui/default/assets/lang/lang-zh-CN.json
+1 −0 gui/default/assets/lang/lang-zh-TW.json
+3 −3 gui/default/index.html
+2 −2 gui/default/syncthing/app.js
+1 −1 gui/default/syncthing/core/aboutModalView.html
+0 −1 gui/default/syncthing/core/identiconDirective.js
+0 −1 gui/default/syncthing/core/localeService.js
+1 −1 gui/default/syncthing/core/logViewerModalView.html
+1 −1 gui/default/syncthing/core/majorUpgradeModalView.html
+12 −12 gui/default/syncthing/core/syncthingController.js
+1 −1 gui/default/syncthing/transfer/failedFilesModalView.html
+2 −2 gui/default/syncthing/transfer/localChangedFilesModalView.html
+20 −3 lib/api/api_test.go
+1 −1 lib/db/instance.go
+67 −1 lib/db/lowlevel.go
+10 −8 lib/db/transactions.go
+6 −0 lib/fs/basicfs_test.go
+16 −0 lib/fs/basicfs_unix.go
+5 −11 lib/fs/basicfs_watch.go
+48 −1 lib/fs/basicfs_watch_test.go
+25 −0 lib/fs/basicfs_windows.go
+8 −0 lib/fs/basicfs_windows_test.go
+64 −0 lib/fs/filesystem_test.go
+69 −3 lib/fs/util.go
+46 −0 lib/fs/util_test.go
+41 −0 lib/fs/walkfs_test.go
+25 −0 lib/ignore/ignore_test.go
+246 −0 lib/model/fakeconns_test.go
+19 −19 lib/model/folder.go
+3 −0 lib/model/folder_recvonly_test.go
+27 −12 lib/model/folder_sendrecv.go
+107 −206 lib/model/model.go
+134 −339 lib/model/model_test.go
+106 −73 lib/model/progressemitter.go
+43 −34 lib/model/progressemitter_test.go
+13 −45 lib/model/requests_test.go
+8 −6 lib/model/sharedpullerstate.go
+123 −0 lib/model/testutils_test.go
+48 −23 lib/osutil/osutil.go
+78 −1 lib/osutil/osutil_test.go
+13 −13 lib/protocol/protocol.go
+1 −1 lib/scanner/walk.go
+9 −0 lib/versioner/external.go
+22 −46 lib/versioner/simple.go
+12 −53 lib/versioner/staggered.go
+38 −54 lib/versioner/trashcan.go
+84 −0 lib/versioner/trashcan_test.go
+224 −1 lib/versioner/util.go
+4 −0 lib/versioner/versioner.go
+1 −1 man/stdiscosrv.1
+1 −1 man/strelaysrv.1
+1 −1 man/syncthing-bep.7
+1 −1 man/syncthing-config.5
+1 −1 man/syncthing-device-ids.7
+1 −1 man/syncthing-event-api.7
+1 −1 man/syncthing-faq.7
+1 −1 man/syncthing-globaldisco.7
+1 −1 man/syncthing-localdisco.7
+1 −1 man/syncthing-networking.7
+1 −1 man/syncthing-relay.7
+1 −1 man/syncthing-rest-api.7
+1 −1 man/syncthing-security.7
+1 −1 man/syncthing-stignore.5
+1 −1 man/syncthing-versioning.7
+1 −1 man/syncthing.1

0 comments on commit 37fc9ae

Please sign in to comment.