Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 1 | -3/+62 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 4 | -11/+9 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 1 | -50/+122 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-09-01 | 1 | -0/+220 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-08-13 | 1 | -1/+0 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-29 | 3 | -34/+24 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-30 | 2 | -15/+26 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 1 | -2/+4 | |
| | |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Remove the spammy "voice not enabled" message some viewers trigger in non voi... | Melanie Thielker | 2014-03-25 | 1 | -4/+4 | |
| * | | | | | | | | | | | Update the money framework to allow sending the new style linden "serverside ... | Melanie | 2013-05-25 | 1 | -1/+1 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster | Melanie | 2013-03-29 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 1 | -0/+1 | |
| * | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-22 | 1 | -10/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2013-03-06 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | Multiattach, part 1 | Melanie | 2013-03-05 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Revert "Output some additional data on Vivox connection errors", this logs pa... | Melanie | 2013-02-24 | 1 | -1/+1 | |
| | * | | | | | | | | | | | | Output some additional data on Vivox connection errors | Melanie | 2013-02-24 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-05 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-27 | 3 | -32/+47 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-23 | 4 | -273/+305 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-19 | 1 | -19/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-11 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 2 | -0/+216 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-11-25 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Remove a superfluous newline from help | Melanie | 2012-11-23 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 3 | -67/+77 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 3 | -0/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 4 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-12 | 4 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -2/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 3 | -8/+107 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-17 | 1 | -9/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 2 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo | Melanie | 2012-08-18 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove XML debug spam from vivox voice | Melanie | 2012-08-16 | 1 | -12/+12 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let the temp attachment module add a command to allow attaching without permi... | Melanie | 2012-08-15 | 1 | -3/+38 | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -8/+36 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -0/+126 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -25/+25 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 4 | -3/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 2 | -4/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 1 | -7/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-13 | 1 | -0/+195 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 2 | -48/+59 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-29 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 1 | -3/+14 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |