Eric House
0d04b176d2
catch up generated strings
2015-08-17 07:13:02 -07:00
Eric House
592f01a767
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-17 07:07:59 -07:00
Eric House
6ae73ab99b
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-08-17 07:05:58 -07:00
Eric House
cbe2c6f5f3
copy over new translations from translation branch.
2015-08-17 07:04:10 -07:00
Eric House
d6d1bbe2e0
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-17 06:46:55 -07:00
Eric House
f5e645f62a
Merge branch 'android_branch' into relay_noconn
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-17 06:41:58 -07:00
Eric House
4b14176386
Merge branch 'android_branch' into android_translate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-17 06:35:41 -07:00
Eric House
55d67f7599
don't show toast after message send unless user-triggered
2015-08-17 06:34:58 -07:00
Eric House
8065e55b98
pipe board_getSelPlayer() through jni
2015-08-16 09:38:55 -07:00
Eric House
01b746860e
add accessor for current selected player
2015-08-16 09:26:48 -07:00
Eric House
f7f4825c67
deal with case where file doesn't exist
2015-08-16 09:25:00 -07:00
Eric House
81a6d42279
fix version code
2015-08-16 09:24:42 -07:00
Sylvie
29f410a2e0
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 16:11:02 +02:00
Joan Montané
fe86eb9dbf
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (688 of 688 strings)
2015-08-14 12:17:17 +02:00
Eric House
214c503440
Merge branch 'android_branch' into android_translate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2015-08-13 07:35:50 -07:00
Eric House
3898a85f18
catch version code up
2015-08-13 07:34:34 -07:00
Eric House
389a09ac1a
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-13 07:30:55 -07:00
Eric House
fd55d27a63
changes left out of previous merge commit for some reason
2015-08-13 07:24:49 -07:00
Eric House
0c39c61725
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
2015-08-13 07:24:05 -07:00
Eric House
34c70825b9
toward figuring out why relay communication stalls: log network
...
availability state changes.
2015-08-13 07:06:12 -07:00
Eric House
3a32d3a17b
return count of messages sent from comms_resendAll(), and post it as a
...
toast so user sees something happened.
2015-08-13 07:05:06 -07:00
Eric House
dea75a815e
vary common-code logging tag by variant
2015-08-13 07:02:57 -07:00
Eric House
7824df67f5
copy over VARIANT compile-time flag stuff. Not sure how it got dropped
...
in this branch.
2015-08-13 06:54:07 -07:00
Eric House
19eb677f7c
copy over from android_translate branch
2015-08-12 21:36:33 -07:00
Eric House
bae6b3f119
copy over from android_translate branch
2015-08-12 21:34:46 -07:00
Eric House
47954f82d0
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-12 07:43:20 -07:00
Eric House
b2970069c1
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-08-12 07:38:18 -07:00
Eric House
8f7267b3ec
add index of sending player to chat transmission, and on receiving
...
side translate that into showing the sender's name in
notification. Not yet done: replacing silly "not me" in chat listing
with same, but now it should be easy.
2015-08-12 07:36:36 -07:00
Eric House
4e1a382f1e
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/XWApp.java
2015-08-11 07:42:05 -07:00
Eric House
49e2503146
Merge branch 'android_branch' into android_translate
2015-08-11 07:31:06 -07:00
Eric House
be9b8977e5
turn off email invite attachments
2015-08-11 07:30:34 -07:00
Eric House
ef853d2784
cleanup; include generated file
2015-08-11 07:11:03 -07:00
Eric House
b7cb902775
Merge remote-tracking branch 'weblate/android_translate' into android_translate
2015-08-11 07:01:03 -07:00
Eric House
5d2a5b7649
Merge branch 'android_branch' into android_translate
2015-08-11 06:57:27 -07:00
Eric House
4a28da1348
Show specific notification on receipt of chat, not rehash of last move
...
played.
Conflicts:
xwords4/android/XWords4/archive/R.java
xwords4/android/XWords4/src/org/eehouse/android/xw4/RelayService.java
2015-08-11 06:50:16 -07:00
Eric House
5853b0c5c6
Show specific notification on receipt of chat, not rehash of last move
...
played.
2015-08-11 06:47:10 -07:00
Sylvie
28bb7f84be
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (687 of 687 strings)
2015-08-11 12:48:40 +02:00
Eric House
265ac48b88
Merge branch 'android_branch' into relay_noconn
...
Conflicts:
xwords4/android/XWords4-dbg/AndroidManifest.xml
xwords4/android/XWords4-dbg/res/layout/.gitignore
xwords4/android/XWords4-dbg/src/org/eehouse/android/xw4dbg/.gitignore
2015-08-10 07:37:03 -07:00
Eric House
4d4c3d99b7
Merge branch 'android_branch' into android_translate
2015-08-10 07:08:03 -07:00
Eric House
00e6a80fb0
fix permission and other constants that need to be different in variant
2015-08-10 07:07:33 -07:00
Eric House
3eb1dbe9c6
Merge remote-tracking branch 'weblate/android_translate' into android_translate
2015-08-10 06:58:11 -07:00
Eric House
a320c81009
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-ca/strings.xml
xwords4/android/scripts/fix-loc-xmls.py
2015-08-10 06:56:31 -07:00
Eric House
1d14d4cc65
ignore new files
2015-08-10 06:52:31 -07:00
Eric House
c3aeefe706
bring over changes for permissions etc
2015-08-10 06:52:19 -07:00
Eric House
2ef407320e
pick package based on location
2015-08-10 06:43:19 -07:00
Eric House
517cfe6fda
bring over saved file format change from relay_conn branch so builds
...
from each will be able to open each other's files.
2015-08-10 06:24:40 -07:00
Eric House
87e3108296
cleanup: make work based on location if target not specified
2015-08-10 06:23:24 -07:00
Sylvie
bdf44dfdb2
Translated using Weblate (Dutch)
...
Currently translated at 100.0% (683 of 683 strings)
2015-08-10 11:40:09 +02:00
Eric House
5bae2dbbd9
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
Conflicts:
xwords4/android/XWords4/res/values/strings.xml
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
2015-08-07 08:00:12 -07:00
Eric House
c99decaf32
experimental option that puts invite url text into clipboard so user
...
can invite using app of her choice.
2015-08-07 07:55:26 -07:00
