Skip to content
Snippets Groups Projects
Verified Commit ef387074 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'f-ext-applicable' into f-entity-state

parents 9263e176 32efe498
No related branches found
No related tags found
No related merge requests found
Showing
with 1953 additions and 5 deletions
# ** header v3.0
# This file is a part of the CaosDB Project.
#
# Copyright (C) 2020 IndiScale GmbH <info@indiscale.com>
# Copyright (C) 2020 Daniel Hornung <d.hornung@indiscale.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as
# published by the Free Software Foundation, either version 3 of the
# License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU Affero General Public License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ** end header
# This Makefile is a wrapper for sphinx scripts.
#
# It is based upon the autocreated makefile for Sphinx documentation.
# You can set these variables from the command line, and also
# from the environment for the first two.
SPHINXOPTS ?= -a
SPHINXBUILD ?= sphinx-build
# SPHINXAPIDOC ?= javasphinx-apidoc
SOURCEDIR = .
BUILDDIR = ../../build/doc
# npm is not always in the global PATH
NPM_PATH = $(shell npm bin)
NPM_PREFIX = $(shell npm prefix)
.PHONY: doc-help Makefile api
# Put it first so that "make" without argument is like "make help".
doc-help:
@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile api
PATH=$(NPM_PATH):$$PATH $(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
# sphinx-build -M html . ../../build/doc
api:
PATH=$(NPM_PATH):$$PATH jsdoc -t $(NPM_PREFIX)/node_modules/jsdoc-sphinx/template -d $@ -r "../../src/core"
========================
The concepts of pycaosdb
========================
Some text...
This diff is collapsed.
Extending the CaosDB Web Interface
==================================
Here we collect information on how to extend the web interface as a developer.
.. toctree::
:maxdepth: 1
:glob:
extension/*
This diff is collapsed.
.. This file is a placeholder and will be replaced.
Index
=====
../../README_SETUP.md
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
CaosDB Web Interface Tutorials
==============================
This chapter contains the following tutorials:
.. toctree::
:maxdepth: 2
:glob:
*
This diff is collapsed.
This diff is collapsed.
......@@ -235,8 +235,6 @@ var fileupload = new function() {
}
this.init = function() {
fileupload.debug("init");
// add global listener for start_edit event
document.body.addEventListener(edit_mode.start_edit.type, function(e) {
$(e.target).find(".caosdb-properties .caosdb-f-entity-property").each(function(idx) {
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment