Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bad merge? | UbitUmarov | 2015-09-01 | 9 | -8/+358 |
|\ | |||||
| * | change default scopeID to UUID.Zero | UbitUmarov | 2015-08-29 | 3 | -3/+6 |
| * | add more of the v03 checks and homeURL. Sending side only for now | UbitUmarov | 2015-08-26 | 1 | -2/+14 |
| * | varregion: any conversions of use of Constants.RegionSize converted into | Robert Adams | 2015-03-29 | 2 | -2/+2 |
| * | Fix content type checking to confirm to newer core versions | Melanie Thielker | 2015-03-10 | 1 | -1/+1 |
| * | TEST**** wingridproxy detection at grid login. Untested possible not | UbitUmarov | 2014-10-24 | 1 | -3/+8 |
| * | Fix a string format | Melanie Thielker | 2014-09-24 | 1 | -1/+1 |
| * | make CreateAgent sync for logins, async for other cases | UbitUmarov | 2014-09-24 | 1 | -13/+18 |
| * | coment out stack trace at newUserConnection, add log msh at createAgent | UbitUmarov | 2014-09-24 | 1 | -2/+3 |
| * | TEST do createAgent sync, forcing grid services and other regions to wait | UbitUmarov | 2014-09-24 | 1 | -2/+7 |
| * | If GridUserService is asked for a nonexistent user, bail gracefully | Melanie Thielker | 2014-08-23 | 1 | -0/+3 |
| * | Change the map tile system to be multi-grid hosting compatible | Melanie Thielker | 2014-08-23 | 3 | -3/+19 |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 31 | -332/+875 |
| |\ | |||||
| | * | Revert "Add support for user preferences (im via email)" | Melanie | 2013-12-07 | 2 | -55/+0 |
| | * | Merge branch 'master' into careminster | Melanie | 2013-12-07 | 2 | -0/+55 |
| | |\ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2013-11-03 | 2 | -1/+25 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 3 | -1/+58 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-09-07 | 1 | -0/+33 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-08-17 | 3 | -10/+4 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-18 | 21 | -128/+50 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 1 | -7/+5 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-23 | 4 | -181/+100 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-13 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster | Melanie | 2013-06-06 | 1 | -5/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-06-04 | 2 | -0/+580 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-16 | 5 | -7/+26 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | Add forgotten file | Melanie Thielker | 2014-06-21 | 1 | -0/+249 |
| |/ / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 2 | -10/+12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-12-09 | 1 | -0/+67 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-22 | 2 | -3/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-15 | 1 | -0/+33 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-03 | 2 | -8/+56 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-26 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 1 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | Make agent creation at destination asynchronous. Failures here are pretty | Melanie | 2012-09-16 | 1 | -1/+9 |
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -0/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 9 | -74/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 1 | -1/+14 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Address map lag issue seen with non-avination viewers | Melanie | 2012-07-08 | 1 | -1/+14 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-01 | 1 | -48/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-27 | 2 | -5/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 4 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -5/+74 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -13/+59 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -11/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |