source.dussan.org Git - gitblit.git/commit

]> source.dussan.org Git - gitblit.git/commit

author	Paul Martin <paul@paulsputer.com>
	Mon, 11 Jan 2016 12:25:06 +0000 (12:25 +0000)
committer	Paul Martin <paul@paulsputer.com>
	Sun, 27 Mar 2016 16:09:16 +0000 (17:09 +0100)
commit	2754961708ff0eb6030faf6db2edf8fbdae227d5
tree	827f0904a9e8a5db2282986230b374c42cfd69c1	tree \| snapshot
parent	86401c3ff40c137a937a3dd83f12022fce5529b4	commit \| diff

Document edit capability via ProseMirror submodule #974

+ New docEdit page with links from docPage and docList
+ Bespoke menu system with full screen edit mode
+ npm required for building client side scripts
+ Ant script added for BuildUI which performs npm commands
+ Update font-awesome to 4.5.0
+ Factor out to JGitUtils common code in BranchTicketService for EditFilePage
+ getTreeEntries
+ commitIndex
+ Merge capability for document editing

25 files changed:

.gitmodules		diff \| blob \| history
build.xml		diff \| blob \| history
src/main/java/com/gitblit/tickets/BranchTicketService.java		diff \| blob \| history
src/main/java/com/gitblit/utils/JGitUtils.java		diff \| blob \| history
src/main/java/com/gitblit/wicket/pages/DocPage.html		diff \| blob \| history
src/main/java/com/gitblit/wicket/pages/DocPage.java		diff \| blob \| history
src/main/java/com/gitblit/wicket/pages/DocsPage.html		diff \| blob \| history
src/main/java/com/gitblit/wicket/pages/DocsPage.java		diff \| blob \| history
src/main/java/com/gitblit/wicket/pages/EditFilePage.html	[new file with mode: 0644]	blob
src/main/java/com/gitblit/wicket/pages/EditFilePage.java	[new file with mode: 0644]	blob
src/main/js/.gitignore	[new file with mode: 0644]	blob
src/main/js/editor.dev.css	[new file with mode: 0644]	blob
src/main/js/editor.dev.js	[new file with mode: 0644]	blob
src/main/js/package.json	[new file with mode: 0644]	blob
src/main/js/prosemirror	[new submodule]	blob
src/main/resources/fontawesome/css/font-awesome.min.css		diff \| blob \| history
src/main/resources/fontawesome/fonts/FontAwesome.otf		diff \| blob \| history
src/main/resources/fontawesome/fonts/fontawesome-webfont.eot		diff \| blob \| history
src/main/resources/fontawesome/fonts/fontawesome-webfont.svg		diff \| blob \| history
src/main/resources/fontawesome/fonts/fontawesome-webfont.ttf		diff \| blob \| history
src/main/resources/fontawesome/fonts/fontawesome-webfont.woff		diff \| blob \| history
src/main/resources/fontawesome/fonts/fontawesome-webfont.woff2	[new file with mode: 0644]	blob
src/main/resources/gitblit-editor.min.css	[new file with mode: 0644]	blob
src/main/resources/gitblit-editor.min.js	[new file with mode: 0644]	blob
src/main/resources/gitblit.css		diff \| blob \| history

Pure java git solution: https://github.com/gitblit-org/gitblit

RSS Atom