Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Massive tab and trailing space cleanup | Melanie Thielker | 2017-01-05 | 5 | -17/+17 |
| | |||||
* | Fix the previous commit | Melanie Thielker | 2016-11-19 | 1 | -2/+51 |
| | |||||
* | reduce useraccouts cache time | UbitUmarov | 2016-11-11 | 1 | -51/+2 |
| | |||||
* | Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global ↵ | Diva Canto | 2016-02-21 | 1 | -1/+1 |
| | | | | replace anymore. | ||||
* | remove a debug message | UbitUmarov | 2015-11-24 | 1 | -1/+1 |
| | |||||
* | On to 0.8.3! | Diva Canto | 2015-10-18 | 1 | -1/+1 |
| | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs | ||||
* | bad merge? | UbitUmarov | 2015-09-01 | 4 | -22/+107 |
|\ | |||||
| * | Merge branch 'master' into careminster | Melanie | 2013-10-06 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | ||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 1 | -0/+33 |
| |\ \ \ \ | |||||
| * | | | | | fix vs2010 build | UbitUmarov | 2012-08-16 | 3 | -3/+4 |
| | | | | | | |||||
| * | | | | | Add a real_id field to the login response if impersonation is used. The wrapper | Melanie | 2012-08-15 | 3 | -3/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | script needs this for proper logging. | ||||
| * | | | | | Fix impersonation, it got broken in a merge | Melanie | 2012-06-01 | 1 | -7/+10 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -1/+1 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| * \ \ \ \ \ | Merge branch 'master' into bigmerge | Melanie | 2011-11-11 | 1 | -0/+7 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | ||||
| * \ \ \ \ \ \ | Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+45 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs | ||||
| * \ \ \ \ \ \ \ | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -3/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 2 | -4/+129 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 3 | -7/+68 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | ||||
* | | | | | | | | | | | Updated all occurrences of AssemblyVersion("0.8.1.*") to ↵ | Diva Canto | 2015-04-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssemblyVersion("0.8.2.*") | ||||
* | | | | | | | | | | | Change assembly versions to 0.8.1 | Justin Clark-Casey (justincc) | 2014-06-17 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |||||
* | | | | | | | | | | Bump OPenSimulator version and assembly versions up to 0.8.0 Dev | Justin Clark-Casey (justincc) | 2013-10-04 | 1 | -1/+1 |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
* | | | | | | | | | Deleted all AssemblyFileVersion directives | Diva Canto | 2013-02-19 | 1 | -1/+1 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | Bump version and assembly version numbers from 0.7.5 to 0.7.6 | Justin Clark-Casey (justincc) | 2013-02-05 | 1 | -1/+1 |
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force. | ||||
* | | | | | | | The last few AssemblyInfos. Finished! | Diva Canto | 2012-11-14 | 1 | -0/+33 |
| | | | | | | | |||||
* | | | | | | | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Revert "Fix authentication for OpenID provider" | BlueWall | 2012-02-29 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code. | ||||
* | | | | | | | Fix authentication for OpenID provider | BlueWall | 2012-02-29 | 1 | -2/+2 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Supply correct parameters to detailed authentication login fail message | Justin Clark-Casey (justincc) | 2012-02-04 | 1 | -1/+1 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Make log messages on authentication failure more explicit | Justin Clark-Casey (justincc) | 2011-11-11 | 1 | -13/+26 |
| |_|_|/ |/| | | | |||||
* | | | | Add optional getauthinfo and setauthinfo authentication service calls. | Justin Clark-Casey (justincc) | 2011-10-24 | 1 | -1/+46 |
| |_|/ |/| | | | | | | | | | | | These are disabled by default, as before. Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default) These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey | ||||
* | | | minor: remove mono compiler warning | Justin Clark-Casey (justincc) | 2011-08-22 | 1 | -3/+1 |
| |/ |/| | |||||
* | | Rename some member fields to standard m_ OpenSim code convention | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -8/+8 |
| | | |||||
* | | add header file | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+28 |
| | | |||||
* | | Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks ↵ | Justin Clark-Casey (justincc) | 2011-03-26 | 1 | -1/+4 |
| | | | | | | | | dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. | ||||
* | | Removing hard-coded plugin loading in favour of direct class instantiation | SignpostMarv Martin | 2011-03-26 | 1 | -6/+5 |
| | | |||||
* | | Altering log feedback | SignpostMarv Martin | 2011-03-26 | 2 | -14/+17 |
| | | |||||
* | | Fixing bug that occurs when using web login- the result was not checked | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | |||||
* | | Making combined auth service re-use the existing auth services instead of ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -21/+19 |
| | | | | | | | | | | | | duplicating code Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
* | | InfoFormat > DebugFormat | SignpostMarv Martin | 2011-03-26 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
* | | Adding a combined auth service, allowing users to login with either web ↵ | SignpostMarv Martin | 2011-03-26 | 1 | -0/+65 |
| | | | | | | | | | | | | login or password Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
* | | WebkeyAuthenticationService is now no longer a stub! | SignpostMarv Martin | 2011-03-26 | 1 | -5/+35 |
| | | | | | | | | Signed-off-by: SignpostMarv Martin <me@signpostmarv.name> | ||||
* | | Fix bug introduced by Query Access. The response does not come in a packaged ↵ | Diva Canto | 2011-02-16 | 1 | -1/+1 |
|/ | | | | | | _Result field, it comes as simple OSDMap with 2 fields in it. Also in this commit: comment out irrelevant debug message on AuthService. | ||||
* | get TestSaveIarV0_1() working again by setting up an ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 2 | -2/+2 |
| | | | | | | OpenSim.Data.Null.UserAuthenticationData plugin additional tweaks to get this working properly | ||||
* | Putting it back to protected; Melanie doesn't like it to be public. | Diva Canto | 2010-04-27 | 1 | -1/+1 |
| | |||||
* | Changed GetToken from protected to public. This is not exposed at the interface. | Diva Canto | 2010-04-27 | 1 | -1/+1 |
| | |||||
* | Better error handling on PasswordAuthenticationService | Diva Canto | 2010-03-02 | 1 | -14/+18 |
| | |||||
* | SQLite connector better, but access to tables still doesn't work. | Diva Canto | 2010-02-20 | 1 | -4/+9 |
| | |||||
* | * Added SetPassword to IAuthenticationService. | Diva Canto | 2010-01-09 | 1 | -3/+26 |
| | | | | | * Added create user command to UserAccountService. Works. * Deleted create user command from OpenSim. |