Commit Graph

1146 Commits

Author SHA1 Message Date
takezoe
6b49bd557f (refs #2)Add header which shows pull request information to the pull request detail page. 2013-08-08 02:56:59 +09:00
takezoe
c071284a56 (refs #2)Recover "New Request" button which has been removed temporary while implementing dashboard. 2013-08-08 02:06:55 +09:00
takezoe
5930cf48d5 (refs #2)Fix redirect path after sending pull request. 2013-08-08 02:04:55 +09:00
takezoe
9dd070887a (refs #2)Merge comment is displayed on the comment list (but it's not included in comment count). 2013-08-08 01:42:42 +09:00
takezoe
cf687a0f2c Add activity icons to SVG file. 2013-08-07 21:19:06 +09:00
takezoe
f5c0cfdcdd Rename functions. 2013-08-07 21:17:57 +09:00
takezoe
03e2974709 Fix activity timeline. 2013-08-07 21:12:28 +09:00
takezoe
d2373a00ea Add icon for create tag activity. 2013-08-07 21:02:35 +09:00
takezoe
e769460397 Add icons for activity. 2013-08-07 18:14:54 +09:00
takezoe
a0a284ad26 (refs #2)Fix comment to pull request activity. 2013-08-07 04:13:14 +09:00
takezoe
1ebf4276e7 (refs #2)'Pull Requests' tab in dashboard has been completed. 2013-08-07 03:31:26 +09:00
takezoe
908931b9ed (refs #2)Implementing 'Pull Requests' tab in the dashboard. 2013-08-06 22:04:09 +09:00
takezoe
50655d1ac2 (refs #2)Fix merge message for the pull request from same repository. 2013-08-06 13:29:15 +09:00
Naoki Takezoe
92e19ee19f Merge pull request #72 from takezoe/logo-icon
(refs #49)Add favicon and header logo
2013-08-05 20:33:25 -07:00
takezoe
52f3a90d18 (refs #2)Fix merged message in the comment list. 2013-08-06 12:34:28 +09:00
takezoe
11371c9e4f Update image for no image users. 2013-08-06 08:36:25 +09:00
takezoe
1b71b81953 (refs #71)Fix authentication for forking repository. 2013-08-06 08:17:19 +09:00
takezoe
c9d9d22215 (refs #49)Add favicon and header logo. Thanks to @hansgru! 2013-08-06 08:07:51 +09:00
Naoki Takezoe
5300641822 Merge pull request #70 from takezoe/toggle_gravatar
Toggle gravatar support
2013-08-05 10:11:21 -07:00
takezoe
b31b7e1e86 Merge branch 'master' into toggle_gravatar
Conflicts:
	src/main/scala/view/AvatarImageProvider.scala
2013-08-06 01:58:47 +09:00
takezoe
cfb2f5beb9 Add SVG file. 2013-08-05 22:22:30 +09:00
Naoki Takezoe
ee9f24b2a6 Merge pull request #67 from takezoe/fork-and-pullreq
Fork and Pull Request
2013-08-05 06:09:12 -07:00
takezoe
8c86e23a4c (refs #2)HTML parts sharing in issues and pull requests. 2013-08-05 21:57:45 +09:00
takezoe
fe98d35d4e (refs #2)Fix redirect path for pull request. 2013-08-05 21:06:42 +09:00
takezoe
8e10693402 (refs #2)Don't display reopen button for the pull request. 2013-08-05 18:53:04 +09:00
takezoe
f31848721c Remove unnecessary comment and format code. 2013-08-05 18:49:08 +09:00
takezoe
6101e141d8 (refs #2)Add opened user filter and count to the pull request list. 2013-08-05 18:47:40 +09:00
takezoe
71d84e7475 (refs #2)Limit of pull request list is 25. 2013-08-05 16:34:11 +09:00
takezoe
735ad4c972 Fix comment. 2013-08-05 15:19:16 +09:00
takezoe
50cb59f569 (refs #2)Add action type "merge" for ISSUE_COMMENT. 2013-08-05 15:16:26 +09:00
takezoe
b58c19b88b (refs #2)Add issue and pull request icon. 2013-08-05 14:40:06 +09:00
Naoki Takezoe
6fe9ebbd2d Update README.md 2013-08-05 03:41:25 +09:00
takezoe
4ea23a96ae (refs #2)Implementing pull request list. 2013-08-05 03:31:27 +09:00
takezoe
ebf5d00fd2 (refs #2)Fix link for pull requests. 2013-08-05 02:11:06 +09:00
takezoe
b015645ed0 (refs #2)Add flag for identifying whether it's a pull request. 2013-08-05 02:06:15 +09:00
takezoe
ce3b10ef03 (refs #2)Restore checkConflict method. 2013-08-05 01:35:08 +09:00
takezoe
d7af5551eb (refs #2)Fix temporary branch name. 2013-08-05 00:53:30 +09:00
takezoe
1d03a82be4 (refs #2)Pull request works! 2013-08-05 00:49:09 +09:00
takezoe
aa5fdfa395 Merge branch 'master' into fork-and-pullreq 2013-08-04 13:13:44 +09:00
takezoe
7e05bcc81d Use released scalatra-forms 0.0.1. The jar file in /lib has been removed. 2013-08-04 13:13:18 +09:00
takezoe
e52aa7ad3c Merge branch 'master' into fork-and-pullreq
Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala
2013-08-04 05:10:01 +09:00
Naoki Takezoe
42faf9bda2 Merge pull request #59 from tanacasino/fix/issue-58
(fix #58) Fix bug that failed to view tag tree
2013-08-03 12:46:58 -07:00
takezoe
984164ba60 Applied schema changes until 1.4 to the ER diagram. 2013-08-04 03:10:47 +09:00
Tomofumi Tanaka
d26faac0e6 (fix #58) Fix bug that failed to view tag tree 2013-08-04 01:28:47 +09:00
shimamoto
b54a9ace9f Merge pull request #56 from kxbmap/fix-uoe
Fix UnsupportedOperationException
2013-07-31 21:21:09 -07:00
shimamoto
ad0131de66 Remove proxy settings. 2013-08-01 12:54:18 +09:00
Naoki Takezoe
b9ac48ebef Merge pull request #57 from kxbmap/upgrade-sbt-idea
Upgrade to sbt-idea 1.5.1
2013-07-31 16:32:51 -07:00
kxbmap
71751ae4bc Fix an error that occurs when a new user accesses to dashboard/issues/repos 2013-08-01 03:36:15 +09:00
kxbmap
1c6f4a1d1e Upgrade to sbt-idea 1.5.1 2013-08-01 02:15:56 +09:00
takezoe
fd84b3f1c4 Fix link path in dashborad. 1.4 2013-07-31 12:04:09 +09:00