Commit Graph

1677 Commits

Author SHA1 Message Date
Unknwon
7e36bf448d Merge branch 'master' of github.com:gogits/gogs into dev
Conflicts:
	dockerfiles/README.md
2014-08-31 15:11:55 +08:00
无闻
d78008b546 Merge pull request #396 from fanningert/patch-1
Update locale_zh-CN.ini
2014-08-31 11:30:13 +08:00
无闻
1d6df04ecb Merge pull request #397 from fanningert/patch-2
Update locale_en-US.ini
2014-08-31 11:30:02 +08:00
无闻
084dce53ac Merge pull request #398 from fanningert/patch-3
Update locale_de-DE.ini
2014-08-31 11:28:13 +08:00
fanningert
5cdecd74c7 Update locale_de-DE.ini 2014-08-30 22:29:23 +02:00
fanningert
85e01bfe01 Update locale_en-US.ini
Double entry of "config.log_config"
2014-08-30 22:28:43 +02:00
fanningert
73ddf401ee Update locale_zh-CN.ini
Double entry of "config.log_config"
2014-08-30 22:28:03 +02:00
无闻
4c8ef90157 Merge pull request #394 from tstorch/trailing_white_spaces
Removed trailing white spaces
2014-08-30 06:37:04 -07:00
Tristan Storch
69e332f432 Removed trailing white spaces
Removed trailing whitespaces with

```sh
for file in `grep -r " $" * | cut -d : -f 1 | sort | uniq | grep -v " "`; do sed -i 's/[ \t]*$//' $file; done
```

and some handwork.
2014-08-30 15:12:53 +02:00
Unknwon
9bc63bda7d Finish all new admin pages. 2014-08-30 20:49:51 +08:00
无闻
66d51804c9 Merge pull request #391 from fanningert/patch-1
Update locale_en-US.ini
2014-08-30 04:30:35 -07:00
无闻
444032664b Merge pull request #392 from fanningert/patch-2
Update locale_de-DE.ini
2014-08-30 04:30:20 -07:00
fanningert
272d387c0c Update locale_de-DE.ini 2014-08-30 12:48:14 +02:00
fanningert
32760ba49d Update locale_en-US.ini 2014-08-30 12:47:51 +02:00
无闻
08dbf08d39 Merge pull request #386 from fanningert/patch-2
Update locale_de-DE.ini
2014-08-29 05:53:48 -07:00
Unknwon
d2aff9a46a Continue working on new admin pages 2014-08-29 20:50:43 +08:00
fanningert
56b735f67b Update locale_de-DE.ini
Add missing translation keys and add some german translations
2014-08-29 14:25:29 +02:00
Unknwon
904bf1a50b Add migrate repo API 2014-08-29 17:31:53 +08:00
Unknwon
8829174574 Finish new admin users pages 2014-08-29 15:32:52 +08:00
无闻
6558990e3a Merge pull request #384 from fanningert/patch-1
Update locale_de-DE.ini
2014-08-28 20:56:42 -07:00
lunnyxiao
a6ec6def8d Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-29 11:25:03 +08:00
lunnyxiao
c40e815763 add migrate api 2014-08-29 11:24:37 +08:00
fanningert
c4a33892d3 Update locale_de-DE.ini
Add missing translation of "locale_en-US.ini"
2014-08-28 19:12:30 +02:00
Unknwon
1aec1a2dda Finish new admin dashboard 2014-08-28 22:29:00 +08:00
Unknwon
81287ba022 Mirror issue fix 2014-08-27 22:40:45 +08:00
Unknwon
9baf2b38d0 Bug fix on organization 2014-08-27 16:39:36 +08:00
Unknwon
50de06056b Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-26 18:11:27 +08:00
Unknwon
74b31566cf Finsih add/remove repo in organization 2014-08-26 18:11:15 +08:00
无闻
66c9c86219 Merge pull request #371 from m0sth8/bufix_migrate_all_branches
Migrate all branches and tags
2014-08-25 19:38:41 -07:00
无闻
ce55807542 Merge pull request #372 from andmarios/dev
Remove newline characters from ssh key before processing it.
2014-08-25 19:13:58 -07:00
Marios Andreopoulos
510d5a5d74 import strings 2014-08-25 21:07:08 +03:00
Marios Andreopoulos
cd0ddcfa01 fix typo 2014-08-25 20:35:23 +03:00
Marios Andreopoulos
3d79f59671 fix wrong variable name 2014-08-25 20:20:44 +03:00
Marios Andreopoulos
b40922f4d4 remove extra comma 2014-08-25 20:07:47 +03:00
Marios Andreopoulos
12639c577f Remove newline characters from ssh key before processing it.
Fixes issue #370: https://github.com/gogits/gogs/issues/370
2014-08-25 18:54:50 +03:00
Vyacheslav Bakhmutov
95a594d75a Migrate all branches and tags 2014-08-25 20:28:14 +07:00
Unknwon
f2c263c54f fix #367 2014-08-25 09:45:39 +08:00
Unknwon
21a1b8e5a3 Finish new edit team page, add member to team 2014-08-24 21:09:05 +08:00
Lunny Xiao
03c6a395aa Merge pull request #365 from choas/patch-1
update dockerfiles README.md
2014-08-24 20:42:50 +08:00
Lars Gregori
1661421a65 update dockerfiles README.md
typo
2014-08-24 12:39:01 +02:00
Unknwon
e325c8499a Fix and set git config 2014-08-23 23:58:56 +08:00
Unknwon
97a373f5e7 Fix #362, update code with upstream 2014-08-23 21:13:55 +08:00
Unknwon
b765229a6d Fix code style 2014-08-23 20:30:29 +08:00
Unknwon
e0a2d23baf Merge branch 'dev' of github.com:gogits/gogs into dev 2014-08-23 20:24:31 +08:00
Unknwon
fa60502a70 Working on organization pages 2014-08-23 20:24:02 +08:00
lunnyxiao
97fb62f51e auto detect text file encode and convert to utf8 2014-08-20 16:34:48 +08:00
Unknwon
a60edbe88c Add/remove member need add/remove access to repositories as well 2014-08-16 16:58:32 +08:00
Unknwon
bba707de36 Finish team list, create new team, join/leave team page 2014-08-16 16:21:17 +08:00
Unknwon
78add502d7 Finish new organization members and invitation page 2014-08-15 23:37:33 +08:00
Unknwon
36b4c57ff1 Finish new organization members and invitation page 2014-08-15 18:29:41 +08:00