Eric House
9b785e230c
Merge branch 'android_branch' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-ca/strings.xml
2015-07-29 05:49:11 -07:00
Eric House
cb7b8660dc
bring in Catalan changes from android_translate branch, and fix a
...
couple of typos
2015-07-29 05:47:08 -07:00
Eric House
d94f7bbf49
Merge remote-tracking branch 'weblate/android_translate' into android_translate
...
Conflicts:
xwords4/android/XWords4/res_src/values-nl/strings.xml
2015-07-29 05:28:07 -07:00
Eric House
a2705ca821
uninstall dbg variant too
2015-07-28 21:01:46 -07:00
Eric House
5bf674ca76
Merge branch 'android_branch' into android_translate
2015-07-28 20:35:30 -07:00
Joan Montané
0e797e2679
Translated using Weblate (Catalan)
...
Currently translated at 100.0% (682 of 682 strings)
2015-07-28 20:53:21 +02:00
Eric House
2ec2972b9b
invalidate menubar when minimizing group. (Thanks Aidan.)
2015-07-28 06:26:25 -07:00
Eric House
aa78ec2701
echo name of new .apk for easier scping
2015-07-27 07:29:09 -07:00
Eric House
82f1406df7
incorporate git rev number in name of debug .apk
2015-07-27 07:28:58 -07:00
Eric House
7cc58de6e5
Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
...
Conflicts:
xwords4/android/scripts/info.py
2015-07-27 07:14:54 -07:00
Eric House
e31c7ae4f5
update to not notify of debug build updates when version matches what's installed
2015-07-27 07:12:44 -07:00
Joan Montané
0cb49e7379
Translated using Weblate (Catalan)
...
Currently translated at 90.9% (620 of 682 strings)
2015-07-27 01:04:01 +02:00
Eric House
75cd6c6693
fix logic behind "unable to find move" alert
2015-07-26 13:17:59 -07:00
Eric House
3c58267d4e
goes with cherrypick
2015-07-26 12:09:51 -07:00
Eric House
0bb51e8b93
show a toast when hint can't find anything, on the principle that user
...
should see some response to every action.
Conflicts:
xwords4/android/XWords4/archive/R.java
2015-07-26 12:09:15 -07:00
Eric House
2e6154e920
Merge branch 'android_branch' of ssh://git.code.sf.net/p/xwords/git into android_branch
...
Conflicts:
xwords4/android/scripts/info.py
2015-07-25 22:03:05 -07:00
Eric House
fe91c9e04e
update to serve newest debug as well as release builds, and to know about variants
2015-07-25 21:56:48 -07:00
Eric House
a40ee96439
first set of Dutch strings
2015-07-23 19:37:31 -07:00
Weblate
c58fdd0273
Merge remote-tracking branch 'origin/android_translate' into android_translate
2015-07-23 18:45:26 +02:00
Sylvie
235d4d232c
Translated using Weblate (Dutch)
...
Currently translated at 19.3% (132 of 682 strings)
2015-07-23 18:45:25 +02:00
Eric House
fa00eef151
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
2015-07-23 06:57:37 -07:00
Eric House
a48468eca1
convert string to plurals and add some "one" items to others to allow
...
removing [s]. There's more to do still.
2015-07-23 06:56:12 -07:00
Eric House
2a009e620b
empty file for Dutch strings
2015-07-22 20:59:13 -07:00
Eric House
f626d6ca4c
remove redundant constant
2015-07-21 06:55:15 -07:00
Eric House
c796e7d4cc
clear the net status rect for standalone games' boards to avoid ghost
...
button effect when they're opened after a networked game.
2015-07-17 06:10:08 -07:00
Eric House
6851fd9746
include teaser from server, and launch an alert in-game instead of
...
having the notification display everything. I've committed this
before; not sure where it went.
2015-07-11 08:25:10 -07:00
Eric House
5e63d03e76
apparently I forgot to check this in
2015-07-11 08:23:22 -07:00
Eric House
384721d68d
Merge branch 'android_branch' of ssh://maidu2/home/eehouse/src/git/repos/xwords into android_branch
...
# 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-07-11 08:09:47 -07:00
Eric House
67f4e4475c
manual bring-over of relay changes for invite support
2015-07-11 08:08:22 -07:00
Eric House
ec393bc0c8
don't crash if intent is null
2015-07-11 07:53:22 -07:00
Relay User
9c7213e42b
Make it possible to launch relay early in machine boot cycle before
...
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
8f863f0369
Make it possible to launch relay early in machine boot cycle before
...
postgres is running (e.g. from a @reboot shortcut in a crontab) by
having it wait, sleeping periodically, until a connection is
available. Requires new flag be passed into main.
2015-07-11 07:04:24 -07:00
Relay User
d605686fd6
add teaser to gcm message (matches android client change)
2015-07-11 07:04:24 -07:00
Eric House
dba86a657f
add and handle new INVITE message types. (This can safely be added to shipping relay.)
2015-07-10 23:25:06 -07:00
Eric House
29d8a67c36
Makefile for new wordlist
2015-07-08 20:41:13 -07:00
Eric House
fe25060255
fix assertion failure, probably due to some freak accident of missaved
...
timestamp. Whatever.
2015-07-01 05:52:02 -07:00
Eric House
d479486521
change defaults so a with-games-ui/udp game interface comes up by
...
default.
2015-06-26 07:35:24 -07:00
Eric House
d426db7a49
move httppost stuff into NetUtils
2015-06-26 06:37:34 -07:00
Eric House
8a575bc789
fill in help text for communication means
2015-06-26 06:18:42 -07:00
Eric House
e60a16be1e
add onPrepareDialog, without which we crash turning on SMS from
...
prefs. Note: I've committed this before and somehow lost it, so there
may be some git anomolies here.
2015-06-26 06:13:11 -07:00
Eric House
d096b8e8a2
cleanup -- no code change
2015-06-26 06:10:47 -07:00
Eric House
63aae3d4e8
add newbie hints to checkboxes enabling communication types (bt, sms,
...
etc.)
2015-06-25 06:38:40 -07:00
Eric House
4f53ccd5db
cleanup; log dropped messages on DEBUG builds
2015-06-24 07:48:25 -07:00
Eric House
fd765c6cb0
turn invite-by-sms on
2015-06-24 07:46:48 -07:00
Eric House
b8193d635d
SMS-enable alert: Add cancel button, and disable OK button until user
...
selects an enabling option
2015-06-23 08:11:18 -07:00
Eric House
54b18c898d
more, and hopefully last, French strings
2015-06-19 20:52:40 -07:00
Eric House
8354f45548
deal with case where invitation includes only conntypes not supported
...
on device, e.g. sms-only sent to a tablet. Strip the unsupported types
when creating the game, and then on game open suggest to user he
delete (with explanation)
2015-06-19 07:51:51 -07:00
Eric House
d27fdbd748
It's now possible for a game to have no address modes, so don't assert
...
otherwise.
2015-06-19 07:45:47 -07:00
Eric House
d89c0d2847
on receipt of invitation, remove address modes the device doesn't
...
support.
2015-06-18 08:48:03 -07:00
Eric House
f93f0cd926
Yet another attempt to deal with bad connectivity: when can't connect
...
to relay but other address modes are present, offer to remove the
relay from the game, and if that choice is taken confirm with an
explanation of the limits of what remains.
2015-06-18 08:14:33 -07:00
