index
:
PiratX
feature/fixed_domain_flavor
master
thedevstack
The new way for communications
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
/
main
/
java
/
eu
/
siacs
/
conversations
/
ui
/
ConversationActivity.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Christian S
2016-04-30
1
-1
/
+6
|
\
|
*
catch ActivityNotFoundException when requesting battery op
Daniel Gultsch
2016-04-29
1
-1
/
+6
*
|
Merge branch 'refs/heads/siacs/master' into welcome-screen
Christian S
2016-04-21
1
-3
/
+10
|
\
|
|
*
added magic create welcome screen
Daniel Gultsch
2016-04-19
1
-3
/
+10
*
|
don't show contact details when in conversations with self
Christian S
2016-04-11
1
-26
/
+23
*
|
Merge remote-tracking branch 'refs/remotes/siacs/master' into development
Christian S
2016-04-09
1
-6
/
+8
|
\
|
|
*
don't show contact details when in conversations with self
Daniel Gultsch
2016-04-09
1
-0
/
+1
|
*
prevent null pointer when checking http upload max size
Daniel Gultsch
2016-04-07
1
-6
/
+6
*
|
Merge remote-tracking branch 'siacs/master' into development
Christian S
2016-04-03
1
-5
/
+24
|
\
|
|
*
don't ask for resource when server uses http upload v0.1
Daniel Gultsch
2016-04-02
1
-2
/
+1
|
*
check max http file size when attaching files
Daniel Gultsch
2016-04-01
1
-5
/
+25
*
|
Merge branch 'siacs/master' into development
Christian S
2016-03-17
1
-0
/
+5
|
\
|
|
*
added logging in case fragment wasn't attached
Daniel Gultsch
2016-03-13
1
-0
/
+5
*
|
remove old code
Christian S
2016-03-13
1
-10
/
+0
*
|
Merge branch 'siacs/master' into development
Christian S
2016-03-13
1
-1
/
+13
|
\
|
|
*
don't show opt-out of battery optimization dialog when push is enabled
Daniel Gultsch
2016-03-06
1
-1
/
+13
*
|
Merge branch 'siacs/master' into development
Christian S
2016-03-04
1
-10
/
+15
|
\
|
|
*
let users confirm each member in a conference even if that contact is already...
Daniel Gultsch
2016-03-01
1
-1
/
+3
|
*
refactored omemo to take multiple recipients
Daniel Gultsch
2016-02-29
1
-9
/
+12
|
*
changed single_account config into more simple lock_settings
Daniel Gultsch
2016-02-27
1
-1
/
+1
*
|
bug fixes
Christian S
2016-02-27
1
-2
/
+1
*
|
Merge branch 'siacs/master' into development
Christian S
2016-02-27
1
-6
/
+7
|
\
|
|
*
made hard coded choice for encryptions more flexible and disable parsing
Daniel Gultsch
2016-02-24
1
-4
/
+6
*
|
Merge branch 'siacs/master' into development
Christian S
2016-02-20
1
-5
/
+2
|
\
|
|
*
removed unnecessary conditions when sending read marker
Daniel Gultsch
2016-02-15
1
-5
/
+1
|
*
only show load more messages button when mam is available
Daniel Gultsch
2016-02-14
1
-0
/
+1
*
|
optimized subtitle in MUCs
Christian S
2016-02-06
1
-21
/
+18
*
|
match new presence modifications
Christian S
2016-02-04
1
-2
/
+2
*
|
Merge remote-tracking branch 'siacs/master' into development
Christian S
2016-02-04
1
-16
/
+22
|
\
|
|
*
prevent previoulsly cleared messages from reloading. fixes #1110
Daniel Gultsch
2016-02-04
1
-0
/
+6
|
*
fixed 'unencrypted' not showing up for conferences when encryption is forced
Daniel Gultsch
2016-02-02
1
-1
/
+1
*
|
Merge branch 'siacs/master' into development
Christian S
2016-01-23
1
-3
/
+3
|
\
|
|
*
use extract account from intent method and final EXTRA_ACCOUNT variable
Daniel Gultsch
2016-01-22
1
-2
/
+2
|
*
added config variable to allow non-tls connections
Daniel Gultsch
2016-01-22
1
-1
/
+1
*
|
make actionbar title/subtitle clickable
Christian S
2016-01-23
1
-23
/
+70
*
|
Merge branch 'siacs/master' into development
Christian S
2016-01-17
1
-4
/
+13
|
\
|
|
*
Merge pull request #1655 from adithyaphilip/pgp-fix
Daniel Gultsch
2016-01-16
1
-1
/
+4
|
|
\
|
|
*
fixed PGP having to be selected twice
Adithya Abraham Philip
2016-01-16
1
-1
/
+4
|
*
|
make ConversationsActivity more resistent against being restarted
Daniel Gultsch
2016-01-16
1
-3
/
+9
|
|
/
*
|
Merge branch 'siacs/master' into development
Christian S
2016-01-16
1
-11
/
+12
|
\
|
|
*
hide prepare image toasts when attaching multiple images
Daniel Gultsch
2016-01-15
1
-11
/
+12
*
|
Merge branch 'siacs/master' into development
Christian S
2016-01-15
1
-1
/
+1
|
\
|
|
*
fixed typo when reading battery_op setting
Daniel Gultsch
2016-01-14
1
-1
/
+1
*
|
Merge branch 'siacs/master' into development
Christian S
2016-01-13
1
-57
/
+79
|
\
|
|
*
check for file storage permission before selecting avatar
Daniel Gultsch
2016-01-13
1
-15
/
+1
|
*
ask to be excluded from battery optimization
Daniel Gultsch
2016-01-11
1
-43
/
+80
*
|
copy commits
Christian S
2016-01-04
1
-4
/
+5
|
\
|
|
*
show trust keys activties if own keys are undecided
Daniel Gultsch
2016-01-04
1
-4
/
+5
*
|
hide settings, accounts and updater in all menus except in main window
Christian S
2015-12-29
1
-0
/
+8
*
|
copy commits
Christian S
2015-12-28
1
-2
/
+3
|
\
|
[next]