Skip to content
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

Merged
merged 4 commits into from Mar 28, 2016
Merged

974 in browser doc editor #1022

merged 4 commits into from Mar 28, 2016

Conversation

paulsputer
Copy link
Collaborator

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?

@paladox
Copy link
Contributor

paladox commented Feb 27, 2016

+1 thanks. I haven't tested but thanks for working on a built in editor.

@paladox
Copy link
Contributor

paladox commented Feb 27, 2016

Does this support an option to disable the editor if gitblit acts as a mirror.

@paulsputer
Copy link
Collaborator Author

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.

@paulsputer
Copy link
Collaborator Author

@gitblit would be great to get your feedback so we can merge in :)

@gitblit
Copy link
Collaborator

gitblit commented Mar 16, 2016 via email

@paulsputer
Copy link
Collaborator Author

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
@paulsputer paulsputer merged commit 33f3580 into master Mar 28, 2016
@paladox
Copy link
Contributor

paladox commented Mar 28, 2016

@paulsputer thanks.

Also do you have a screenshot of what it looks like please.

@paulsputer
Copy link
Collaborator Author

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 mode

doceditortest-fullscreen

Normal editing mode - with Heading 1 currently selected

doceditortest-activeh1

Commit dialog with default commit message

doceditortest-commit

@paladox
Copy link
Contributor

paladox commented Mar 28, 2016

@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.

@paulsputer paulsputer deleted the 974-in-browser-doc-editor branch March 29, 2016 19:52
@flaix flaix added this to the 1.8.0 milestone Dec 17, 2016
@flaix flaix modified the milestone: 1.8.0 Mar 18, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants