summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-13 03:39:18 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-13 03:39:18 -0400
commit57bc2d1ca0bfc3ba90e6d85309dba39415c6db73 (patch)
tree8d452408dbc3f89ac3a0a393ad5eadd80370f167 /conf
parentadedd9181c07ed926bf5835623293df4fcc706d2 (diff)
downloadgitea-57bc2d1ca0bfc3ba90e6d85309dba39415c6db73.tar.gz
gitea-57bc2d1ca0bfc3ba90e6d85309dba39415c6db73.zip
Add update user profile back end, add new gitignore and license, add template data to public profile page
Diffstat (limited to 'conf')
-rw-r--r--conf/app.ini4
-rw-r--r--conf/gitignore/C18
-rw-r--r--conf/license/BSD (3-Clause) License27
3 files changed, 47 insertions, 2 deletions
diff --git a/conf/app.ini b/conf/app.ini
index fcfbe9bc2d..aa42129cce 100644
--- a/conf/app.ini
+++ b/conf/app.ini
@@ -3,8 +3,8 @@ RUN_USER = lunny
[repository]
ROOT = /Users/lunny/git/gogs-repositories
-LANG_IGNS=Google Go
-LICENSES=Apache v2 License
+LANG_IGNS=Google Go|C
+LICENSES=Apache v2 License|BSD (3-Clause) License
[server]
HTTP_ADDR =
diff --git a/conf/gitignore/C b/conf/gitignore/C
new file mode 100644
index 0000000000..e7a909e4c6
--- /dev/null
+++ b/conf/gitignore/C
@@ -0,0 +1,18 @@
+# Object files
+*.o
+*.ko
+
+# Libraries
+*.lib
+*.a
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app \ No newline at end of file
diff --git a/conf/license/BSD (3-Clause) License b/conf/license/BSD (3-Clause) License
new file mode 100644
index 0000000000..3af16b0724
--- /dev/null
+++ b/conf/license/BSD (3-Clause) License
@@ -0,0 +1,27 @@
+Copyright (c) 2014
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+* Neither the name of the {organization} nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file