Gitblit devel
parent: 86401c | patch | commitdiff
Paul Martin
2016-01-11 2754961708ff0eb6030faf6db2edf8fbdae227d5
refs
author Paul Martin <paul@paulsputer.com>
Monday, January 11, 2016 07:25 -0500
committer Paul Martin <paul@paulsputer.com>
Sunday, March 27, 2016 12:09 -0400
commit2754961708ff0eb6030faf6db2edf8fbdae227d5
tree 827f0904a9e8a5db2282986230b374c42cfd69c1 tree | zip | gz
parent 86401c3ff40c137a937a3dd83f12022fce5529b4 view | 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
10 files added
15 files modified
1256 ■■■■■ changed files
.gitmodules 3 ●●●●● diff | view | raw | blame | history
build.xml 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/tickets/BranchTicketService.java 109 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/utils/JGitUtils.java 131 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/DocPage.html 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/DocPage.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/DocsPage.html 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/DocsPage.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/EditFilePage.html 60 ●●●●● diff | view | raw | blame | history
src/main/java/com/gitblit/wicket/pages/EditFilePage.java 220 ●●●●● diff | view | raw | blame | history
src/main/js/.gitignore 1 ●●●●● diff | view | raw | blame | history
src/main/js/editor.dev.css 70 ●●●●● diff | view | raw | blame | history
src/main/js/editor.dev.js 271 ●●●●● diff | view | raw | blame | history
src/main/js/package.json 23 ●●●●● diff | view | raw | blame | history
src/main/js/prosemirror @ c28df1 1 ●●●●● diff | view | raw | blame | history
src/main/resources/fontawesome/css/font-awesome.min.css 4 ●●●●● diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/FontAwesome.otf diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/fontawesome-webfont.eot diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/fontawesome-webfont.svg 317 ●●●●● diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/fontawesome-webfont.ttf diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/fontawesome-webfont.woff diff | view | raw | blame | history
src/main/resources/fontawesome/fonts/fontawesome-webfont.woff2 diff | view | raw | blame | history
src/main/resources/gitblit-editor.min.css 1 ●●●●● diff | view | raw | blame | history
src/main/resources/gitblit-editor.min.js 10 ●●●●● diff | view | raw | blame | history
src/main/resources/gitblit.css 4 ●●●●● diff | view | raw | blame | history