a1a2a39108
Update affiliation in MUC details and advance mode
2015-01-07 08:50:19 +01:00
45bb59dba8
Add materials theme
2015-01-06 21:37:49 -05:00
066f60a23c
Czech translation for - show affiliation instead of role in MucDetails
2015-01-06 21:15:32 +01:00
352af145f8
Update strings.xml
...
char ">" was missing at line 285
2015-01-06 01:23:51 +01:00
f8758b7bd5
Update strings.xml
...
French translation updated
2015-01-05 23:42:37 +01:00
47a8a39595
corrected German spellings
...
and shorten some strings
2015-01-05 15:59:21 +01:00
bdb335e6b0
Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role
2015-01-05 15:06:39 +01:00
ddee804a01
Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB
2015-01-05 12:46:13 +01:00
e6cd92a663
added higher auto accept file sizes
...
also changed labeling to MiB and KiB
2015-01-04 17:53:06 +01:00
3a4fbcd4cc
Czech translation update
2015-01-04 12:43:32 +01:00
51f5b84ee4
Merge pull request #829 from kriztan/patch-1
...
corrected German 'private_message_to'
2015-01-04 11:28:38 +01:00
c674e9c3e9
Update spanish translations
2015-01-04 11:24:53 +01:00
b739a0d200
corrected German 'private_message_to'
2015-01-04 11:16:21 +01:00
58b7e71e58
Added and modified German translations
2015-01-03 19:35:58 +01:00
be7de054be
record voice and attachment refactor
2015-01-03 16:06:59 +01:00
960b7343d3
disable / enable all accounts
2015-01-03 13:36:48 +01:00
715c8545f4
added missing layout file
2015-01-03 10:35:12 +01:00
969044b113
migrated change password into separate activity
2015-01-03 00:11:02 +01:00
1988e244ef
some further otr improvements
2015-01-02 15:14:06 +01:00
eca826caf3
Added German translations
2015-01-02 09:12:17 +01:00
bb3bf25523
fixed layout file
2015-01-02 01:37:19 +01:00
3833e6dfef
improved OTR verification part one
2015-01-02 01:21:14 +01:00
0882da2568
Make `app_name' string untranslatable
...
Remove untranslatable about message
Escape single quote in NL translation
2014-12-29 19:38:47 -05:00
c78dc5b494
fixed nl strings
2014-12-30 01:15:12 +01:00
5df8e6a5b3
Merge pull request #812 from kriztan/patch-1
...
Update german translations
2014-12-30 00:22:49 +01:00
55b84d0895
Merge pull request #813 from plsng/translation
...
Update Dutch translations
2014-12-30 00:22:33 +01:00
800520b27b
Update Dutch translations
2014-12-29 23:08:07 +01:00
164c41661e
Update spanish translations
2014-12-27 13:04:37 +01:00
4a8342a378
Update Dutch translations
2014-12-27 12:53:15 +01:00
3b3d51b39a
Update german translations
2014-12-27 10:42:15 +01:00
193d2645e6
code cleanup for change password stuff
2014-12-25 22:28:19 +01:00
0c22a8d1c6
added callback to change account password to notify UI on success / failure
2014-12-25 22:08:13 +01:00
e4d9dca2fe
Add ability to change password on server
...
Fixes #260
2014-12-25 21:38:55 +01:00
3b127ab743
Update german translations
2014-12-25 09:14:34 +01:00
01107e31ae
Add more server compatibility info.
...
Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info'
2014-12-23 12:44:30 -05:00
af7a64491f
Add support for XEP-0191 (Blocking command)
...
Fixes #791
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
2014-12-22 08:19:00 -05:00
675bac7255
Merge pull request #794 from svetlemodry/development
...
Czech image transfer string fix
2014-12-20 12:14:11 +01:00
6dd75cbb07
Update spanish translations
2014-12-20 10:54:23 +01:00
c8cfd1b084
Czech image transfer string fix
2014-12-19 22:50:43 +01:00
7c4a306ae4
Czech translation updated
...
added missing strings
2014-12-18 18:42:50 +01:00
948112c2f3
Update german translations
2014-12-18 12:10:03 +01:00
741a0c129d
made scroling smoother + bug fixes for history loading
2014-12-17 10:50:51 +01:00
80435eca5c
smoothed out scrolling a bit
2014-12-17 09:32:51 +01:00
25d8546ae8
Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours
2014-12-15 17:16:49 +01:00
a6cfbf2f2d
Merge pull request #775 from kruks23/translation1
...
Update spanish translations.
2014-12-15 16:57:56 +01:00
9f6537acdc
fixed typo in italian translation
...
s/gallaria/galleria/
2014-12-15 14:19:18 +01:00
a6d4b0aec5
Add quiet hours feature
2014-12-14 15:07:41 -05:00
1ffdae80a6
Update spanish translations.
2014-12-13 13:24:17 +01:00
920067b8ed
Update spanish translations.
2014-12-09 18:33:13 +01:00
b5b6589b44
Update/improve German translations
2014-12-02 18:02:17 +01:00
59402da60d
Merge pull request #737 from kruks23/translation2
...
Update spanish translations
2014-12-02 00:31:24 +01:00
85d5326c32
Merge pull request #730 from svetlemodry/development
...
Updated Czech translation file
2014-12-02 00:31:13 +01:00
2a2679cfec
Update spanish translations
2014-12-01 23:16:27 +01:00
2f34f93c3a
pref_about_message string deleted
2014-12-01 21:42:37 +01:00
59a112ebfe
Updated Czech translation file
...
added missing strings
fixing typos, improvements for better understanding
2014-12-01 16:46:17 +01:00
21f77cd1e3
fixed italian translation
2014-12-01 09:59:39 +01:00
e039c8de25
Removed pref_about_message which is not translatable
2014-11-30 21:51:48 +01:00
6b772f4141
Added missing italian translations with some minor fixes to existing ones
2014-11-30 21:16:55 +01:00
52a43db6d6
Merge pull request #721 from SamWhited/warning_fixes
...
Warning "fixes"
2014-11-29 19:14:13 +01:00
e43ac27e8f
Accessibility: Add missing image descriptions
2014-11-29 08:03:35 -05:00
d9182fe81c
Update basque translation
2014-11-27 18:33:42 +01:00
e1e28e9ef6
Update german translations
...
modified translations a bit
2014-11-26 11:39:40 +01:00
6f21dc84d5
Merge pull request #714 from betheg/muc_bookmark_cd
...
MUC: option to set/delete bookmark in conference details.
2014-11-24 09:31:29 +01:00
31b539daf7
MUC: option to set/delete bookmark in conference details.
2014-11-23 21:37:45 +01:00
4d841587c8
Update german translations
2014-11-23 15:21:12 +01:00
ca761bac3c
Update spanish translations
2014-11-22 00:37:41 +01:00
de0b36fc78
verify contacts key only on initiating side of smp
2014-11-21 13:42:25 +01:00
13bb46d550
Update german translations
2014-11-20 19:20:49 +01:00
0ad6d0616f
brought ad hoc conferences back. fixed #688 fixed #367
2014-11-20 18:20:42 +01:00
4b9a507633
Merge pull request #691 from kruks23/development
...
Update spanish translation
2014-11-19 17:22:57 +01:00
393807ab2d
Merge pull request #692 from kriztan/patch-3
...
Update german translations
2014-11-19 17:22:50 +01:00
24b5d0eb26
Update basque translation
2014-11-19 16:12:31 +01:00
6847594363
Update german translations
2014-11-19 08:51:23 +01:00
3ccee22c86
Update spanish translations
2014-11-19 00:16:45 +01:00
8f33f3540a
Update spanish translations
2014-11-18 23:53:37 +01:00
66087cb360
put error notification into notification service
2014-11-18 15:26:28 +01:00
dcebc120ac
show dynamic tags in contacts activity as well
2014-11-18 14:24:06 +01:00
ab832bcff7
properly remove conversations context menu
2014-11-18 13:51:04 +01:00
d2a4855a1e
added rendered versions of new icons
2014-11-18 00:42:19 +01:00
240d2d68c8
context menu for conversations. fixed #630
2014-11-18 00:07:27 +01:00
f41c3eee04
context menu for muc participants + refactor trueCounterpart to use Jid class
2014-11-17 20:02:46 +01:00
283d5058e5
synchronized around cache clear in avatar service
2014-11-17 20:01:56 +01:00
e664a0c936
Merge pull request #680 from ferdev1/patch-2
...
Fix string 2
2014-11-17 18:14:50 +01:00
e30e84c819
slightly modified logo / launcher icon
2014-11-17 17:23:58 +01:00
6c13b8a9a1
Update strings.xml
2014-11-17 17:13:20 +01:00
ceecc8ffe7
Merge branch 'development' of https://github.com/siacs/Conversations into development
2014-11-17 01:54:19 +01:00
967cd922e1
highlight muc members by touching their name in muc details. fixed #503
2014-11-17 01:54:01 +01:00
c147f44cf1
Fix string
2014-11-16 18:11:14 +01:00
cf00f3fade
happy hanukkah
2014-11-16 17:21:21 +01:00
2067b9bd8d
made scan and show qr code more accessible in VerifyOtrActivity
2014-11-16 02:10:29 +01:00
0dc711d710
Update Spanish Translations
2014-11-15 20:48:31 +01:00
251f4d6d7f
Add incompatible server status
2014-11-15 11:29:58 -05:00
c09d450db8
Add security error status
2014-11-15 11:21:47 -05:00
35bf13f5ef
Merge branch 'feature/file_transfer' into development
...
Conflicts:
src/main/res/values/strings.xml
2014-11-15 15:52:15 +01:00
07b07115d6
Merge branch 'feature/foreground_service' into development
...
Conflicts:
src/main/res/values/strings.xml
2014-11-15 15:51:27 +01:00
5b9c690c47
Merge branch 'feature/otr_verification' into development
2014-11-15 15:50:35 +01:00
3c6b3506e3
turn on foreground service in expert settings
2014-11-15 15:34:34 +01:00
41f7848f2c
handled more error cases
2014-11-15 15:34:12 +01:00
47d44448f3
fixed description in notifications and conversation overview
2014-11-15 15:34:12 +01:00
cc4f3702a8
made file transfers cancelable
2014-11-15 15:34:12 +01:00
4ab558715c
adepted conversationadapter to deal with files
2014-11-15 15:34:12 +01:00
e7a70a46e0
some mime and pgp fixes for file transfer
2014-11-15 15:34:12 +01:00
c7acfe85c3
progress for http images as well. fixed open button for sent files
2014-11-15 15:34:12 +01:00
7a90ca429b
basic arbitrary file transfer
2014-11-15 15:34:11 +01:00
e2fb32841b
Merge pull request #666 from SamWhited/localefixes
...
Spelling fixes
2014-11-15 13:12:29 +01:00
8650bc2e13
Make licenses info untranslatable
2014-11-14 22:33:18 -05:00
bae2b7ddc6
Spelling fixes in Italian translation
2014-11-14 22:16:58 -05:00
62404b234c
Spelling fix in German translation
2014-11-14 22:13:42 -05:00
fca3e3c756
Update German language
...
deleted 'pref_about_message'
2014-11-12 20:09:14 +01:00
b971965697
Update German language
2014-11-12 13:13:59 +01:00
e33fc26cbe
added snackbar to indicate smp. more error handling in verify activity
2014-11-11 17:40:51 +01:00
6cd2ff0d88
initial smp support
2014-11-11 17:40:51 +01:00
26b4788733
formating
2014-11-09 21:27:37 +01:00
a01ff66537
Merge pull request #645 from betheg/about_all_libs
...
add all used libs to the pref_about_message
2014-11-09 21:18:32 +01:00
b1da9ae3cc
add libidn to pref_about_message.
2014-11-09 21:02:35 +01:00
f146c203a9
add all used libs to the pref_about_message.
...
also improve the notice a bit.
2014-11-09 13:59:38 +01:00
6f6f15d563
Update Spanish Translations
2014-11-09 13:29:30 +01:00
f8d5d6b2b5
reformated license a bit
2014-11-04 23:47:15 +01:00
df786cbf01
Shorten license text and fix height of scrollview
2014-11-04 13:26:48 -05:00
7b67f1a19c
Use normal text size and color
2014-11-04 13:17:15 -05:00
55c81eaf15
Make links clickable in about text
2014-11-04 13:09:56 -05:00
f10dd428ba
Convert about dialog to activity
2014-11-04 12:48:46 -05:00
97b4b012d0
Use real copyright symbol ©
2014-11-04 12:48:25 -05:00
df54ee75b4
Add about dialog with license info
2014-11-04 12:47:58 -05:00
cd5a56e8e7
show avatar in editaccount
2014-11-04 17:38:41 +01:00
b3582c970e
made qr code available from muc and contact details as well
2014-11-04 12:15:14 +01:00
d458919c8f
unfinishd qr code implemenation. thanks to @emdete
2014-11-03 22:47:07 +01:00
39ae34d3e6
Wrap "last seen" time.
...
Fixes #611
2014-11-03 08:28:20 -05:00
46f147a82c
Merge branch 'gradle' into development
...
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
2014-10-30 15:33:13 -04:00
281ce3105f
Make conversations the root project
2014-10-22 15:47:11 -04:00
kruks23