index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
build.gradle
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
version name set to beta-3
trz/beta-3
steckbrief
2016-05-02
1
-1
/
+1
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-04-18
1
-0
/
+1
|
\
|
*
Implements FS#137: build flavors
steckbrief
2016-04-18
1
-0
/
+1
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-17
1
-3
/
+14
|
|
\
|
|
/
|
/
|
|
*
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-04-05
1
-1
/
+1
|
|
\
*
|
\
Merge tag '1.11.7' into trz/merge_1.11.7
lookshe
2016-04-17
1
-3
/
+14
|
\
\
\
|
*
|
|
version bump to 1.11.7 + changelog
1.11.7
Daniel Gultsch
2016-04-14
1
-2
/
+2
|
*
|
|
version bump to 1.11.6 + changelog
1.11.6
Daniel Gultsch
2016-04-10
1
-2
/
+2
|
*
|
|
update gradle and gradle plugin
Daniel Gultsch
2016-04-09
1
-1
/
+1
|
*
|
|
increase version code to fix nasty bug in 1.11.5 beta
1.11.5
Daniel Gultsch
2016-04-08
1
-1
/
+1
|
*
|
|
version bump to 1.11.5 + changelog
Daniel Gultsch
2016-04-08
1
-2
/
+2
|
*
|
|
version bump to 1.11.4 + changelog
1.11.4
Daniel Gultsch
2016-04-05
1
-2
/
+2
|
*
|
|
fixing travis
Daniel Gultsch
2016-04-04
1
-0
/
+11
*
|
|
|
update to beta-2 and new logo for beta
trz/beta-2
lookshe
2016-04-06
1
-2
/
+2
|
|
_
|
/
|
/
|
|
*
|
|
Merge tag '1.11.3' into trz/rebase
lookshe
2016-04-05
1
-2
/
+2
|
\
|
|
|
*
|
version bump to 1.11.3 and changelog
1.11.3
Daniel Gultsch
2016-04-02
1
-2
/
+2
|
*
|
Update ShortcutBadger to version 1.1.4
Christian S
2016-03-27
1
-1
/
+1
*
|
|
update build.gradle for beta
lookshe
2016-04-03
1
-2
/
+2
*
|
|
Merge branch 'trz/rename' into trz/rebase
lookshe
2016-03-27
1
-1
/
+1
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
adjusted changelog and corrected wrong version in build.gradle due to merge
lookshe
2016-03-27
1
-2
/
+2
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-25
1
-3
/
+3
|
|
\
\
|
|
/
/
|
/
|
|
|
*
|
Merge branch 'trz/rebase' (early part) into trz/rename
lookshe
2016-03-20
1
-2
/
+2
|
|
\
\
*
|
\
\
FS#169 - Merge Conversations 1.11.2 into Conversations+ dev
lookshe
2016-03-25
1
-3
/
+3
|
\
\
\
\
|
|
_
|
/
/
|
/
|
|
/
|
|
|
/
|
|
/
|
|
*
|
version bump to 1.11.2 and changelog
1.11.2
Daniel Gultsch
2016-03-23
1
-2
/
+2
|
*
|
update build deps
Daniel Gultsch
2016-03-23
1
-2
/
+2
*
|
|
Merge tag '1.11.1' into trz/merge_1.11.1
lookshe
2016-03-17
1
-2
/
+2
|
\
|
|
|
*
|
version bump to 1.11.1 and changelog
1.11.1
Daniel Gultsch
2016-03-16
1
-2
/
+2
*
|
|
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2016-03-11
1
-1
/
+0
|
\
\
\
|
|
|
/
|
|
/
|
|
*
|
Fixes FS#51: Change toggle in Account Management back to standard
steckbrief
2016-03-11
1
-1
/
+0
|
*
|
incremented version code
lookshe
2016-03-08
1
-1
/
+1
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-08
1
-11
/
+1
|
|
\
\
|
|
/
/
|
/
|
|
|
*
|
Merge branch 'trz/rebase' into trz/rename
lookshe
2016-03-07
1
-0
/
+1
|
|
\
\
|
*
|
|
Version bump to 0.0.6
steckbrief
2016-03-06
1
-2
/
+2
*
|
|
|
Merge tag '1.11.0' into trz/merge_1.11.0
lookshe
2016-03-08
1
-13
/
+3
|
\
\
\
\
|
|
_
|
/
/
|
/
|
|
/
|
|
|
/
|
|
/
|
|
*
|
version bump to 1.11.0
1.11.0
Daniel Gultsch
2016-03-07
1
-2
/
+2
|
*
|
version bump to 1.11.0-beta.3
Daniel Gultsch
2016-03-05
1
-2
/
+2
|
*
|
version bump to 1.11.0-beta.2
Daniel Gultsch
2016-03-03
1
-2
/
+2
|
*
|
version bump to 1.11.0-beta, changelog and updated readme
Daniel Gultsch
2016-03-01
1
-2
/
+2
*
|
|
Fixes FS#150 - Swipe out conversation kills app
lookshe
2016-03-07
1
-0
/
+1
|
|
/
|
/
|
*
|
Merge tag '1.10.1' into trz/merge_1.10.1
steckbrief
2016-02-28
1
-2
/
+2
|
\
|
|
*
version bump to 1.10.1 and changelog
1.10.1
Daniel Gultsch
2016-02-26
1
-2
/
+2
|
*
Revert "disable predexing on travis"
Daniel Gultsch
2016-02-23
1
-102
/
+94
|
*
disable predexing on travis
Daniel Gultsch
2016-02-23
1
-94
/
+102
*
|
Explicit applicationId removed
steckbrief
2016-02-23
1
-1
/
+0
*
|
Merge tag '1.10.0' into trz/merge_1.10.0
lookshe
2016-02-22
1
-12
/
+13
|
\
|
|
*
version bump to 1.10.0
1.10.0
Daniel Gultsch
2016-02-21
1
-2
/
+3
|
*
version bump to 1.10.0-beta and changelog
Daniel Gultsch
2016-02-16
1
-2
/
+2
|
*
removed gcm plugin from gradle. fixes #1693
Daniel Gultsch
2016-02-12
1
-4
/
+2
|
*
client side support for XEP-0357: Push Notifications
Daniel Gultsch
2016-02-12
1
-20
/
+17
*
|
Merge tag '1.9.4' into trz/merge_1.9.4
trz/merge_1.9.4
lookshe
2016-02-16
1
-4
/
+2
|
\
|
[next]
