mirror of
https://github.com/documize/community.git
synced 2025-07-19 05:09:42 +02:00
upgraded to latest ember release
This commit is contained in:
Harvey Kandola
parent
cb4dedeb37
commit
20f9272d46
28 changed files with 729 additions and 695 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -49,6 +49,7 @@ _testmain.go
|
|||
/app/libpeerconnection.log
|
||||
/app/npm-debug.log
|
||||
/app/testem.log
|
||||
node_modules
|
||||
|
||||
# Misc.
|
||||
build
|
||||
|
|
|
|||
20
app/.editorconfig
Normal file
20
app/.editorconfig
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# EditorConfig helps developers define and maintain consistent
|
||||
# coding styles between different editors and IDEs
|
||||
# editorconfig.org
|
||||
|
||||
root = true
|
||||
|
||||
|
||||
[*]
|
||||
end_of_line = lf
|
||||
charset = utf-8
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[*.hbs]
|
||||
insert_final_newline = false
|
||||
|
||||
[*.{diff,md}]
|
||||
trim_trailing_whitespace = false
|
||||
|
|
@ -19,7 +19,8 @@ export default Ember.Component.extend({
|
|||
maxTags: 3,
|
||||
canAdd: false,
|
||||
|
||||
didInitAttrs() {
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
let tagz = [];
|
||||
|
||||
if (this.get('documentTags').length > 1) {
|
||||
|
|
|
|||
|
|
@ -15,7 +15,8 @@ export default Ember.Component.extend({
|
|||
documentTags: [],
|
||||
tagz: [],
|
||||
|
||||
didInitAttrs() {
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
let tagz = [];
|
||||
|
||||
if (this.get('documentTags').length > 1) {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,9 @@ export default Ember.Component.extend({
|
|||
appMeta: service(),
|
||||
session: service(),
|
||||
|
||||
didInitAttrs() {
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
|
||||
if (this.get("session.authenticated")) {
|
||||
this.get("session.session.content.authenticated.user.accounts").forEach((account) => {
|
||||
// TODO: do not mutate account.active here
|
||||
|
|
|
|||
|
|
@ -15,7 +15,9 @@ export default Ember.Component.extend({
|
|||
documentTags: [],
|
||||
tagz: [],
|
||||
|
||||
didInitAttrs() {
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
|
||||
let tagz = [];
|
||||
|
||||
if (this.get('documentTags').length > 1) {
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@ export default Ember.Component.extend(TooltipMixin, {
|
|||
syntaxOptions: [],
|
||||
codeSyntax: null,
|
||||
|
||||
didInitAttrs() {
|
||||
init() {
|
||||
this._super(...arguments);
|
||||
|
||||
let self = this;
|
||||
CodeMirror.modeURL = "codemirror/mode/%N/%N.js";
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ export default Ember.Component.extend({
|
|||
};
|
||||
|
||||
if (typeof tinymce === 'undefined') {
|
||||
$.getScript("tinymce/tinymce.min.js?v=430", function () {
|
||||
$.getScript("/tinymce/tinymce.min.js?v=430", function () {
|
||||
window.tinymce.dom.Event.domLoaded = true;
|
||||
tinymce.baseURL = "//" + window.location.host + "/tinymce";
|
||||
tinymce.suffix = ".min";
|
||||
|
|
|
|||
|
|
@ -13,19 +13,20 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||
<link rel="shortcut icon" href="/favicon.ico?v=1.1" />
|
||||
<link rel="icon" type="image/png" href="/favicon-32x32.png?v=1.1" sizes="32x32" />
|
||||
<link rel="stylesheet" href="assets/vendor.css">
|
||||
<link rel="stylesheet" href="assets/documize.css"> {{content-for 'head-footer'}}
|
||||
<link rel="stylesheet" href="/assets/vendor.css">
|
||||
<link rel="stylesheet" href="/assets/documize.css">
|
||||
{{content-for 'head-footer'}}
|
||||
</head>
|
||||
|
||||
<body>
|
||||
{{content-for 'body'}}
|
||||
<script src="assets/vendor.js"></script>
|
||||
<script src="assets/documize.js"></script>
|
||||
<script src="codemirror/lib/codemirror.js"></script>
|
||||
<script src="codemirror/mode/meta.js"></script>
|
||||
<script src="codemirror/addon/mode/loadmode.js"></script>
|
||||
<script src="codemirror/addon/runmode/runmode.js"></script>
|
||||
<script src="codemirror/addon/runmode/colorize.js"></script>
|
||||
<script src="/assets/vendor.js"></script>
|
||||
<script src="/assets/documize.js"></script>
|
||||
<script src="/codemirror/lib/codemirror.js"></script>
|
||||
<script src="/codemirror/mode/meta.js"></script>
|
||||
<script src="/codemirror/addon/mode/loadmode.js"></script>
|
||||
<script src="/codemirror/addon/runmode/runmode.js"></script>
|
||||
<script src="/codemirror/addon/runmode/colorize.js"></script>
|
||||
{{content-for 'body-footer'}}
|
||||
</body>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="auth-box">
|
||||
<div class="logo">
|
||||
<img src="assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
<img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
</div>
|
||||
<div class="login-form">
|
||||
{{forgot-password forgot=(action 'forgot')}}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="auth-box">
|
||||
<div class="logo">
|
||||
<img src="assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
<img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
</div>
|
||||
<div class="login-form">
|
||||
<form id="login-form" {{action 'login' on="submit"}}>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="auth-box">
|
||||
<div class="logo">
|
||||
<img src="assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
<img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
|
||||
</div>
|
||||
{{password-reset reset=(action 'reset')}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<div class="sso-box">
|
||||
<p>Signing in...</p>
|
||||
<img src="assets/img/busy-gray.gif" />
|
||||
<img src="/assets/img/busy-gray.gif" />
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
.global-folder-settings {
|
||||
|
||||
}
|
||||
|
||||
.user-list {
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<ul class="list">
|
||||
{{#each attachments key="id" as |a index|}}
|
||||
<li class="item">
|
||||
<img class="icon" src="assets/img/attachments/{{document/file-icon a.extension}}" />
|
||||
<img class="icon" src="/assets/img/attachments/{{document/file-icon a.extension}}" />
|
||||
<a href="{{ appMeta.endpoint }}/public/attachments/{{ appMeta.orgId }}/{{ a.job }}/{{ a.fileId }}">
|
||||
<span class="file">{{ a.filename }}</span>
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
</div>
|
||||
{{#if busy}}
|
||||
<div class="processing">
|
||||
<img src="assets/img/processing.gif" />
|
||||
<img src="/assets/img/processing.gif" />
|
||||
<div class="caption">Preparing</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<form>
|
||||
<div class="heading">
|
||||
<div class="title">General Settings</div>
|
||||
<div class="input-control">
|
||||
<label>General Settings</label>
|
||||
<div class="tip">Tell people about this Documize instance</div>
|
||||
</div>
|
||||
<div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<div class="sidebar">
|
||||
|
||||
<img class="logo" src="assets/img/logo-black.png" />
|
||||
<img class="logo" src="/assets/img/logo-black.png" />
|
||||
|
||||
<div class="stage-1">
|
||||
<h1>Hello!</h1>
|
||||
|
|
@ -52,12 +52,12 @@
|
|||
<div class="stage-1">
|
||||
<div class="account-name-preview">
|
||||
<div class="nav-icon"></div>
|
||||
<div class="title">DOCUMIZE</div><img class="name-status" src="assets/img/onboard/person.png" /></div>
|
||||
<div class="title">DOCUMIZE</div><img class="name-status" src="/assets/img/onboard/person.png" /></div>
|
||||
</div>
|
||||
<div class="stage-2">
|
||||
<div class="account-name-preview">
|
||||
<div class="nav-icon"></div>
|
||||
<div class="title">DOCUMIZE</div><img class="password-status" src="assets/img/onboard/lock.png" /></div>
|
||||
<div class="title">DOCUMIZE</div><img class="password-status" src="/assets/img/onboard/lock.png" /></div>
|
||||
</div>
|
||||
<div class="stage-3">
|
||||
<div class="account-name-preview">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
</div>
|
||||
<div class="buttons pull-right">
|
||||
{{#if busy}}
|
||||
<img src="assets/img/busy-gray.gif" class="busy-indicator" />
|
||||
<img src="/assets/img/busy-gray.gif" class="busy-indicator" />
|
||||
{{/if}}
|
||||
<div id="editor-cancel" class="flat-button flat-gray" {{action 'onCancel'}}>{{cancelLabel}}</div>
|
||||
<div class="button-gap" />
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<form>
|
||||
<div class="heading">
|
||||
<div class="title">Add User</div>
|
||||
<div class="input-control">
|
||||
<label>Add User</label>
|
||||
<div class="tip">New users receive an invitation email with a random password</div>
|
||||
</div>
|
||||
<div class="input-control">
|
||||
|
|
|
|||
|
|
@ -1,22 +1,7 @@
|
|||
{
|
||||
"name": "documize",
|
||||
"dependencies": {
|
||||
"ember": "v2.5.1",
|
||||
"ember-cli-shims": "0.1.1",
|
||||
"ember-cli-test-loader": "0.2.2",
|
||||
"ember-qunit-notifications": "0.1.0",
|
||||
"jquery": "*",
|
||||
"loader.js": "^3.5.0",
|
||||
"qunit": "~1.20.0",
|
||||
"install": "~1.0.4",
|
||||
"pretender": "~1.1.0",
|
||||
"lodash": "~3.7.0",
|
||||
"Faker": "~3.1.0"
|
||||
},
|
||||
"resolutions": {
|
||||
"jquery": ">=2.1.1",
|
||||
"ember": "v2.5.1",
|
||||
"FakeXMLHttpRequest": "^1.4.0"
|
||||
},
|
||||
"version": "0.0.1"
|
||||
"ember": "~2.8.0",
|
||||
"ember-cli-shims": "0.1.1"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ module.exports = function (environment) {
|
|||
podModulePrefix: 'documize/pods',
|
||||
locationType: 'auto',
|
||||
environment: environment,
|
||||
baseURL: '/',
|
||||
rootURL: '/',
|
||||
// baseURL: '/',
|
||||
apiHost: '',
|
||||
apiNamespace: '',
|
||||
contentSecurityPolicyHeader: 'Content-Security-Policy-Report-Only',
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
"devDependencies": {
|
||||
"broccoli-asset-rev": "^2.4.2",
|
||||
"ember-ajax": "2.3.2",
|
||||
"ember-cli": "2.5.0",
|
||||
"ember-cli": "2.8.0",
|
||||
"ember-cli-app-version": "^1.0.0",
|
||||
"ember-cli-babel": "^5.1.6",
|
||||
"ember-cli-dependency-checker": "^1.2.0",
|
||||
|
|
@ -30,12 +30,13 @@
|
|||
"ember-cli-inject-live-reload": "^1.4.0",
|
||||
"ember-cli-jshint": "^1.0.0",
|
||||
"ember-cli-mirage": "^0.2.0",
|
||||
"ember-cli-qunit": "^1.4.0",
|
||||
"ember-cli-release": "0.2.8",
|
||||
"ember-cli-qunit": "^2.1.0",
|
||||
"ember-cli-release": "0.2.9",
|
||||
"ember-cli-test-loader": "^1.1.0",
|
||||
"ember-cli-sass": "5.3.1",
|
||||
"ember-cli-sri": "^2.1.0",
|
||||
"ember-cli-uglify": "^1.2.0",
|
||||
"ember-data": "^2.5.0",
|
||||
"ember-data": "^2.8.0",
|
||||
"ember-export-application-global": "^1.0.5",
|
||||
"ember-load-initializers": "^0.5.1",
|
||||
"ember-resolver": "^2.0.3",
|
||||
|
|
|
|||
3
app/public/robots.txt
Normal file
3
app/public/robots.txt
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
# http://www.robotstxt.org
|
||||
User-agent: *
|
||||
Disallow:
|
||||
|
|
@ -2,5 +2,4 @@ import Ember from 'ember';
|
|||
|
||||
export default function destroyApp(application) {
|
||||
Ember.run(application, 'destroy');
|
||||
server.shutdown();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,32 @@
|
|||
import { module } from 'qunit';
|
||||
import Ember from 'ember';
|
||||
import startApp from '../helpers/start-app';
|
||||
import destroyApp from '../helpers/destroy-app';
|
||||
|
||||
export default function (name, options = {}) {
|
||||
module(name, {
|
||||
beforeEach() {
|
||||
this.application = startApp();
|
||||
localStorage.setItem('folder', 'VzMuyEw_3WqiafcG');
|
||||
stubAudit(this);
|
||||
stubUserNotification(this);
|
||||
server.createList('folder', 2);
|
||||
server.createList('user', 2);
|
||||
server.createList('document', 2);
|
||||
server.createList('permission', 4);
|
||||
server.createList('folder-permission', 2);
|
||||
server.createList('organization', 1);
|
||||
const { RSVP: { Promise } } = Ember;
|
||||
|
||||
if (options.beforeEach) {
|
||||
options.beforeEach.apply(this, arguments);
|
||||
}
|
||||
export default function(name, options = {}) {
|
||||
module(name, {
|
||||
beforeEach() {
|
||||
this.application = startApp();
|
||||
localStorage.setItem('folder', 'VzMuyEw_3WqiafcG');
|
||||
stubAudit(this);
|
||||
stubUserNotification(this);
|
||||
server.createList('folder', 2);
|
||||
server.createList('user', 2);
|
||||
server.createList('document', 2);
|
||||
server.createList('permission', 4);
|
||||
server.createList('folder-permission', 2);
|
||||
server.createList('organization', 1);
|
||||
|
||||
this.register = (fullName, Factory) => {
|
||||
let instance = this.application.__deprecatedInstance__;
|
||||
let registry = instance.register ? instance : instance.registry;
|
||||
if (options.beforeEach) {
|
||||
return options.beforeEach.apply(this, arguments);
|
||||
}
|
||||
},
|
||||
|
||||
return registry.register(fullName, Factory);
|
||||
};
|
||||
},
|
||||
|
||||
afterEach() {
|
||||
destroyApp(this.application);
|
||||
|
||||
if (options.afterEach) {
|
||||
options.afterEach.apply(this, arguments);
|
||||
}
|
||||
}
|
||||
});
|
||||
afterEach() {
|
||||
let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
|
||||
return Promise.resolve(afterEach).then(() => destroyApp(this.application));
|
||||
}
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ type ProdInfo struct {
|
|||
// Product returns product edition details
|
||||
func Product() (p ProdInfo) {
|
||||
p.Major = "0"
|
||||
p.Minor = "22"
|
||||
p.Patch = "1"
|
||||
p.Minor = "23"
|
||||
p.Patch = "0"
|
||||
p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch)
|
||||
p.Edition = "Community"
|
||||
p.Title = fmt.Sprintf("%s Edition", p.Edition)
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Loading…
Add table
Add a link
Reference in a new issue