Commit graph

Select branches

Hide pull requests

c3

develop

fdroid/changelogs

gnomeshell1

hrukudah

master

#1

#10

#11

#14

#15

#16

#18

#2

#24

#3

#30

#34

#37

#39

#4

#41

#43

#44

#5

#51

#56

#6

#7

#8

#9

2.2.2

2.2.4

2.3.0

2.3.1

Mono Color

• 00377b64c7 Merge pull request #140 from strb/mucicons Daniel Gultsch 2014-05-24 10:01:51 +0200
• d74faa3f7c More harcoded translations + Spanish kruks23 2014-05-24 00:17:42 +0200
• 600ab81010 Merge pull request #145 from kruks23/development Daniel Gultsch 2014-05-23 16:58:58 +0200
• d6fd0343ae Title activities translations + contacts translations + update Spanish Translations kruks23 2014-05-23 16:20:49 +0200
• a0dde05ee5 end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty Daniel Gultsch 2014-05-23 10:54:40 +0200
• 8133dcd881 fixed possible npe Daniel Gultsch 2014-05-23 10:15:58 +0200
• a5d54d70ee code cleanup Daniel Gultsch 2014-05-23 10:07:17 +0200
• f3eb3e1be3 updated readme Daniel Gultsch 2014-05-23 09:59:30 +0200
• a2ae6e80fa Merge pull request #143 from nachovfranco/mycommits Daniel Gultsch 2014-05-23 09:57:20 +0200
• a4bc6f1e47 Merge pull request #144 from kruks23/development Daniel Gultsch 2014-05-23 02:22:14 +0200
• 950165033b Contact details translations + update spanish translations kruks23 2014-05-22 22:58:25 +0200
• b99779432c offline crud of contacts Daniel Gultsch 2014-05-22 14:33:17 +0200
• e26c60b9ca Galician translation nachovfranco 2014-05-22 13:10:23 +0200
• ad960b393d implementet missing methods on the new roster mgmt Daniel Gultsch 2014-05-22 12:57:47 +0200
• f0d2ca260e fixed #136 Daniel Gultsch 2014-05-22 09:36:00 +0200
• 1db807ef58 write contacts on system shutdown Daniel Gultsch 2014-05-21 22:22:36 +0200
• a9d384875b added missing strings Daniel Gultsch 2014-05-21 20:37:55 +0200
• 5a6da5afaa Merge branch 'development' of github.com:siacs/Conversations into development Daniel Gultsch 2014-05-21 20:28:09 +0200
• 6d90a5cd57 further improvment trying to deal with large images Daniel Gultsch 2014-05-21 20:27:53 +0200
• 0883de0701 Refactored unknown contact picture generation Andreas Straub 2014-04-13 23:54:08 +0200
• df16ecb9d6 Merge pull request #138 from strb/highlight Daniel Gultsch 2014-05-21 18:16:34 +0200
• 2674d40704 Fix highlight detection in MUC channels Andreas Straub 2014-05-21 18:01:00 +0200
• 0de9d57420 cleaned up shared text Daniel Gultsch 2014-05-21 16:43:19 +0200
• 9d2ce5ff98 auto retry image compression with decreasing sample size Daniel Gultsch 2014-05-21 00:39:45 +0200
• fa9cbeb746 close input stream Daniel Gultsch 2014-05-20 22:54:28 +0200
• 7f0efa089f trying to deal with larger images Daniel Gultsch 2014-05-20 22:52:57 +0200
• 543d776986 Merge pull request #131 from beriain/development Daniel Gultsch 2014-05-20 20:37:40 +0200
• 45cae4a340 Merge pull request #133 from kruks23/development Daniel Gultsch 2014-05-20 20:36:15 +0200
• aba1ca7918 Update Spanish Translations + harcoded just_now kruks23 2014-05-20 18:49:58 +0200
• 116456691d Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-20 17:49:54 +0200
• 2b50c9912b Update and fix basque translation Beriain 2014-05-20 16:35:02 +0200
• ff6e51356f Merge pull request #128 from kruks23/development Daniel Gultsch 2014-05-20 11:52:11 +0200
• f79d92ab67 highlight people in conferences by clicken on their picture Daniel Gultsch 2014-05-20 11:44:43 +0200
• 13f9f23946 fixed ping time out after session resume Daniel Gultsch 2014-05-20 11:05:03 +0200
• 8f92d8d109 ported pending subscription support to new roster mgmt Daniel Gultsch 2014-05-20 10:48:07 +0200
• a582d44dba added search icon Daniel Gultsch 2014-05-20 10:15:47 +0200
• a5a356a7a7 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-19 21:42:23 +0200
• 371c985c25 made roster persistant aka enabled versioning again Daniel Gultsch 2014-05-19 21:05:17 +0200
• 2a1067b20a Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-19 20:21:25 +0200
• a6f9a742c0 some code cleanup to deal with the roster mgmt changes from earlier Daniel Gultsch 2014-05-19 15:39:50 +0200
• 993477cd83 reworked roster/contact handling. might break some stuff. not sycing to disk yet Daniel Gultsch 2014-05-19 15:15:09 +0200
• 7994b6866b Update Spanish Translations kruks23 2014-05-18 19:33:38 +0200
• e27bb52575 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-18 19:10:52 +0200
• 590e2403ab bind and session request more compatible Daniel Gultsch 2014-05-18 17:32:20 +0200
• e857cf979d fixed #123 fixed122 Daniel Gultsch 2014-05-18 13:23:26 +0200
• 7fc7201abb cleaned up edit account dialog a little Daniel Gultsch 2014-05-18 11:49:44 +0200
• 0cdd74417f fixed #53 aka server not found bug Daniel Gultsch 2014-05-18 11:25:04 +0200
• b79ff3af6c Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 22:03:12 +0200
• 66aacf7e3e sending session after unsucesfull session resume. fixed #116 Daniel Gultsch 2014-05-17 21:57:44 +0200
• 2abb57be34 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 20:41:33 +0200
• c07d3deea3 Merge branch 'master' into development Daniel Gultsch 2014-05-17 19:33:55 +0200
• ae6c99012e bumped version 0.2.3 Daniel Gultsch 2014-05-17 19:23:52 +0200
• b7b25b472c receiving pgp images important bug fix Daniel Gultsch 2014-05-17 19:19:06 +0200
• 736e09fbb5 added record audio button Daniel Gultsch 2014-05-17 19:21:16 +0200
• 27060e303c made sending session more compliant Daniel Gultsch 2014-05-17 19:20:31 +0200
• 4c17937640 receiving pgp images important bug fix Daniel Gultsch 2014-05-17 19:19:06 +0200
• 4d2e50224c Merge branch 'master' into development Daniel Gultsch 2014-05-17 13:36:25 +0200
• fddb098857 updated changelog for version 0.2.2 Daniel Gultsch 2014-05-17 13:30:32 +0200
• 813896dbc9 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-17 13:04:33 +0200
• e34fddd7e1 Update Validator.java the-username 2014-05-15 20:43:10 +0200
• a32d95cdd3 fixed #66 Daniel Gultsch 2014-05-17 12:10:58 +0200
• cab9b10e35 spelling Daniel Gultsch 2014-05-17 12:02:14 +0200
• bab69ffcf9 fixed #108 Daniel Gultsch 2014-05-17 11:08:32 +0200
• 836366bf2d added translators to readme Daniel Gultsch 2014-05-17 10:50:29 +0200
• 84a4620649 version bump to 0.2.2 Daniel Gultsch 2014-05-17 10:04:57 +0200
• 8bf0945f2f permanent notification disapears now when account is being deleted + code clean up Daniel Gultsch 2014-05-17 10:03:15 +0200
• b84b67268b fixed #113 Daniel Gultsch 2014-05-17 09:43:47 +0200
• f9394e2e69 Merge pull request #120 from kruks23/development Daniel Gultsch 2014-05-16 23:13:08 +0200
• 9b95b07b97 Merge branch 'development' of https://github.com/siacs/Conversations into development kruks23 2014-05-16 22:49:52 +0200
• cd1afbd39a reworked message to conferences Daniel Gultsch 2014-05-16 22:46:15 +0200
• a0a5ca9585 fixed npe for otr sessions with non contacts Daniel Gultsch 2014-05-16 22:44:54 +0200
• e50f009004 Update Spanish Translations + harcoded pref_advanced_settings kruks23 2014-05-16 22:35:58 +0200
• 225447f2f5 updated german translation Daniel Gultsch 2014-05-16 16:16:35 +0200
• aa68045c58 offline sending of pgp fixed Daniel Gultsch 2014-05-16 13:42:20 +0200
• c8f8bab2a1 formating Daniel Gultsch 2014-05-16 13:18:52 +0200
• 1cf1e62e30 fixed null in shared link Daniel Gultsch 2014-05-16 12:07:58 +0200
• afd1ba657a Merge pull request #117 from BenoitBouvarel/development Daniel Gultsch 2014-05-16 11:55:17 +0200
• 3d0f08e319 French translation + hard-coded string > @string Benoit Bouvarel 2014-05-16 01:13:07 +0200
• 3426df21c1 Merge pull request #109 from kruks23/development Daniel Gultsch 2014-05-15 12:07:41 +0200
• 13d73a196c fixed npe Daniel Gultsch 2014-05-15 10:27:36 +0200
• ad19100b9d Update Spanish Translations kruks23 2014-05-14 19:18:07 +0200
• ca7e24c30d hiding the prepare image toast after error or success Daniel Gultsch 2014-05-14 18:43:58 +0200
• 08a26d2772 fixed possible npe Daniel Gultsch 2014-05-14 18:39:59 +0200
• f4eebd091c fixed #105 Daniel Gultsch 2014-05-14 18:32:58 +0200
• 81d2760505 made message parser non static Daniel Gultsch 2014-05-14 12:56:34 +0200
• 1f600be4dd code clean up Daniel Gultsch 2014-05-14 11:49:43 +0200
• 65e7294802 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-14 00:09:38 +0200
• ebae779d73 one more entry to strings file Daniel Gultsch 2014-05-13 18:06:56 +0200
• bc87f59600 version bump Daniel Gultsch 2014-05-13 17:57:10 +0200
• a1a90a03e0 added presence selection Daniel Gultsch 2014-05-13 17:42:23 +0200
• 888de850cf Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:23:58 +0200
• a3d241020a Merge branch 'beriain-development' into development Daniel Gultsch 2014-05-13 17:22:45 +0200
• c0f5b26d1a Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development Daniel Gultsch 2014-05-13 17:22:06 +0200
• f1bdf1d4c5 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 17:11:36 +0200
• 71545f4f66 code cleanup Daniel Gultsch 2014-05-13 17:11:27 +0200
• efac008ffb Fix Beriain 2014-05-13 16:52:35 +0200
• 9492e28902 takeing pictures over intent Daniel Gultsch 2014-05-13 16:48:39 +0200
• 8d27d0c44a Merge https://github.com/siacs/Conversations into development Beriain 2014-05-13 16:46:03 +0200
• 1150f47add Update basque translation and include preferences Beriain 2014-05-13 16:42:26 +0200
• a8010e7133 Merge branch 'development' into feature/take_picture Daniel Gultsch 2014-05-13 15:40:59 +0200