Skip to content

Commit

Permalink
cronicle 0.92 sync
Browse files Browse the repository at this point in the history
  • Loading branch information
mikeTWC1984 committed Dec 27, 2021
1 parent e542521 commit 9936131
Show file tree
Hide file tree
Showing 9 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The MIT License (MIT)

Copyright (c) 2015 - 2021 Joseph Huckaby
Copyright (c) 2015 - 2022 Joseph Huckaby

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion bin/build-tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var util = require('util');
var os = require('os');
var cp = require('child_process');

var mkdirp = require('mkdirp');
var mkdirp = Tools.mkdirp;
var async = require('async');
var glob = require('glob');
var UglifyJS = require("uglify-js");
Expand Down
4 changes: 3 additions & 1 deletion bin/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ var fs = require('fs');
var path = require('path');
var util = require('util');
var async = require('async');
var mkdirp = require('mkdirp');

var Tools = require('pixl-tools');
var mkdirp = Tools.mkdirp;

var BuildTools = require('./build-tools.js');
var setup = require('../sample_conf/setup.json');
Expand Down
2 changes: 1 addition & 1 deletion bin/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ logonly( "\nStarting install run: " + (new Date()).toString() + "\n" );

print(
"\nCronicle Installer v" + installer_version + "\n" +
"Copyright (c) 2015 - 2018 PixlCore.com. MIT Licensed.\n" +
"Copyright (c) 2015 - 2022 PixlCore.com. MIT Licensed.\n" +
"Log File: " + log_file + "\n\n"
);

Expand Down
7 changes: 4 additions & 3 deletions htdocs/index-dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,8 @@
<div id="d_footer">
<div class="left">
<a href="https://github.com/jhuckaby/Cronicle" target="_blank">Cronicle</a> is
&copy; 2015 - 2020 by <a href="http://pixlcore.com" target="_blank">PixlCore</a>.
&copy; 2015 - 2022 by <a href="http://pixlcore.com" target="_blank">PixlCore</a>.
<a href="https://github.com/cronicle-edge/cronicle-edge" target="_blank">Cronicle-Edge Fork</a>
Released under the <a href="https://github.com/jhuckaby/Cronicle/blob/manager/LICENSE.md" target="_blank">MIT License</a>.
</div>
<div id="d_footer_version" class="right">
Expand All @@ -155,8 +156,8 @@
</div>

<script src="js/external/jquery.min.js"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.min.css">
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
<link rel="stylesheet" href="https://code.jquery.com/ui/1.13.0/themes/base/jquery-ui.min.css">
<script src="https://code.jquery.com/ui/1.13.0/jquery-ui.min.js"></script>
<script>
//$(function () { $(document).tooltip({ show: null }); });
// allow html in tooltips:
Expand Down
2 changes: 1 addition & 1 deletion htdocs/js/home-worker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Cronicle App
// Author: Joseph Huckaby
// Copyright (c) 2015 - 2018 Joseph Huckaby and PixlCore.com
// Copyright (c) 2015 - 2022 Joseph Huckaby and PixlCore.com
// MIT License

// Worker thread for the Home tab
Expand Down
2 changes: 1 addition & 1 deletion lib/engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

const assert = require("assert");
const fs = require("fs");
const mkdirp = require('mkdirp');
const async = require('async');
const glob = require('glob');
const jstz = require('jstimezonedetect');
Expand All @@ -13,6 +12,7 @@ const Class = require("pixl-class");
const Component = require("pixl-server/component");
const Tools = require("pixl-tools");
const Request = require("pixl-request");
const mkdirp = Tools.mkdirp;

const ld = require("lodash");
const simpleGit = require('simple-git');
Expand Down
2 changes: 1 addition & 1 deletion lib/main.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env node

// Cronicle Server - Main entry point
// Copyright (c) 2015 - 2018 Joseph Huckaby
// Copyright (c) 2015 - 2022 Joseph Huckaby
// Released under the MIT License

// Emit warning for broken versions of node v10
Expand Down
23 changes: 11 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,12 @@
"dotenv": "^8.2.0",
"font-awesome": "4.7.0",
"glob": "5.0.15",
"jquery": "^3.5.0",
"jquery": "^3.6.0",
"jstimezonedetect": "1.0.6",
"mdi": "1.9.33",
"mkdirp": "0.5.1",
"moment": "2.22.1",
"moment-timezone": "0.5.32",
"netmask": "^2.0.1",
"netmask": "^2.0.2",
"openssl-wrapper": "^0.3.4",
"pixl-args": "^1.0.3",
"pixl-class": "^1.0.2",
Expand All @@ -47,18 +46,18 @@
"pixl-mail": "^1.0.11",
"pixl-perf": "^1.0.5",
"pixl-request": "^1.0.36",
"pixl-server": "^1.0.28",
"pixl-server": "^1.0.32",
"pixl-server-api": "^1.0.2",
"pixl-server-storage": "^2.0.10",
"pixl-server-web": "^1.1.36",
"pixl-tools": "^1.0.28",
"pixl-webapp": "^1.0.17",
"pixl-server-storage": "^3.0.13",
"pixl-server-web": "^1.3.3",
"pixl-tools": "^1.0.29",
"pixl-webapp": "^2.0.1",
"read-last-lines": "^1.8.0",
"shell-quote": "1.6.1",
"shell-quote": "1.7.3",
"simple-git": "^2.31.0",
"socket.io": "1.7.3",
"socket.io-client": "1.7.3",
"uglify-js": "2.8.22",
"socket.io": "4.4.0",
"socket.io-client": "4.4.0",
"uglify-js": "3.14.3",
"uncatch": "^1.0.0",
"xss": "^1.0.8",
"zxcvbn": "3.5.0"
Expand Down

0 comments on commit 9936131

Please sign in to comment.