-
-
Notifications
You must be signed in to change notification settings - Fork 565
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Release - #2413 & #2531 #2574
Release - #2413 & #2531 #2574
Conversation
…ge from server" since the message from server can be a whole new sentence.
Copied saveLog(false) from onStop() also into finish(). List of caches now gets refreshed, because saveLog() runs while VisitCacheActivity is still running. saveLog(false) was also left in onStop(), because in case the activity gets interrupted and finish() is not called, the log will still be auto-saved.
c:geo » c-geo-opensource #1124 SUCCESS |
This pull request cannot be merged because it deals with two different issues. Please use separate feature branches instead. Also f80ef7f should go to master because it is no regression fix or important fix. The same for the translation update IMHO. If there are no objections to any of the commit they can be cherry picked manually. |
So is there a way to separate these, or should I fix it in master and commit it again and then make 2 pull requests? Also I cannot find a "delete" button for a pull request, so I guess only you guys can delete this after? |
In my opinion it would be OK to fix both of these issues in master only as they are not critical. |
@marstaj
(untested) |
It looks OK to me and seems to work, so I'll pick locally to master and push |
merged to master manually and pushed. Thanks for your contribution! |
I have altered the "Login failed" message for English language so that it has correct structure. You can see this when you try to log in with wrong user name or password.
Secondly I fixed cache log auto-save. List of stored caches now displays that a cas has offline log, which was made by auto-save.