Skip to content

Commit

Permalink
1.4.4
Browse files Browse the repository at this point in the history
Changelog:
* Update installation with mysql or postgres support.
* Fix history datetime field.
* Several js-fixes after jshint.
* Add `doccerrun` command full suport.

See merge request polemarch/ce!164
  • Loading branch information
onegreyonewhite committed Sep 16, 2019
2 parents 2ded9f8 + 6e46eb3 commit 08c8058
Show file tree
Hide file tree
Showing 26 changed files with 686 additions and 532 deletions.
3 changes: 2 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ code_style:
variables:
TOX_ARGS: "--workdir /cache/.tox_polemarch_code"
script:
- make test ENVS=flake,pylint
- make test ENVS=flake,pylint,jshint
except:
refs:
- tags
Expand All @@ -75,6 +75,7 @@ code_style:
changes:
- polemarch/main/**/*
- polemarch/api/**/*
- polemarch/static/js/*
- requirements.txt
- Makefile
- tox.ini
Expand Down
69 changes: 69 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{
"maxerr": 99999,
"curly": true,
"esversion": 9,
"forin": true,
"freeze": true,
"latedef": true,
"leanswitch": true,
"maxdepth": 5,
"undef": true,
"unused": "strict",
"debug": true,
"varstmt": true,
"loopfunc": true,

"browser": true,
"devel": true,

"globals": {
"addCssClassesToElement": true,
"ApiConnector": true,
"api_connector_config": true,
"app": true,
"BaseEntityConstructor": true,
"base_field_content_readonly_mixin": true,
"base_field_label_mixin": true,
"capitalizeString": true,
"current_view": true,
"deepEqual": true,
"ErrorHandler": true,
"fieldsRegistrator": true,
"field_fk_content_readonly_mixin": true,
"findClosestPath": true,
"guiFields": true,
"guiLocalSettings": true,
"guiPopUp": true,
"guiSkins": true,
"guiWidgets": true,
"gui_fields_mixins": true,
"guiCustomizer": true,
"guiDashboard": true,
"guiModels": true,
"guiQuerySets": true,
"hostname": true,
"IMask": true,
"isEmptyObject": true,
"iziToast": true,
"modal_window_and_button_mixin": true,
"moment": true,
"my_user_id": true,
"onLoadingErrorHandler": true,
"openapi_dictionary": true,
"path_pk_key": true,
"pop_up_msg": true,
"project_connected_models_dict": true,
"StatusError": true,
"SubViewWithOutApiPathConstructor": true,
"table_row_mixin": true,
"tabSignal": true,
"trim": true,
"View": true,
"ViewConstructor": true,
"view_with_autoupdate_mixin": true,
"vst_vue_components": true,
"Vue": true,
"XRegExp": true,
"$": true
}
}
10 changes: 5 additions & 5 deletions doc/api_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ info:
url: https://gitlab.com/vstconsulting/polemarch.git
Request:
- name: Question
url: https://gitlab.com/vstconsulting/polemarch/issues/new?issuable_template%5D=Ask&issue%5Btitle%5D=Ask%20about%20version%201.4.3
url: https://gitlab.com/vstconsulting/polemarch/issues/new?issuable_template%5D=Ask&issue%5Btitle%5D=Ask%20about%20version%201.4.4
- name: Bug report
url: https://gitlab.com/vstconsulting/polemarch/issues/new?issuable_template%5D=Bug&issue%5Btitle%5D=Bug%20in%20version%201.4.3
url: https://gitlab.com/vstconsulting/polemarch/issues/new?issuable_template%5D=Bug&issue%5Btitle%5D=Bug%20in%20version%201.4.4
- name: Feature request
url: https://gitlab.com/vstconsulting/polemarch/issues/new?issuable_template%5D=Feature%20request&issue%5Btitle%5D=
x-menu:
Expand Down Expand Up @@ -54,9 +54,9 @@ info:
span_class: fa fa-plug
url: /hook
x-versions:
application: 1.4.3
library: 1.4.3
vstutils: 2.6.3
application: 1.4.4
library: 1.4.4
vstutils: 2.6.6
django: 2.2.4
ansible: 2.8.4
version: v2
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

# General information about the project.
project = 'Polemarch'
copyright = '2018, VST Consulting'
copyright = '2019, VST Consulting'
author = 'VST Consulting'

# The version info for the project you're documenting, acts as replacement for
Expand Down
2 changes: 1 addition & 1 deletion doc/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Install from PyPI

.. sourcecode:: bash

pip install -U polemarch mysqlclient
pip install -U polemarch[mysql]

#. Edit config file:

Expand Down
2 changes: 1 addition & 1 deletion polemarch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
}

__version__ = "1.4.3"
__version__ = "1.4.4"

prepare_environment(**default_settings)
2 changes: 2 additions & 0 deletions polemarch/main/settings.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from collections import OrderedDict
from vstutils.settings import *

WEBSERVER_COMMAND = 'webserver'

POLEMARCH_VERSION = PROJECT_VERSION
APACHE = False if ("runserver" in sys.argv) else True

Expand Down
4 changes: 2 additions & 2 deletions polemarch/static/js/pmCustomizer.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* Mixin, that extends guiSkins.default.
*/
var pmSkinDefaultMixin = {
const pmSkinDefaultMixin = {
history_status_ok: {
color_var:"--history-status-ok",
title:'History status ok',
Expand Down Expand Up @@ -121,7 +121,7 @@ guiSkins.default = $.extend(true, guiSkins.default, pmSkinDefaultMixin);
/**
* Mixin, that extends guiSkins.dark.
*/
var pmSkinDarkMixin = {
const pmSkinDarkMixin = {
history_status_ok: {
default:"#56E401",
},
Expand Down
Loading

0 comments on commit 08c8058

Please sign in to comment.