Branch: refs/heads/master Home: https://github.com/Stephen001/Chatters Commit: ed11a57ab9b146f3cb834f109cb0822244948e8d https://github.com/Stephen001/Chatters/commit/ed11a57ab9b146f3cb834f109cb0822244948e8d Author: Davidson Lu <Lulu1494@xxxxxxxxx> Date: 2013-11-23 (Sat, 23 Nov 2013) Changed paths: M src/struct/TextManager.dm Log Message: ----------- Added a quick link for DM Reference entries Commit: 3ab7315939c413916f91a561c492fbd15d094081 https://github.com/Stephen001/Chatters/commit/3ab7315939c413916f91a561c492fbd15d094081 Author: Stephen Badger <stephen.badger@xxxxxxxxx> Date: 2013-11-23 (Sat, 23 Nov 2013) Changed paths: M src/struct/TextManager.dm Log Message: ----------- Removes the img expansion, and adds a z0r.de quicklink. Commit: 6968b3c329596a51f70d5794f604143cee1d8320 https://github.com/Stephen001/Chatters/commit/6968b3c329596a51f70d5794f604143cee1d8320 Author: Jonathon Emerson <jbrodye> Date: 2013-11-23 (Sat, 23 Nov 2013) Changed paths: M rsc/default.dmf M src/struct/Channel.dm Log Message: ----------- Fixed merge conflict. Commit: cf49a9d5251c05de39c1a62fdabea2ce2cb80219 https://github.com/Stephen001/Chatters/commit/cf49a9d5251c05de39c1a62fdabea2ce2cb80219 Author: Jonathon Emerson <jbrodye> Date: 2013-11-23 (Sat, 23 Nov 2013) Changed paths: M rsc/default.dmf M src/struct/Channel.dm Log Message: ----------- Actually fixes merge conflict. Commit: 75008573790ae9c1010629ca20bc60161c3f048e https://github.com/Stephen001/Chatters/commit/75008573790ae9c1010629ca20bc60161c3f048e Author: Jonathon Emerson <jbrodye> Date: 2013-11-24 (Sun, 24 Nov 2013) Changed paths: M rsc/default.dmf Log Message: ----------- Disabled HTTP images in the chat output. Commit: cad91980e9fb0f0ac59f38ef392b26cbcbcce506 https://github.com/Stephen001/Chatters/commit/cad91980e9fb0f0ac59f38ef392b26cbcbcce506 Author: Jonathon Emerson <jbrodye> Date: 2013-11-24 (Sun, 24 Nov 2013) Changed paths: M src/struct/Bot.dm Log Message: ----------- Can't put HTML in bot name or name/text color. Commit: 9ea9c340cd1c688a6fde13e379c9c742bcea239e https://github.com/Stephen001/Chatters/commit/9ea9c340cd1c688a6fde13e379c9c742bcea239e Author: Jonathon Emerson <jbrodye> Date: 2013-11-24 (Sun, 24 Nov 2013) Changed paths: M src/struct/TextManager.dm Log Message: ----------- Adds xkcd quicklink, removes condo quicklink. Commit: d0cc011ac1d2ad6b5d93f771167c7b5fc508d581 https://github.com/Stephen001/Chatters/commit/d0cc011ac1d2ad6b5d93f771167c7b5fc508d581 Author: Jonathon Emerson <jbrodye> Date: 2013-11-24 (Sun, 24 Nov 2013) Changed paths: M src/struct/TextManager.dm Log Message: ----------- Adds smbc: and cyanide: quicklinks. Commit: 9f8d2076d17c39f7279c57b98f382ba2efa79ad9 https://github.com/Stephen001/Chatters/commit/9f8d2076d17c39f7279c57b98f382ba2efa79ad9 Author: Jonathon Emerson <jbrodye> Date: 2013-11-24 (Sun, 24 Nov 2013) Changed paths: M src/struct/chatter.dm Log Message: ----------- Added /note verb for ops. This verb lets you quickly put a message in the log file. For example, right after banning someone. Commit: 1ea15775d16d50a2edab954d519a833088713d30 https://github.com/Stephen001/Chatters/commit/1ea15775d16d50a2edab954d519a833088713d30 Author: Jonathon Emerson <jbrodye> Date: 2013-12-03 (Tue, 03 Dec 2013) Changed paths: M src/struct/ChatterManager.dm M src/struct/chatter.dm Log Message: ----------- Fixed issue with ChatterManager.getByKey(). This issue allowed the rule blocking ops from being banned, muted, and kicked by other ops to be bypassed. Commit: b1275af370e3855156a1130326f36ed5db5851bf https://github.com/Stephen001/Chatters/commit/b1275af370e3855156a1130326f36ed5db5851bf Author: Stephen Badger <stephen.badger@xxxxxxxxx> Date: 2013-12-05 (Thu, 05 Dec 2013) Changed paths: M rsc/default.dmf M src/struct/Bot.dm M src/struct/ChatterManager.dm M src/struct/TextManager.dm M src/struct/chatter.dm Log Message: ----------- Merge remote-tracking branch 'koil/master' Conflicts: src/struct/TextManager.dm Compare: https://github.com/Stephen001/Chatters/compare/659cc74ee709...b1275af370e3