about summary refs log tree commit diff stats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'oliverlemoal/xep-0280' into xep-0280James Booth2015-03-0815-2/+164
|\
| * mergeOlivier LE MOAL2015-02-231-1/+6
| |\
| | * fix segfault on self sent message carbonOlivier Le Moal2015-02-211-0/+5
| | * Add /carbons in /help settingsOlivier LE MOAL2015-02-031-1/+1
| | * Fix help for message carbonsOlivier LE MOAL2015-02-032-3/+2
| | * Add preference/commands for carbons messageOlivier LE MOAL2015-02-0312-6/+85
| | * Add XEP-0280 supportOlivier LE MOAL2015-02-028-0/+79
| * | Add XEP-0280 supportOlivier LE MOAL2015-02-1015-1/+158
* | | Merge branch 'master' into readlineJames Booth2015-03-081-4/+5
|\ \ \
| * | | Fixed swapping windows when in source winJames Booth2015-03-031-4/+5
* | | | Merge branch 'master' into readlineJames Booth2015-02-262-11/+11
|\| | |
| * | | Renamed /theme set -> /theme loadJames Booth2015-02-262-11/+11
* | | | Merge branch 'master' into readlineJames Booth2015-02-252-31/+17
|\| | |
| * | | Upgrade otr warn preference, added UI theme settingsJames Booth2015-02-252-31/+17
* | | | Merge branch 'master' into readlineJames Booth2015-02-242-4/+16
|\| | |
| * | | Updated default preferencesJames Booth2015-02-242-5/+14
| * | | Added /roster by preference to UI preferences summaryJames Booth2015-02-241-0/+3
* | | | Merge branch 'master' into readlineJames Booth2015-02-241-2/+2
|\| | |
| * | | Fixed /resource preference displayJames Booth2015-02-241-2/+2
* | | | Merge branch 'master' into readlineJames Booth2015-02-231-1/+1
|\| | |
| * | | Fixed create_fulljidJames Booth2015-02-231-1/+1
* | | | Merge branch 'master' into readlineJames Booth2015-02-233-7/+17
|\| | |
| * | | Lowercase barejid in JidJames Booth2015-02-232-2/+8
| * | | Lowercase barejid before searching rosterJames Booth2015-02-231-5/+9
* | | | Merge branch 'master' into readlineJames Booth2015-02-231-9/+11
|\| | |
| * | | Lowercase barejid before adding to rosterJames Booth2015-02-231-9/+11
* | | | Merge branch 'master' into readlineJames Booth2015-02-2311-35/+35
|\| | |
| * | | Merge remote-tracking branch 'stormc/master-spellfixes'James Booth2015-02-2311-35/+35
| |\ \ \
| | * | | Fixed spelling.Christian Storm2015-02-1711-38/+38
* | | | | Merge branch 'master' into readlineJames Booth2015-02-231-279/+331
|\| | | |
| * | | | Finished help tidyJames Booth2015-02-231-279/+331
| |/ / /
* | | | Merge branch 'master' into readlineJames Booth2015-02-161-1/+1
|\| | |
| * | | Removed commentJames Booth2015-02-161-1/+1
* | | | Merge branch 'master' into readlineJames Booth2015-02-161-81/+109
|\| | |
| * | | Tidy helpJames Booth2015-02-161-81/+109
* | | | Merge branch 'master' into readlineJames Booth2015-02-142-124/+90
|\| | |
| * | | Merge remote-tracking branch 'origin/master'James Booth2015-02-141-119/+87
| |\ \ \
| | * | | Tidy helpJames Booth2015-02-111-119/+87
| * | | | Use single quotes for terminal notifier notifications to avoid variable expan...James Booth2015-02-141-6/+4
| |/ / /
* | | | Merge branch 'master' into readlineJames Booth2015-02-111-1/+6
|\| | |
| * | | Free jid on caps response handlerJames Booth2015-02-111-1/+6
* | | | Merge branch 'master' into readlineJames Booth2015-02-1183-86/+86
|\| | |
| * | | Changed default inpblock delay to 1 secondJames Booth2015-02-101-1/+1
| * | | Updated copyrightJames Booth2015-02-1085-87/+87
* | | | Merge branch 'master' into readlineJames Booth2015-02-101-2/+2
|\| | |
| * | | Fixed parameter order for /tiny in private and group chatJames Booth2015-02-101-2/+2
* | | | Merge branch 'master' into readlineJames Booth2015-02-104-25/+42
|\| | |
| * | | Copy list when sorting windows for /winsJames Booth2015-02-101-2/+12
| * | | Free roster listJames Booth2015-02-101-16/+20
| * | | Used g_hash_table_destroy to free logsJames Booth2015-02-101-4/+4