Commit Graph

4015 Commits

Author SHA1 Message Date
Daniel Gultsch dee7fd3eab Merge pull request #1826 from sebastianv89/patch-1
Renaming of variable
2016-05-04 09:28:46 +02:00
Sebastian cf374ec4ef Renaming of variable
Was probably just a copy/paste typo.
2016-05-03 23:35:57 +02:00
Daniel Gultsch 59f02f7766 Merge branch 'master' of github.com:siacs/Conversations 2016-05-03 22:17:16 +02:00
Daniel Gultsch cef2eb58a7 fixed presence template dedup for 'online' status 2016-05-03 22:16:51 +02:00
Daniel Gultsch fad8b702aa use app name in resource suggestions 2016-05-03 12:41:37 +02:00
Daniel Gultsch cfa31beaf7 fixed spelling in readme 2016-05-03 09:39:30 +02:00
Daniel Gultsch f444390617 update 'create account' faq entry 2016-05-02 14:39:58 +02:00
Daniel Gultsch 06a561743a ping all accounts at the same time 2016-05-02 14:31:30 +02:00
Daniel Gultsch 7674e01585 version bump to 1.12.0 + changelog 2016-05-02 11:05:53 +02:00
Daniel Gultsch bf92ef6cd3 pulled translations from transifex 2016-05-02 11:05:31 +02:00
Daniel Gultsch d23178acb9 show only username when registering account with magic create 2016-05-02 10:37:28 +02:00
Daniel Gultsch 98ecac0ffa removed unnecessary logging 2016-04-30 13:34:20 +02:00
Daniel Gultsch 936006173c properly cancel avatar tasks 2016-04-29 20:38:23 +02:00
Daniel Gultsch d5608cb4f3 catch ActivityNotFoundException when requesting battery op 2016-04-29 13:58:37 +02:00
Daniel Gultsch c7882b7225 port all android drop down list items to our own 2016-04-29 13:48:30 +02:00
Daniel Gultsch 6d9ca25915 catch rare NPE when determining max http size 2016-04-29 13:24:26 +02:00
Daniel Gultsch 252d015b71 synchronize around thumbnail cache to avoid loading images twice 2016-04-28 20:15:28 +02:00
Daniel Gultsch 1d2e2f71c2 cancel potential tasks when receiving image preview from cache 2016-04-28 20:14:53 +02:00
Daniel Gultsch 51753a1d39 cleaned up captcha dialog 2016-04-28 20:13:58 +02:00
Daniel Gultsch 5021b9a5dd don't request disco from self 2016-04-28 19:02:20 +02:00
Daniel Gultsch 29616d02a8 removed unused config variables 2016-04-27 16:43:02 +02:00
Daniel Gultsch ebcb13c8eb made it possible to go back to welcome screen from edit account 2016-04-27 10:35:08 +02:00
Daniel Gultsch e6b526230a renamed welcome header to untranslatable 'Start your Conversations' 2016-04-27 09:59:25 +02:00
Daniel Gultsch 9c3e910dc4 prevent user from accidentally changing password after using magic create 2016-04-26 23:23:48 +02:00
Daniel Gultsch 59652ecaf2 fixed table creation 2016-04-25 11:06:17 +02:00
Daniel Gultsch 6a677a172b Merge pull request #1821 from kriztan/patch-1
Update build.gradle
2016-04-24 11:26:01 +02:00
Christian S 94983ca3ed Update build.gradle
this seems be be never used and could be removed
2016-04-23 21:46:45 +02:00
Daniel Gultsch a363e0a5d8 don't create templates for empty status messages 2016-04-23 15:10:35 +02:00
Daniel Gultsch cd1fbf60ec add change prescence to manage account context menu 2016-04-23 12:33:56 +02:00
Daniel Gultsch a9c1768107 show status messages in contact details 2016-04-23 12:19:00 +02:00
Daniel Gultsch 1901abd05f expert setting to manually change presence 2016-04-22 21:25:06 +02:00
Daniel Gultsch 195b745efc put welcome screen in scrollview 2016-04-22 00:17:08 +02:00
Daniel Gultsch 1a073ca454 added magic create welcome screen 2016-04-19 18:03:24 +02:00
Daniel Gultsch bfe01c4322 version bump to 1.11.7 + changelog 2016-04-14 23:13:44 +02:00
Daniel Gultsch e9494af098 always notify by default in conferences 2016-04-14 22:37:05 +02:00
Daniel Gultsch eb63cdb9ad removed unnecessary call to stopSelf() after logging out 2016-04-14 21:45:36 +02:00
Daniel Gultsch 72aa10b536 add setting for quick sharing 2016-04-14 21:12:44 +02:00
Daniel Gultsch 39e717ed94 removed unused call to cancel events 2016-04-14 00:16:59 +02:00
Daniel Gultsch c53c6cb6b6 create Config varibale to show the disable foreground service button 2016-04-13 18:00:12 +02:00
Daniel Gultsch 594e65bb2b hacky workaround to determine if uri points to private file on < lolipop 2016-04-13 11:14:36 +02:00
Daniel Gultsch 4332b0df44 return own jid as true counterpart on self messages in muc 2016-04-13 11:13:47 +02:00
Daniel Gultsch 3e654bea0e added share uri button to conference details 2016-04-12 18:30:02 +02:00
Daniel Gultsch 2a4db01709 reverse order in contact chooser 2016-04-12 18:29:41 +02:00
Daniel Gultsch 7223b5b274 minor code cleanup 2016-04-12 17:52:58 +02:00
Daniel Gultsch 7ff890e513 republish avatar if server offers non-persistent pep :-( 2016-04-11 22:20:32 +02:00
Daniel Gultsch 23a0beab43 version bump to 1.11.6 + changelog 2016-04-10 21:20:13 +02:00
Daniel Gultsch 77f4513862 pulled translations from transifex 2016-04-10 21:19:50 +02:00
Daniel Gultsch 677269606c add entries to gitignore 2016-04-10 00:31:25 +02:00
Daniel Gultsch 5786e75374 don't throw IO exception at end of stream 2016-04-10 00:19:53 +02:00
Daniel Gultsch 91b17c6925 fixed 'connecting…' button 2016-04-10 00:19:20 +02:00