diff --git a/GitCandy/App_GlobalResources/SR.designer.cs b/GitCandy/App_GlobalResources/SR.designer.cs index f6c61c9..0993326 100644 --- a/GitCandy/App_GlobalResources/SR.designer.cs +++ b/GitCandy/App_GlobalResources/SR.designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34011 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -367,7 +367,7 @@ public static string Account_UsersFound { } /// - /// Looks up a localized string similar to Git Candy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. + /// Looks up a localized string similar to GitCandy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. /// ///Visit a demo on [http://gitcandy.com]() /// @@ -1391,7 +1391,7 @@ public static string Shared_Add { } /// - /// Looks up a localized string similar to Git Candy. + /// Looks up a localized string similar to GitCandy. /// public static string Shared_AppTitle { get { @@ -1589,7 +1589,7 @@ public static string Shared_Teams { } /// - /// Looks up a localized string similar to {0} - Git Candy. + /// Looks up a localized string similar to {0} - GitCandy. /// public static string Shared_TitleFormat { get { diff --git a/GitCandy/App_GlobalResources/SR.fr.resx b/GitCandy/App_GlobalResources/SR.fr.resx index c0d9a73..50ee5b5 100644 --- a/GitCandy/App_GlobalResources/SR.fr.resx +++ b/GitCandy/App_GlobalResources/SR.fr.resx @@ -214,7 +214,7 @@ {0} utilisateur (s) trouvé(s) - Git Candy© est une plate-forme [Git](http://git-scm.com/documentation) de contrôle de version distribué, basé sur une application ASP.NET MVC, qui prend en charge les dépôts publics et privés. Vous pouvez créer et collaborer votre dépôt avec votre équipe n'importe quand n'importe où sans aucune limite. + GitCandy© est une plate-forme [Git](http://git-scm.com/documentation) de contrôle de version distribué, basé sur une application ASP.NET MVC, qui prend en charge les dépôts publics et privés. Vous pouvez créer et collaborer votre dépôt avec votre équipe n'importe quand n'importe où sans aucune limite. Visitez une démo sur [http://gitcandy.com]() @@ -524,7 +524,7 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy]() Ajouter - Git Candy + GitCandy Retour @@ -587,7 +587,7 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy]() Équipes - {0} - Git Candy + {0} - GitCandy Utilisateurs diff --git a/GitCandy/App_GlobalResources/SR.resx b/GitCandy/App_GlobalResources/SR.resx index 8ee5f8c..bfdb23e 100644 --- a/GitCandy/App_GlobalResources/SR.resx +++ b/GitCandy/App_GlobalResources/SR.resx @@ -220,7 +220,7 @@ SSH - Git Candy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. + GitCandy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. Visit a demo on [http://gitcandy.com]() @@ -563,7 +563,7 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy]() Add - Git Candy + GitCandy Back @@ -629,7 +629,7 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy]() Teams - {0} - Git Candy + {0} - GitCandy Users diff --git a/GitCandy/App_GlobalResources/SR.zh-Hans.resx b/GitCandy/App_GlobalResources/SR.zh-Hans.resx index bd80dbf..95bb31a 100644 --- a/GitCandy/App_GlobalResources/SR.zh-Hans.resx +++ b/GitCandy/App_GlobalResources/SR.zh-Hans.resx @@ -220,7 +220,7 @@ SSH - Git Candy© 是一个基于ASP.NET MVC的[Git](http://git-scm.com/documentation)分布式版本控制平台，支持公共和私有代码库。可以不受限制的创建代码库，与你的团队一块协作。 + GitCandy© 是一个基于ASP.NET MVC的[Git](http://git-scm.com/documentation)分布式版本控制平台，支持公共和私有代码库。可以不受限制的创建代码库，与你的团队一块协作。 演示地址：[http://gitcandy.com]() @@ -563,7 +563,7 @@ 添加 - Git Candy + GitCandy 返回 @@ -629,7 +629,7 @@ 团队 - {0} - Git Candy + {0} - GitCandy 用户 diff --git a/GitCandy/Filters/SmartGitAttribute.cs b/GitCandy/Filters/SmartGitAttribute.cs index 3516d93..ffc90bc 100644 --- a/GitCandy/Filters/SmartGitAttribute.cs +++ b/GitCandy/Filters/SmartGitAttribute.cs @@ -84,7 +84,7 @@ protected override void HandleUnauthorizedRequest(AuthorizationContext filterCon if (controller == null || controller.Token == null) { filterContext.HttpContext.Response.Clear(); - filterContext.HttpContext.Response.AddHeader("WWW-Authenticate", "Basic realm=\"Git Candy\""); + filterContext.HttpContext.Response.AddHeader("WWW-Authenticate", "Basic realm=\"GitCandy\""); filterContext.Result = new HttpUnauthorizedResult(); } else diff --git a/GitCandy/Properties/AssemblyInfo.cs b/GitCandy/Properties/AssemblyInfo.cs index 3df19aa..f8d79d8 100644 --- a/GitCandy/Properties/AssemblyInfo.cs +++ b/GitCandy/Properties/AssemblyInfo.cs @@ -9,7 +9,7 @@ [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("GitCandy")] -[assembly: AssemblyCopyright("Copyright © 2013-2014")] +[assembly: AssemblyCopyright("Copyright © 2013-2016")] #if DEBUG [assembly: AssemblyConfiguration("Debug")] diff --git a/LICENSE.md b/LICENSE.md index e4b4668..583a629 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2013-2014 Aimeast +Copyright (c) 2013-2016 Aimeast Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 50a99bb..afe48b8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -## Git Candy -Git Candy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. +## GitCandy +GitCandy© is a [Git](http://git-scm.com/documentation) distributed version control platform based on ASP.NET MVC application, which supports public and private repositories. You can create and collaborate your repository with your team anytime anywhere without any limit. Visit a demo on [http://gitcandy.com](http://gitcandy.com). @@ -10,7 +10,7 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy](http://github.com * [IIS 7.0](http://www.iis.net/learn) * [.NET Framework 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653) * [ASP.NET MVC 5](http://www.asp.net/mvc/tutorials/mvc-5) -* [Git Bash](http://git-scm.com/downloads) +* [Git](http://git-for-windows.github.io/) * [Sqlite](http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki) or [Sql Server](http://www.microsoft.com/en-us/sqlserver/get-sql-server/try-it.aspx) --- @@ -22,9 +22,13 @@ Get source and fork me on [http://github.com/Aimeast/GitCandy](http://github.com * Update connection string in `Web.config` file * Prepare two folders for storage `Repositories` and `Cache` * Navigate to your site and login with default username `admin`, password `gitcandy` -* Go to `Settings` page for set folders path of `Repositories`, `Cache` and `git.exe` +* Go to `Settings` page for set folders path of `Repositories`, `Cache` and `git-core` * You are recommended to set `` in `Web.config` +##### *note* +* The `Repositories` or `Cache` path looks like `x:\Repos` or `x:\Cache` +* The `git-core` path looks like `x:\PortableGit\libexec\git-core` or `x:\PortableGit\mingw64\libexec\git-core` + --- ### Thanks for (alphabet) * [ASP.NET MVC](http://aspnetwebstack.codeplex.com/) @ [Apache License 2.0](http://aspnetwebstack.codeplex.com/license) diff --git a/README.zh-cn.md b/README.zh-cn.md new file mode 100644 index 0000000..7499445 --- /dev/null +++ b/README.zh-cn.md @@ -0,0 +1,49 @@ +## GitCandy +GitCandy© 是一个基于 ASP.NET MVC 的 [Git](http://git-scm.com/documentation) 版本控制服务端，支持公有和私有代码库，可不受限制的创建代码代码库，随时随地的与团队进行协作。 + +演示网站：[http://gitcandy.com](http://gitcandy.com) + +源代码： [http://github.com/Aimeast/GitCandy](http://github.com/Aimeast/GitCandy) + +--- +### 系统要求 +* [IIS 7.0](http://www.iis.net/learn) +* [.NET Framework 4.5](http://www.microsoft.com/en-us/download/details.aspx?id=30653) +* [ASP.NET MVC 5](http://www.asp.net/mvc/tutorials/mvc-5) +* [Git](http://git-for-windows.github.io/) +* [Sqlite](http://system.data.sqlite.org/index.html/doc/trunk/www/downloads.wiki) 或 [Sql Server](http://www.microsoft.com/en-us/sqlserver/get-sql-server/try-it.aspx) + +--- +### 安装 +* 下载最新[发布](http://github.com/Aimeast/GitCandy/releases)的版本或自己编译最新的[dev](http://github.com/Aimeast/GitCandy/dev)分支源码 +* 在IIS创建一个站点，并把二进制文件和资源文件复制到站点目录 +* 如果用了 Visual Studio 的发布功能，还要复制`GitCandy\bin\[NativeBinaries & x86 & x64]`文件夹到站点目录 +* 用`/Sql/Create.[Sqlite | MsSql].sql`脚本创建一个数据库。如果创建的是Sqlite数据库，还需把数据库文件复制到`App_Data`文件夹 +* 更新`Web.config`文件的数据库连接串 +* 准备两个文件夹分别用来存储`代码库`和`缓存` +* 打开新建的站点，默认登录用户名是`admin`，密码是`gitcandy` +* 转到`设置`页面，分别设置`代码库`，`缓存`和`git-core`的路径 +* 推荐在`Web.config`设置`` + +##### *注* +* `代码库`和`缓存`路径示例：`x:\Repos`，`x:\Cache` +* `git-core`路径示例：`x:\PortableGit\libexec\git-core`，`x:\PortableGit\mingw64\libexec\git-core` + +--- +### 鸣谢 (按字母序) +* [ASP.NET MVC](http://aspnetwebstack.codeplex.com/) @ [Apache License 2.0](http://aspnetwebstack.codeplex.com/license) +* [Bootstrap](http://github.com/twbs/bootstrap) @ [MIT License](http://github.com/twbs/bootstrap/blob/master/LICENSE) +* [Bootstrap-switch](http://github.com/nostalgiaz/bootstrap-switch) @ [Apache License 2.0](http://github.com/nostalgiaz/bootstrap-switch/blob/master/LICENSE) +* [EntityFramework](http://entityframework.codeplex.com/) @ [Apache License 2.0](http://entityframework.codeplex.com/license) +* [Highlight.js](http://github.com/isagalaev/highlight.js) @ [New BSD License](http://github.com/isagalaev/highlight.js/blob/master/LICENSE) +* [jQuery](http://github.com/jquery/jquery) @ [MIT License](http://github.com/jquery/jquery/blob/master/MIT-LICENSE.txt) +* [LibGit2Sharp](http://github.com/libgit2/libgit2sharp) @ [MIT License](http://github.com/libgit2/libgit2sharp/blob/master/LICENSE.md) +* [marked](http://github.com/chjj/marked) @ [MIT License](http://github.com/chjj/marked/blob/master/LICENSE) +* [Microsoft.Composition (MEF2)](http://mef.codeplex.com/) @ [Microsoft Public License](http://mef.codeplex.com/license) +* [Newtonsoft.Json](http://json.codeplex.com/) @ [MIT License](http://json.codeplex.com/license) +* [SharpZipLib](http://github.com/icsharpcode/SharpZipLib) @ [GPL License v2](http://github.com/icsharpcode/SharpZipLib/blob/master/doc/COPYING.txt) +* [ZeroClipboard](http://github.com/zeroclipboard/zeroclipboard) @ [MIT License](http://github.com/zeroclipboard/zeroclipboard/blob/master/LICENSE) + +--- +### 协议 +MIT 协议