aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-0/+17
|\
| * added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+17
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-3/+5
|\ \
* \ \ Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-1/+1
|\ \ \ | | |/ | |/|
| * | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+1
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-1/+5
|\| |
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-2/+5
* | | Imports organizedsteckbrief2016-02-121-1/+0
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-2/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-26/+148
|\| |
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-1/+1
| * | show per conference notification settings in details activityDaniel Gultsch2016-01-081-0/+63
| * | set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-0/+1
| * | parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-6/+2
| * | hide subject edit button if not editable by userDaniel Gultsch2015-11-261-0/+2
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-10/+0
| * | Reset the margins manually after rotatingsaqura2015-10-261-0/+10
| * | Show whether MAM is supported in MUCssaqura2015-10-061-1/+12
| * | added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-6/+31
| * | added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-2/+8
| * | allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-7/+15
| * | Merge branch 'CryptoNextBeta' into developmentAndreas Straub2015-07-201-2/+1
| |\ \
| | * | Optimize importsAndreas Straub2015-07-201-2/+1
| * | | don't show 'show contact details' context menu item when contact isn not in r...Daniel Gultsch2015-07-201-3/+8
| * | | show contact details in conference details ...Christian S2015-07-191-0/+5
| |/ /
| * | handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-121-0/+4
| * | stop conference details from crashing when rotating the screenDaniel Gultsch2015-04-281-0/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-4/+4
|\ \ \ | | |/ | |/|
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-563/+0
| |/
* / Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-0/+7
|/
* limit ui refresh rateiNPUTmice2015-02-171-13/+6
* sort users in mucDaniel Gultsch2015-02-071-3/+12
* make room persistant when changing subject or other muc optionsDaniel Gultsch2015-01-101-16/+10
* ensure that everyone is member before making a room privateDaniel Gultsch2015-01-091-1/+8
* allow for very basic muc configurationDaniel Gultsch2015-01-081-7/+73
* code cleanupDaniel Gultsch2015-01-081-2/+0
* kick after banDaniel Gultsch2015-01-081-1/+14
* some clean ups for affiliation change context menuDaniel Gultsch2015-01-081-2/+8
* more muc optionsDaniel Gultsch2015-01-071-1/+26
* basic affiliation changes in mucDaniel Gultsch2015-01-071-13/+63
* Show affiliation instead of role in MucDetails and offer 'advanced mode' to d...Daniel Gultsch2015-01-051-45/+48
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-12/+12
* set nick and autojoin=true for new bookmarksiNPUTmice2014-12-031-0/+4
* Misc. "fixes" to correct warnings.Sam Whited2014-11-291-3/+6
* create conversation with bare jidiNPUTmice2014-11-271-1/+1
* Merge pull request #713 from betheg/mucDaniel Gultsch2014-11-241-1/+13
|\
| * add an listener for the muc roster update.Michael2014-11-231-1/+13
* | MUC: option to set/delete bookmark in conference details.Michael2014-11-231-0/+39
|/
* remove unused imports.Michael2014-11-211-1/+0
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-21/+28
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:53:03 +0000