From 6008c15610c5c442787bb0d37724ad5f4ac4c1fe Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 4 Jun 2018 17:35:17 -0400 Subject: [PATCH] Accept javascript management proposal as MERC-3. Signed-off-by: Roberto Rosario --- ...st => 0003-using-javascript-libraries.rst} | 12 +++++----- docs/mercs/index.rst | 4 ++-- docs/topics/roadmap.rst | 23 ------------------- 3 files changed, 8 insertions(+), 31 deletions(-) rename docs/mercs/{using-javascript-libraries.rst => 0003-using-javascript-libraries.rst} (93%) delete mode 100644 docs/topics/roadmap.rst diff --git a/docs/mercs/using-javascript-libraries.rst b/docs/mercs/0003-using-javascript-libraries.rst similarity index 93% rename from docs/mercs/using-javascript-libraries.rst rename to docs/mercs/0003-using-javascript-libraries.rst index afdcf90fa6..76235fa68e 100644 --- a/docs/mercs/using-javascript-libraries.rst +++ b/docs/mercs/0003-using-javascript-libraries.rst @@ -1,13 +1,13 @@ -=================================== -MERC XX: Using javascript libraries -=================================== +================================== +MERC 3: Using javascript libraries +================================== -:MERC: XX +:MERC: 3 :Author: Eric Riggs -:Status: Draft +:Status: Accepted :Type: Feature :Created: 2018-03-08 -:Last-Modified: 2018-03-08 +:Last-Modified: 2018-06-04 .. contents:: Table of Contents :depth: 3 diff --git a/docs/mercs/index.rst b/docs/mercs/index.rst index 26c719ce41..cf812de48e 100644 --- a/docs/mercs/index.rst +++ b/docs/mercs/index.rst @@ -19,6 +19,7 @@ Accepted 0001-merc-process 0002-test-writing + 0003-using-javascript-libraries Draft ----- @@ -28,8 +29,6 @@ Draft merging-roles-and-groups support-forum - using-javascript-libraries - Type @@ -49,3 +48,4 @@ Feature :maxdepth: 1 0002-test-writing + 0003-using-javascript-libraries diff --git a/docs/topics/roadmap.rst b/docs/topics/roadmap.rst deleted file mode 100644 index 4554c18ca5..0000000000 --- a/docs/topics/roadmap.rst +++ /dev/null @@ -1,23 +0,0 @@ -======= -Roadmap -======= - -- Other - - - Find replacement for ``cssmin`` & ``django-compressor``. - - Find replacement for ``python-gnupg``. Unstable & inconsistent API. - - Google docs integration. Upload document from Google Drive. - - Get ``dumpdata`` and ``loaddata`` working flawlessly. Will allow for easier backups, restores and database backend migrations. - - Add generic list ordering. ``django.views.generic.list.MultipleObjectMixin`` (https://docs.djangoproject.com/en/1.8/ref/class-based-views/mixins-multiple-object/#django.views.generic.list.MultipleObjectMixin) now supports an ``ordering`` parameter. - - Add support to convert any document to PDF. https://gitlab.mister-muffin.de/josch/img2pdf - - Add support for combining documents. - - Add support for splitting documents. - - Add new document source to get documents from an URL. - - Add support for metadata mapping files. CSV file containing filename to metadata values mapping, useful for bulk upload and migrations. - - Add support for registering widgets to the home screen. - - Merge mimetype and converter apps. - - Metadata widgets (Date, time, timedate). - - Datatime widget: https://github.com/smalot/bootstrap-datetimepicker - - Add events for document signing app (uploaded detached signateure, signed document, deleted signature) - - A configurable conversion process. Being able to invoke different binaries for file conversion, as opposed to the current libreoffice only solution. - - A tool in the admin interface to mass (re)convert the files (basically the page count function, but then applied on all documents).