aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-01-2324-133/+306
|\
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-2213-70/+52
| * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-225-1/+140
| * added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-224-5/+7
| * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-222-17/+32
| * add convenience to get an account object from a spinnerDaniel Gultsch2016-01-211-15/+19
| * catch security exception when user prevents access to address bookDaniel Gultsch2016-01-201-27/+45
| * add intent!=null check in onActivityResultin PublishProfilePictureDaniel Gultsch2016-01-201-1/+1
* | make actionbar title/subtitle clickableChristian S2016-01-231-23/+70
* | show warning on back pressed during update checkChristian S2016-01-221-1/+16
* | hide 'disable foreground service' in foreground notificationChristian S2016-01-201-3/+0
* | possible fix for showing link instead of button for filesChristian S2016-01-191-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-01-175-101/+31
|\|
| * Merge pull request #1655 from adithyaphilip/pgp-fixDaniel Gultsch2016-01-161-1/+4
| |\
| | * fixed PGP having to be selected twiceAdithya Abraham Philip2016-01-161-1/+4
| * | make ConversationsActivity more resistent against being restartedDaniel Gultsch2016-01-161-3/+9
| * | reuse same xmppconnection for reconnectsDaniel Gultsch2016-01-162-9/+17
| * | made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| * | removed some unused methods from db backendDaniel Gultsch2016-01-161-83/+0
| |/
* | Merge branch 'siacs/master' into developmentChristian S2016-01-165-32/+59
|\|
| * hide prepare image toasts when attaching multiple imagesDaniel Gultsch2016-01-151-11/+12
| * show toast when image cropper get oomDaniel Gultsch2016-01-151-0/+7
| * catch exception when reading message id from databaseDaniel Gultsch2016-01-151-8/+12
| * nimbuzz.com: don't wait for disco replies to set account to onlineDaniel Gultsch2016-01-152-12/+27
* | Merge branch 'siacs/master' into developmentChristian S2016-01-151-1/+1
|\|
| * fixed typo when reading battery_op settingDaniel Gultsch2016-01-141-1/+1
* | Merge remote-tracking branch 'refs/remotes/origin/AvatarPatch' into developmentChristian S2016-01-131-1/+1
|\ \
| * | Update PublishProfilePictureActivity.javaChristian S2016-01-111-1/+1
* | | Merge pull request #63 from siacs/masterChristian S2016-01-131-5/+10
|\ \ \ | | |/ | |/|
| * | show /me messages in conference notifications without the name of the senderDaniel Gultsch2016-01-131-5/+10
* | | Merge branch 'siacs/master' into developmentChristian S2016-01-1310-212/+436
|\| | | |/ |/|
| * show key fetch error in activity when there are no keys to be usedDaniel Gultsch2016-01-131-1/+8
| * check for file storage permission before selecting avatarDaniel Gultsch2016-01-133-20/+40
| * use batch transactions when writing rosterDheeraj CVR2016-01-131-0/+3
| * throw security exception instead of going to next srv entryDaniel Gultsch2016-01-121-1/+3
| * move some ssl socket modifiers into a seperate helper classDaniel Gultsch2016-01-122-56/+67
| * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-112-104/+220
| * reworked that loop that iterates over various serversDaniel Gultsch2016-01-111-16/+10
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-114-73/+144
* | Merge branch 'siacs/master' into developmentChristian S2016-01-1010-33/+136
|\|
| * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-2/+8
| * automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-092-8/+15
| * added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-082-1/+3
| * don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-081-10/+0
| * show per conference notification settings in details activityDaniel Gultsch2016-01-084-9/+83
| * show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-081-0/+12
| * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| |\
| | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 23:52:01 +0000