aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-233-64/+77
|\
| * put welcome screen in scrollviewDaniel Gultsch2016-04-221-62/+67
* | changed hidden password fieldChristian S2016-04-231-2/+3
* | changed some stringsChristian S2016-04-232-13/+13
* | make password invisible in edit account viewChristian S2016-04-221-0/+4
* | display mam settings as iconChristian S2016-04-226-0/+2
* | added multiple ports to connect to...Christian S2016-04-222-5/+8
* | use IP/port to connect to serverChristian S2016-04-212-1/+14
* | remove hostname and port settingsChristian S2016-04-211-5/+0
* | changed and added some stringsChristian S2016-04-212-13/+19
* | modified welcome screenChristian S2016-04-214-52/+6
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-2115-6/+347
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-1915-7/+348
* | use material design icons for android < lollipopChristian S2016-04-162-23/+23
* | also show sent/received images with rounded cornersChristian S2016-04-162-2/+4
* | increased actionbar paddingChristian S2016-04-161-2/+4
* | make image corners more roundedChristian S2016-04-1611-12/+12
* | changed default values to match preferences.xmlChristian S2016-04-162-4/+4
* | increase font sizeChristian S2016-04-162-9/+10
* | changed some stringsChristian S2016-04-151-2/+2
* | added missing stringsChristian S2016-04-151-0/+4
* | corrected stringsChristian S2016-04-151-1/+0
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-156-25/+64
|\|
| * always notify by default in conferencesDaniel Gultsch2016-04-142-3/+1
| * removed unnecessary call to stopSelf() after logging outDaniel Gultsch2016-04-141-5/+11
| * add setting for quick sharingDaniel Gultsch2016-04-143-17/+51
* | added condition to show 'disable foreground service' buttonChristian S2016-04-151-1/+1
* | disallow account deactivationChristian S2016-04-157-63/+10
* | make foreground service always enabledChristian S2016-04-155-14/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-1424-65/+233
|\|
| * removed unused call to cancel eventsDaniel Gultsch2016-04-141-1/+0
| * create Config varibale to show the disable foreground service buttonDaniel Gultsch2016-04-132-3/+6
| * hacky workaround to determine if uri points to private file on < lolipopDaniel Gultsch2016-04-133-9/+25
| * return own jid as true counterpart on self messages in mucDaniel Gultsch2016-04-131-0/+3
| * added share uri button to conference detailsDaniel Gultsch2016-04-1215-14/+43
| * reverse order in contact chooserDaniel Gultsch2016-04-121-1/+1
| * minor code cleanupDaniel Gultsch2016-04-121-3/+1
| * republish avatar if server offers non-persistent pep :-(Daniel Gultsch2016-04-114-37/+144
* | Revert "chnaged avatar format to match XEP"Christian S2016-04-111-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-116-48/+68
|\|
| * pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| * don't throw IO exception at end of streamDaniel Gultsch2016-04-101-1/+0
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
| * moved authentication into seperate method. force close socket before changing...Daniel Gultsch2016-04-101-38/+44
| * introduced setting to turn of notification ledDaniel Gultsch2016-04-093-5/+15
* | don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* | Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-099-24/+92
|\|
| * use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8