| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge remote-tracking branch 'origin/readline' into readline | James Booth | 2015-03-08 | 0 | -0/+0 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' into readline | James Booth | 2015-03-04 | 2 | -1/+7 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-04 | 1 | -0/+1 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/master' into readline | James Booth | 2015-03-04 | 1 | -1/+1 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-03 | 1 | -4/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-02-26 | 19 | -417/+436 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' into readline | James Booth | 2015-03-08 | 24 | -423/+450 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | | | ||||||
| | * | | | | | | | Fixed tests for --disable-otr | James Booth | 2015-03-04 | 2 | -1/+7 | |
| | | |_|_|/ / / | |/| | | | | | ||||||
| | * | | | | | | Added profanity.sh (OSX helper script for codelite) to .gitignore | James Booth | 2015-03-04 | 1 | -0/+1 | |
| | | |_|/ / / | |/| | | | | ||||||
| | * | | | | | Set version to 0.4.7 development | James Booth | 2015-03-04 | 2 | -4/+2 | |
| | | | | | | | ||||||
| | * | | | | | Set version to 0.4.6 | James Booth | 2015-03-03 | 2 | -1/+3 | |
| | | |/ / / | |/| | | | ||||||
| | * | | | | Fixed swapping windows when in source win | James Booth | 2015-03-03 | 1 | -4/+5 | |
| | |/ / / | ||||||
| | * | | | Updated themes for release | James Booth | 2015-02-26 | 19 | -417/+436 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-26 | 2 | -11/+11 | |
| |\| | | | ||||||
| | * | | | Renamed /theme set -> /theme load | James Booth | 2015-02-26 | 2 | -11/+11 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-25 | 2 | -31/+17 | |
| |\| | | | ||||||
| | * | | | Upgrade otr warn preference, added UI theme settings | James Booth | 2015-02-25 | 2 | -31/+17 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-24 | 2 | -4/+16 | |
| |\| | | | ||||||
| | * | | | Updated default preferences | James Booth | 2015-02-24 | 2 | -5/+14 | |
| | | | | | ||||||
| | * | | | Added /roster by preference to UI preferences summary | James Booth | 2015-02-24 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-24 | 1 | -2/+2 | |
| |\| | | | ||||||
| | * | | | Fixed /resource preference display | James Booth | 2015-02-24 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 1 | -1/+1 | |
| |\| | | | ||||||
| | * | | | Fixed create_fulljid | James Booth | 2015-02-23 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 3 | -7/+17 | |
| |\| | | | ||||||
| | * | | | Lowercase barejid in Jid | James Booth | 2015-02-23 | 2 | -2/+8 | |
| | | | | | ||||||
| | * | | | Lowercase barejid before searching roster | James Booth | 2015-02-23 | 1 | -5/+9 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 1 | -9/+11 | |
| |\| | | | ||||||
| | * | | | Lowercase barejid before adding to roster | James Booth | 2015-02-23 | 1 | -9/+11 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 11 | -35/+35 | |
| |\| | | | ||||||
| | * | | | Merge remote-tracking branch 'stormc/master-spellfixes' | James Booth | 2015-02-23 | 11 | -35/+35 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/command/command.c | |||||
| | | * | | | Fixed spelling. | Christian Storm | 2015-02-17 | 11 | -38/+38 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 1 | -0/+1 | |
| |\| | | | | ||||||
| | * | | | | Updated CHANGELOG | James Booth | 2015-02-23 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 1 | -4/+4 | |
| |\| | | | | ||||||
| | * | | | | Updated .travis.yml to use cmocka-1.0.0 | James Booth | 2015-02-23 | 1 | -4/+4 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' into readline | James Booth | 2015-02-23 | 1 | -279/+331 | |
| |\| | | | | ||||||
| | * | | | | Finished help tidy | James Booth | 2015-02-23 | 1 | -279/+331 | |
| | |/ / / | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-16 | 1 | -1/+1 | |
| |\| | | | ||||||
| | * | | | Removed comment | James Booth | 2015-02-16 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-16 | 1 | -81/+109 | |
| |\| | | | ||||||
| | * | | | Tidy help | James Booth | 2015-02-16 | 1 | -81/+109 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-14 | 2 | -124/+90 | |
| |\| | | | ||||||
| | * | | | Merge remote-tracking branch 'origin/master' | James Booth | 2015-02-14 | 1 | -119/+87 | |
| | |\ \ \ | ||||||
| | | * | | | Tidy help | James Booth | 2015-02-11 | 1 | -119/+87 | |
| | | | | | | ||||||
| | * | | | | Use single quotes for terminal notifier notifications to avoid variable ↵ | James Booth | 2015-02-14 | 1 | -6/+4 | |
| | |/ / / | | | | | | | | | | | | | expansion | |||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-11 | 1 | -1/+6 | |
| |\| | | | ||||||
| | * | | | Free jid on caps response handler | James Booth | 2015-02-11 | 1 | -1/+6 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into readline | James Booth | 2015-02-11 | 86 | -109/+114 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/tools/history.c src/tools/history.h | |||||
| | * | | | Updated CHANGELOG | James Booth | 2015-02-11 | 1 | -11/+12 | |
| | | | | | ||||||