Commit Graph

5821 Commits

Author SHA1 Message Date
Unknwon 05a33107c9 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-02 13:01:09 -04:00
Unknwon 8b0e815d98 Fix #425 2014-09-02 13:01:02 -04:00
无闻 f19fc230d4 Merge pull request #423 from m0sth8/fix-xcsrf-token
Set headers in js and go files to X-Csrf-Token
2014-09-02 12:30:44 -04:00
Vyacheslav Bakhmutov 9476e58de9 Set headers in js and go files to X-Csrf-Token 2014-09-02 22:48:40 +07:00
无闻 9ddd545473 Merge pull request #421 from arpemedia/dev
Fix grammar error in German translation
2014-09-02 10:49:53 -04:00
Arpemedia 0730ec4087 Fix grammar error in German translation 2014-09-02 13:46:18 +02:00
Unknwon 8826186c30 Merge branch 'master' of github.com:gogits/gogs into dev 2014-09-02 07:18:01 -04:00
无闻 565974f8f7 Merge pull request #420 from gogits/revert-419-master
Revert "Fix a gramma error and translate two additional strings (German ...
2014-09-02 07:15:35 -04:00
无闻 399887cc0e Revert "Fix a gramma error and translate two additional strings (German translation)" 2014-09-02 07:13:13 -04:00
无闻 fd5ea4b79e Merge pull request #419 from arpemedia/master
Fix a gramma error and translate two additional strings (German translation)
2014-09-02 07:13:09 -04:00
Unknwon 830efc90da update docs and mirror bug fix 2014-09-02 07:11:39 -04:00
Arpemedia 8e0aeb4ad5 Fix a gramma error and translate two additional strings 2014-09-02 09:20:39 +02:00
lunnyxiao c80f0232f1 Merge branch 'master' into dev 2014-09-02 11:59:39 +08:00
lunnyxiao 1240fef0ca bug fixed for migrate and fixed #141 2014-09-02 11:57:06 +08:00
无闻 85f375433d Merge pull request #416 from compressed/compare_commits
Add commit compare functionality
2014-09-01 20:02:34 -07:00
Christopher Brickley af0741da07 handle initial commit for compareUrl 2014-09-01 19:19:56 -04:00
Christopher Brickley 00a864e693 add commit compare functionality 2014-09-01 14:56:19 -04:00
无闻 d55c5b9e28 Merge pull request #410 from tstorch/docker_mix_match
Docker mix and match setup
2014-09-01 10:53:51 +08:00
无闻 bc67c34bea Merge pull request #409 from tstorch/translation-03
German laguage update
2014-09-01 10:53:18 +08:00
Tristan Storch d1a2228f1c Docker mix and match setup
Rewrite of the docker setup. Now uses fig to manage containers and container
linkage. The base is a block based mix and match, which will give you the
possibility to easily test all configurations.
2014-08-31 21:00:19 +02:00
Tristan Storch 7b310b1abb German laguage update
What has been done:

  - standardized expressions
  - shorter and clearer
  - minor corrections (orthography)
2014-08-31 19:29:03 +02:00
无闻 2886eb76b6 Merge pull request #408 from fanningert/patch-1
Add new translation keys
2014-09-01 00:50:52 +08:00
fanningert 1858d2066b Add new translation keys 2014-08-31 18:48:24 +02:00
无闻 3e740278bd Merge pull request #407 from fanningert/patch-3
Update locale_de-DE.ini and correct a wrong translation
2014-09-01 00:36:23 +08:00
无闻 9611f29966 Merge pull request #402 from fanningert/patch-2
Add missing dependencies
2014-09-01 00:34:06 +08:00
Unknwon c5ce33047e Mirror fix and hide missing pages for 0.5 release 2014-09-01 00:33:40 +08:00
fanningert da8dba53a7 Removed not needed deps
Removed
* github.com/gogits/cache
* github.com/gogits/session
2014-08-31 18:28:59 +02:00
Unknwon bf5595f9a0 Merge branch 'dev' of github.com:gogits/gogs into dev 2014-09-01 00:16:14 +08:00
无闻 1ed67798ac Merge pull request #379 from compressed/slack
Slack Support
2014-09-01 00:12:58 +08:00
Unknwon 36661f53e6 Update deps 2014-09-01 00:12:37 +08:00
fanningert 801fc536f2 Update locale_de-DE.ini 2014-08-31 18:05:26 +02:00
fanningert 99e009665c Update locale_de-DE.ini 2014-08-31 18:04:15 +02:00
fanningert 72ec3e8da0 Update locale_de-DE.ini 2014-08-31 18:03:28 +02:00
Christopher Brickley 2bce24068d add Slack API webhook support 2014-08-31 12:01:59 -04:00
fanningert 9554ad514e Change "Repositories" to "Repositorys" 2014-08-31 17:59:22 +02:00
fanningert df3621e050 Update locale_de-DE.ini and correct a wrong translation 2014-08-31 17:30:53 +02:00
无闻 5e6091a30a Merge pull request #405 from fanningert/patch-1
Update german translation with PR #404
2014-08-31 22:10:54 +08:00
fanningert 80447f1168 Update german translation with PR #404 2014-08-31 16:10:02 +02:00
无闻 bc1a578914 Merge pull request #401 from fanningert/patch-1
Update locale_de-DE.ini
2014-08-31 22:06:05 +08:00
fanningert cc9a84b83a Add missing dependencies 2014-08-31 15:21:56 +02:00
fanningert c30063eefb Update locale_de-DE.ini 2014-08-31 15:18:29 +02:00
无闻 ae2f4866d0 Merge pull request #400 from deringer/dev
Add missing 'new migration' link
2014-08-31 21:07:14 +08:00
Unknwon 676bd764fa UI: SSH/HTTPS address switch and copy 2014-08-31 21:03:16 +08:00
Michael Dyrynda 1bbf4c9768 Add missing 'new migration' link
Addresses issue #399
2014-08-31 21:06:50 +09:30
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