-
Notifications
You must be signed in to change notification settings - Fork 670
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
974 in browser doc editor #1022
Conversation
+1 thanks. I haven't tested but thanks for working on a built in editor. |
Does this support an option to disable the editor if gitblit acts as a mirror. |
At the moment the user/repository permissions are used to determine if the editor is displayed/enabled so that should gracefully handle the mirroring case. It would probably be more intuitive if it also disables the links to the edit page and the edit page itself in this case. |
@gitblit would be great to get your feedback so we can merge in :) |
Sorry Paul. I'm quite negligent and I'm traveling this week so I doubt I'll
get to it before next week. I trust your judgement so if you are ready to
merge and it's holding up your progress then go ahead and merge.
|
No worries James, thanks. |
+ 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
+ Prevent Edit of old doc version
d9606a2
to
795ce27
Compare
@paulsputer thanks. Also do you have a screenshot of what it looks like please. |
Hi @paladox here we go, I'm sure they'll be improvements to the UI as it gets used more and other formats and features are added. :) Full screen editing modeNormal editing mode - with Heading 1 currently selectedCommit dialog with default commit message |
@paulsputer yes probably but it already looks good, Thanks for working on it. It now allows users that are out about like on a mobile or tablet to be able to work on commits so thanks for allowing users to do this. |
Document editor support for (#974) using ProseMirror to support wider range of use cases in the longer term compared to original PR (#1009) with SimpleMDE. Markdown activated in this PR by default though other formats can be supported. Code editor to be addressed in a later PR using CodeMirror.
@gitblit I've added in merge/rebase capabilities with as minimal changes as possible. If merge fails it currently returns an error and the changes are lost which should be rare but could be rather frustrating. What would you recommend for this?