Daniel Gultsch
5e2e71b51a
Merge pull request #846 from kruks23/translation4
...
Update spanish translation
2015-01-07 10:28:37 +01:00
kruks23
148ec5ab7d
Update affiliation in MUC details and advance mode
2015-01-07 08:50:19 +01:00
Sam Whited
20c12bcf2e
Update travis config to use current build tools
2015-01-06 21:57:28 -05:00
Sam Whited
ca0b5c65db
Add materials theme
2015-01-06 21:37:49 -05:00
Daniel Gultsch
c666035ebf
use copyonwritearraylist in for phone helper
2015-01-07 01:01:15 +01:00
Daniel Gultsch
32ad5b2c14
refactored UiHelper
2015-01-07 00:59:42 +01:00
Daniel Gultsch
499bb2afbe
Merge pull request #843 from svetlemodry/development
...
Czech translation for - show affiliation instead of role in MucDetails
2015-01-06 21:34:48 +01:00
Jaroslav Lichtblau
eb6742a645
Czech translation for - show affiliation instead of role in MucDetails
2015-01-06 21:15:32 +01:00
Daniel Gultsch
64b77d16c9
fixed bug in new ping strategy
2015-01-06 19:46:52 +01:00
Daniel Gultsch
87a78c81a7
mark sent images as sent_received instead of sent
...
fixed #842
2015-01-06 18:44:34 +01:00
Daniel Gultsch
48dbc368f2
Merge pull request #841 from BenoitBouvarel/patch-2
...
Update strings.xml
2015-01-06 18:33:56 +01:00
Daniel Gultsch
37fc305f7a
run invalidateOptionsMenu on uiThread
2015-01-06 18:26:14 +01:00
Daniel Gultsch
4db7257c07
fixed potential NPEs in ShareWithActivity
2015-01-06 18:25:31 +01:00
Benoit Bouvarel
70de2c3690
Update strings.xml
...
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
Benoit Bouvarel
95cbbc6155
Update strings.xml
...
French translation updated
2015-01-05 23:42:37 +01:00
Daniel Gultsch
51079ee079
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-05 18:47:04 +01:00
Daniel Gultsch
2e88e70394
added debug info + possible platform bug work arounds to message adapter
2015-01-05 18:46:42 +01:00
Daniel Gultsch
ef77f8e4d0
reworked ping scheduling strategy. very experimental
2015-01-05 18:45:39 +01:00
Daniel Gultsch
3b4e774c7f
avoid requesting blocklist after stream resumption
2015-01-05 16:17:05 +01:00
Daniel Gultsch
fd7b46a45e
Merge pull request #840 from kriztan/patch-1
...
corrected German spellings
2015-01-05 16:09:25 +01:00
Christian Schneppe
20bb7826e6
corrected German spellings
...
and shorten some strings
2015-01-05 15:59:21 +01:00
Daniel Gultsch
c6b722b4cc
prevent QR code parser from crashing fixed #839
2015-01-05 15:08:13 +01:00
Daniel Gultsch
d46e0e7ee2
Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role
2015-01-05 15:06:39 +01:00
Daniel Gultsch
204d36b154
Merge pull request #838 from shtrom/pebble-notifications-squash
...
Send notification to Pebble on new message
2015-01-05 13:14:48 +01:00
Olivier Mehani
97a0145149
Send notification to Pebble on new message
...
This implements basic notifications to the Pebble through the app (using
an intent). This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2015-01-05 23:06:46 +11:00
Daniel Gultsch
4feddd9cf2
Merge pull request #836 from kriztan/development
...
Updated languages ...
2015-01-05 13:05:25 +01:00
Christian Schneppe
30b30ff16f
Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB
2015-01-05 12:46:13 +01:00
Daniel Gultsch
a0e7f8742d
made checks for valid image extensions case insensitive
2015-01-04 23:04:23 +01:00
Daniel Gultsch
5aa9c63611
do not run mam queries in findOrCreateConversation() when isn't available
2015-01-04 18:16:55 +01:00
Daniel Gultsch
29bdc4b108
added higher auto accept file sizes
...
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
Daniel Gultsch
6257b8ca38
Merge branch 'development' of https://github.com/siacs/Conversations into development
2015-01-04 17:23:51 +01:00
Daniel Gultsch
a84939d744
added travis build icon to README
2015-01-04 17:23:34 +01:00
Daniel Gultsch
164e2098fe
Merge pull request #833 from SamWhited/travis
...
Add travis config
2015-01-04 17:13:42 +01:00
Sam Whited
defad18065
Add travis config
2015-01-04 10:43:15 -05:00
Daniel Gultsch
b05d5f2af9
code cleanup + logging of spoofed iq packets
2015-01-04 15:40:09 +01:00
Daniel Gultsch
16a5d75f1c
Merge pull request #823 from SamWhited/issue20
...
Verify IQ responses
2015-01-04 15:05:24 +01:00
Sam Whited
28270eb822
Verify IQ responses
...
Fixes #20
Move fromServer/toServer to AbstractStanza
2015-01-04 08:28:13 -05:00
Sam Whited
319f1213cf
Make IqPacket type an enum
2015-01-04 08:20:30 -05:00
Daniel Gultsch
1987e70233
Merge pull request #832 from svetlemodry/development
...
Czech translation update
2015-01-04 12:45:48 +01:00
Jaroslav Lichtblau
dc1e0a649f
Czech translation update
2015-01-04 12:43:32 +01:00
Daniel Gultsch
341c8c6bd2
deal with prosodys muc namespace tagging of messages
2015-01-04 12:37:22 +01:00
Daniel Gultsch
d041fef748
Use packet callbacks only for IqPackets. Removed unnecessary code
2015-01-04 12:09:39 +01:00
Daniel Gultsch
92e2c78a0a
Merge pull request #829 from kriztan/patch-1
...
corrected German 'private_message_to'
2015-01-04 11:28:38 +01:00
Daniel Gultsch
a5362d12c0
Merge pull request #830 from kruks23/translation4
...
Update spanish translations
2015-01-04 11:28:31 +01:00
sergio
ec0ed68417
Update spanish translations
2015-01-04 11:24:53 +01:00
kriztan
6d89248f0e
corrected German 'private_message_to'
2015-01-04 11:16:21 +01:00
Daniel Gultsch
fbacab8774
no longer use ConcurrentHashMap in favor of synchronize on a final HashMap
2015-01-04 00:14:40 +01:00
Daniel Gultsch
4442c626f8
Merge branch 'development'
2015-01-03 22:39:50 +01:00
Daniel Gultsch
bda5937166
Merge pull request #827 from kriztan/patch-2
...
Added and modified German translations
2015-01-03 22:39:17 +01:00
kriztan
5e4b6dbacb
Added and modified German translations
2015-01-03 19:35:58 +01:00
