about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into readlineJames Booth2015-03-0824-423/+450
|\
| * Fixed tests for --disable-otrJames Booth2015-03-042-1/+7
| |
| * Added profanity.sh (OSX helper script for codelite) to .gitignoreJames Booth2015-03-041-0/+1
| |
| * Set version to 0.4.7 developmentJames Booth2015-03-042-4/+2
| |
| * Set version to 0.4.6James Booth2015-03-032-1/+3
| |
| * Fixed swapping windows when in source winJames Booth2015-03-031-4/+5
| |
| * Updated themes for releaseJames Booth2015-02-2619-417/+436
| |
* | 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
| |\ | | | | | | | | | | | | Conflicts: src/command/command.c
| | * Fixed spelling.Christian Storm2015-02-1711-38/+38
| | |
* | | Merge branch 'master' into readlineJames Booth2015-02-231-0/+1
|\| |
| * | Updated CHANGELOGJames Booth2015-02-231-0/+1
| | |
* | | Merge branch 'master' into readlineJames Booth2015-02-231-4/+4
|\| |
| * | Updated .travis.yml to use cmocka-1.0.0James Booth2015-02-231-4/+4
| | |
* | | 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 ↵James Booth2015-02-141-6/+4
| |/ | | | | | | expansion
* | 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-1186-109/+114
|\| | | | | | | | | | | Conflicts: src/tools/history.c src/tools/history.h
| * Updated CHANGELOGJames Booth2015-02-111-11/+12
| |
| * Changed default inpblock delay to 1 secondJames Booth2015-02-101-1/+1
| |
| * Updated man pageJames Booth2015-02-101-9/+13
| |
| * Updated copyrightJames Booth2015-02-1087-90/+90
| |
* | 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
| | | | | | | | fixes #502
* | Merge branch 'master' into readlineJames Booth2015-02-104-25/+42
|\| | | | | | | | | Conflicts: src/ui/inputwin.c