Code

MUC search#5

Code

Open

bremensaki wants to merge 21 commits intojabberzac:muc_searchjabberzac/Conversations:muc_searchfrom philipflohr:developmentphilipflohr/Conversations:developmentCopy head branch name to clipboard

+523-31

Commits

Commits on Jul 15, 2015

• Merge pull request #1 from siacs/development

  Show description for 3b27ce0
  

  philipflohr

  committed
  3b27ce0

  Copy full SHA for 3b27ce0

Commits on Aug 15, 2015

• implemented muc room search and basic ui

  

  Philip Flohr

  committed
  4d071a2

  Copy full SHA for 4d071a2

Commits on Aug 19, 2015

• Merged upstream with local

  

  Philip Flohr

  committed
  f778da4

  Copy full SHA for f778da4

• Improvments for Roomsearch

  

  Philip Flohr

  committed
  006f1af

  Copy full SHA for 006f1af

• UI improvements for JoinConferenceDialog

  

  Philip Flohr

  committed
  3981229

  Copy full SHA for 3981229

Commits on Aug 27, 2015

• merged upstream with local

  

  Philip Flohr

  committed
  5f31eb7

  Copy full SHA for 5f31eb7

• merge, second try

  

  Philip Flohr

  committed
  e7ec48e

  Copy full SHA for e7ec48e

Commits on Aug 28, 2015

• revert gui changes, keep room search code

  

  Philip Flohr

  committed
  c3eb6bd

  Copy full SHA for c3eb6bd

• implemented roomsearch tab for own server

  

  Philip Flohr

  committed
  5eaee99

  Copy full SHA for 5eaee99

• implemented roomsearch tab for all known servers

  

  Philip Flohr

  committed
  f6df5ea

  Copy full SHA for f6df5ea

Commits on Aug 29, 2015

• added listeners and menu items

  

  Philip Flohr

  committed
  bde2ea6

  Copy full SHA for bde2ea6

• implemented room discovery on unknown servers from context menu

  

  Philip Flohr

  committed
  18e116c

  Copy full SHA for 18e116c

Commits on Aug 30, 2015

• implemented automated room discovery on all known xmpp servers

  

  Philip Flohr

  committed
  c96508f

  Copy full SHA for c96508f

• call joinConferenceDialog with prefilled Jid when selecting conference in search tab

  

  Philip Flohr

  committed
  76e8c94

  Copy full SHA for 76e8c94

• use add icon for adding new conference sever

  

  Philip Flohr

  committed
  c17bad7

  Copy full SHA for c17bad7

Commits on Sep 6, 2015

• added menuitems for rommsearch types and implemented search on all + search on connected conference hosts

  

  Philip Flohr

  committed
  8630390

  Copy full SHA for 8630390

• implemeted Own server + Off

  

  Philip Flohr

  committed
  69471c5

  Copy full SHA for 69471c5

• fix for context menu + fancyfication

  

  Philip Flohr

  committed
  ad48230

  Copy full SHA for ad48230

• fix: display known conferences only once

  

  Philip Flohr

  committed
  eb689c5

  Copy full SHA for eb689c5

Commits on Sep 8, 2015

• fix: use translateable string as default value for roomsearch setting

  

  Philip Flohr

  committed
  79f38dc

  Copy full SHA for 79f38dc

• merged upstream changes

  

  Philip Flohr

  committed
  5c9baa5

  Copy full SHA for 5c9baa5