Commit Graph

1314 Commits

Author SHA1 Message Date
Justin Nuß
91480f3791 Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
	modules/base/tool.go
2014-07-26 11:23:58 +02:00
Unknwon
35c75f06a0 Fix test case 2014-07-26 03:05:56 -04:00
Unknwon
545d320648 Docs fix 2014-07-26 03:02:46 -04:00
Unknwon
5c4bc3c848 Huge updates!!!!! Be careful to merge!!!! 2014-07-26 02:28:04 -04:00
Unknwon
3f38ff6c09 Merge branch 'dev' of github.com:gogits/gogs into dev
Conflicts:
	templates/status/500.tmpl
2014-07-26 00:25:43 -04:00
Unknwon
8dd07c0ddd New UI merge in progress 2014-07-26 00:24:27 -04:00
无闻
76f7ad45e6 Merge pull request #329 from ciarand/feature/update-docs
Update the Docker instructions in the README
2014-07-26 00:21:28 -04:00
无闻
872590d8b5 Merge pull request #330 from ciarand/reword-language-on-error-pages
Reword the language on the error page templates
2014-07-26 00:21:07 -04:00
Ciaran Downey
7921e60f30 Change "an error is occurred" to "has occurred" 2014-07-25 20:51:05 -07:00
Ciaran Downey
0db84e4f63 Update the Docker instructions in the README 2014-07-25 20:13:17 -07:00
无闻
0a739cf9ac Merge pull request #325 from nuss-justin/dev
Remove 'None yet' message when adding first label to issue.
2014-07-25 20:58:31 -04:00
无闻
3e23241f58 Merge pull request #327 from ciarand/dev
Update the Docker build's Go source and version
2014-07-25 19:13:05 -04:00
Ciaran Downey
aea2b54c99 Use the official Go source, follow redirects 2014-07-25 12:59:10 -07:00
Ciaran Downey
cf3021ecca Add the set -e option to dockerfiles/build.sh 2014-07-25 12:59:02 -07:00
无闻
5ed5912ef5 Merge pull request #326 from nuss-justin/feature/keep-text
Save comment/issue drafts in sessionStorage.
2014-07-25 15:05:45 -04:00
Justin Nuß
09cb8c67cb Save comment/issue drafts in sessionStorage. 2014-07-25 20:56:17 +02:00
Justin Nuß
a03a1e87e9 Remove 'None yet' message when adding first label to issue. 2014-07-25 20:15:58 +02:00
无闻
aad91d4b21 Merge pull request #324 from nuss-justin/issue/318
Fix #318. Issues attachments: allow Select Attachments to append files
2014-07-25 13:35:25 -04:00
Justin Nuß
f0da8a68c2 Remove debug comment. 2014-07-25 15:47:42 +02:00
Justin Nuß
12fb42de5a Fix IE bug and show errors. 2014-07-25 11:13:42 +02:00
Justin Nuß
4e2477a1a5 Fix #318. Switch to JS(ON) implementation for issue/comment creation. 2014-07-25 10:47:37 +02:00
Justin Nuß
f7617997ce Ignore EOF error when parsing form. 2014-07-25 10:18:42 +02:00
无闻
204ef41b09 Merge pull request #322 from nuss-justin/issue/321
Fix #321. Allow empty comments as long as there are attachments.
2014-07-25 02:41:22 -04:00
Justin Nuß
dedb156d4a Fix #321. Allow empty comments as long as there are attachments. 2014-07-25 08:01:34 +02:00
无闻
30d7397f97 Merge pull request #314 from nuss-justin/issue/312
Fix #312. Quote file names of attachments.
2014-07-25 01:14:33 -04:00
无闻
0f3414ec39 Merge pull request #315 from nuss-justin/issue/313
Fix #313. Repair broken image extension detection regex.
2014-07-25 01:14:02 -04:00
无闻
2032080d86 Merge pull request #320 from acusti/patch-2
Fix #319 (user not-logged in error)
2014-07-25 01:10:52 -04:00
Andrew Patton
8ccde45c5f Fix #319 (user not-logged in error) 2014-07-24 18:23:46 -04:00
Justin
eafa365453 Fix #313. Repair broken image extension detection regex. 2014-07-24 23:19:21 +02:00
Justin
ad7beb78d0 Fix #312. Quote file names of attachments. 2014-07-24 23:13:35 +02:00
Justin Nuß
835e85b5ce Fix #281. Add mouse-over precise time and on-click switch listener. 2014-07-24 22:31:59 +02:00
无闻
c4eeb803e1 Merge pull request #310 from nuss-justin/issue/303
Fix #303. Specify updated columns explicitly.
2014-07-24 15:26:04 -04:00
Justin Nuß
3e7e9ee289 Fix #303. Specify updated columns explicitly. 2014-07-24 20:07:07 +02:00
无闻
87855d42a0 Merge pull request #309 from nuss-justin/trello/244
[Trello#244] Mention all members of team by mention team name
2014-07-24 13:25:00 -04:00
Justin Nuß
620c0ef297 Merge branch 'dev' of https://github.com/gogits/Gogs into trello/244 2014-07-24 19:15:35 +02:00
Justin Nuß
cbcd08aa17 Mention organisation users when organisation gets mentioned 2014-07-24 19:15:31 +02:00
Unknwon
c20f5dc2ea Merge branch 'dev' of github.com:gogits/gogs into dev 2014-07-24 12:49:43 -04:00
Unknwon
a41a1fe60d Mirror fix 2014-07-24 12:49:40 -04:00
无闻
da0240aacd Merge pull request #307 from nuss-justin/feature/attachments
Feature: Ability to attach files to issues (attachments)
2014-07-24 12:47:55 -04:00
Justin Nuß
9a7349ce64 Change Attachment.Path to TEXT (no maximum size) 2014-07-24 17:02:42 +02:00
Justin Nuß
4d702eb345 Allow disabling uploads 2014-07-24 15:51:40 +02:00
Justin Nuß
9df99681fb Update default config with comments 2014-07-24 15:23:56 +02:00
Justin Nuß
bfe5b86004 Add file upload for attachments 2014-07-24 15:19:59 +02:00
无闻
3db84c8893 Merge pull request #306 from nuss-justin/dev
Fix double decrement of issue counter
2014-07-24 08:21:28 -04:00
Justin Nuß
70b0023b82 Fix double decrement of issue counter 2014-07-24 13:58:39 +02:00
Justin Nuß
43e5de7f83 Show attachments in issues/comments and add preview for images 2014-07-24 13:50:03 +02:00
Justin Nuß
fa1db64ff0 Add files/ directory to .gitignore 2014-07-24 13:49:27 +02:00
Justin Nuß
ef1cbcd761 Allow admins to delete attachments. 2014-07-24 12:39:03 +02:00
Justin Nuß
1129f756c8 Fix missing . (dot) in issue templates 2014-07-24 12:37:26 +02:00
Justin Nuß
967856f36e Merge branch 'dev' into feature/attachments
Conflicts:
	models/issue.go
	routers/repo/issue.go
2014-07-24 12:29:37 +02:00