Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-19 21:29:42 +02:00
Code Releases Activity

upgraded to latest ember release

Browse source
This commit is contained in:
Harvey Kandola 2016-10-04 15:24:21 -07:00
parent cb4dedeb37
commit 20f9272d46
28 changed files with 729 additions and 695 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -49,6 +49,7 @@ _testmain.go
/app/libpeerconnection.log /app/libpeerconnection.log
/app/npm-debug.log /app/npm-debug.log
/app/testem.log /app/testem.log
node_modules
# Misc. # Misc.
build build

20
app/.editorconfig Normal file
View 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

3
app/app/components/document/tag-editor.js
View file

@ -19,7 +19,8 @@ export default Ember.Component.extend({
maxTags: 3, maxTags: 3,
canAdd: false, canAdd: false,
didInitAttrs() { init() {
this._super(...arguments);
let tagz = []; let tagz = [];
if (this.get('documentTags').length > 1) { if (this.get('documentTags').length > 1) {

3
app/app/components/folder/document-tags.js
View file

@ -15,7 +15,8 @@ export default Ember.Component.extend({
documentTags: [], documentTags: [],
tagz: [], tagz: [],
didInitAttrs() { init() {
this._super(...arguments);
let tagz = []; let tagz = [];
if (this.get('documentTags').length > 1) { if (this.get('documentTags').length > 1) {

4
app/app/components/layout/zone-navigation.js
View file

@ -22,7 +22,9 @@ export default Ember.Component.extend({
appMeta: service(), appMeta: service(),
session: service(), session: service(),
didInitAttrs() { init() {
this._super(...arguments);
if (this.get("session.authenticated")) { if (this.get("session.authenticated")) {
this.get("session.session.content.authenticated.user.accounts").forEach((account) => { this.get("session.session.content.authenticated.user.accounts").forEach((account) => {
// TODO: do not mutate account.active here // TODO: do not mutate account.active here

4
app/app/components/search/tag-list.js
View file

@ -15,7 +15,9 @@ export default Ember.Component.extend({
documentTags: [], documentTags: [],
tagz: [], tagz: [],
didInitAttrs() { init() {
this._super(...arguments);
let tagz = []; let tagz = [];
if (this.get('documentTags').length > 1) { if (this.get('documentTags').length > 1) {

4
app/app/components/section/code/type-editor.js
View file

@ -19,7 +19,9 @@ export default Ember.Component.extend(TooltipMixin, {
syntaxOptions: [], syntaxOptions: [],
codeSyntax: null, codeSyntax: null,
didInitAttrs() { init() {
this._super(...arguments);
let self = this; let self = this;
CodeMirror.modeURL = "codemirror/mode/%N/%N.js"; CodeMirror.modeURL = "codemirror/mode/%N/%N.js";

2
app/app/components/section/wysiwyg/type-editor.js
View file

@ -77,7 +77,7 @@ export default Ember.Component.extend({
}; };
if (typeof tinymce === 'undefined') { 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; window.tinymce.dom.Event.domLoaded = true;
tinymce.baseURL = "//" + window.location.host + "/tinymce"; tinymce.baseURL = "//" + window.location.host + "/tinymce";
tinymce.suffix = ".min"; tinymce.suffix = ".min";

19
app/app/index.html
View file

@ -13,19 +13,20 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <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="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="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/vendor.css">
<link rel="stylesheet" href="assets/documize.css"> {{content-for 'head-footer'}} <link rel="stylesheet" href="/assets/documize.css">
{{content-for 'head-footer'}}
</head> </head>
<body> <body>
{{content-for 'body'}} {{content-for 'body'}}
<script src="assets/vendor.js"></script> <script src="/assets/vendor.js"></script>
<script src="assets/documize.js"></script> <script src="/assets/documize.js"></script>
<script src="codemirror/lib/codemirror.js"></script> <script src="/codemirror/lib/codemirror.js"></script>
<script src="codemirror/mode/meta.js"></script> <script src="/codemirror/mode/meta.js"></script>
<script src="codemirror/addon/mode/loadmode.js"></script> <script src="/codemirror/addon/mode/loadmode.js"></script>
<script src="codemirror/addon/runmode/runmode.js"></script> <script src="/codemirror/addon/runmode/runmode.js"></script>
<script src="codemirror/addon/runmode/colorize.js"></script> <script src="/codemirror/addon/runmode/colorize.js"></script>
{{content-for 'body-footer'}} {{content-for 'body-footer'}}
</body> </body>

2
app/app/pods/auth/forgot/template.hbs
View file

@ -1,6 +1,6 @@
<div class="auth-box"> <div class="auth-box">
<div class="logo"> <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>
<div class="login-form"> <div class="login-form">
{{forgot-password forgot=(action 'forgot')}} {{forgot-password forgot=(action 'forgot')}}

2
app/app/pods/auth/login/template.hbs
View file

@ -1,6 +1,6 @@
<div class="auth-box"> <div class="auth-box">
<div class="logo"> <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>
<div class="login-form"> <div class="login-form">
<form id="login-form" {{action 'login' on="submit"}}> <form id="login-form" {{action 'login' on="submit"}}>

2
app/app/pods/auth/reset/template.hbs
View file

@ -1,6 +1,6 @@
<div class="auth-box"> <div class="auth-box">
<div class="logo"> <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>
{{password-reset reset=(action 'reset')}} {{password-reset reset=(action 'reset')}}
</div> </div>

2
app/app/pods/auth/sso/template.hbs
View file

@ -1,4 +1,4 @@
<div class="sso-box"> <div class="sso-box">
<p>Signing in...</p> <p>Signing in...</p>
<img src="assets/img/busy-gray.gif" /> <img src="/assets/img/busy-gray.gif" />
</div> </div>

1
app/app/styles/view/page-settings.scss
View file

@ -1,5 +1,4 @@
.global-folder-settings { .global-folder-settings {
} }
.user-list { .user-list {

2
app/app/templates/components/document/document-view.hbs
View file

@ -14,7 +14,7 @@
<ul class="list"> <ul class="list">
{{#each attachments key="id" as |a index|}} {{#each attachments key="id" as |a index|}}
<li class="item"> <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 }}"> <a href="{{ appMeta.endpoint }}/public/attachments/{{ appMeta.orgId }}/{{ a.job }}/{{ a.fileId }}">
<span class="file">{{ a.filename }}</span> <span class="file">{{ a.filename }}</span>
</a> </a>

2
app/app/templates/components/document/editor-history.hbs
View file

@ -33,7 +33,7 @@
</div> </div>
{{#if busy}} {{#if busy}}
<div class="processing"> <div class="processing">
<img src="assets/img/processing.gif" /> <img src="/assets/img/processing.gif" />
<div class="caption">Preparing</div> <div class="caption">Preparing</div>
</div> </div>
{{/if}} {{/if}}

4
app/app/templates/components/general-settings.hbs
View file

@ -1,6 +1,6 @@
<form> <form>
<div class="heading"> <div class="input-control">
<div class="title">General Settings</div> <label>General Settings</label>
<div class="tip">Tell people about this Documize instance</div> <div class="tip">Tell people about this Documize instance</div>
</div> </div>
<div> <div>

6
app/app/templates/components/onboard/share-folder.hbs
View file

@ -2,7 +2,7 @@
<div class="sidebar"> <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"> <div class="stage-1">
<h1>Hello!</h1> <h1>Hello!</h1>
@ -52,12 +52,12 @@
<div class="stage-1"> <div class="stage-1">
<div class="account-name-preview"> <div class="account-name-preview">
<div class="nav-icon"></div> <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>
<div class="stage-2"> <div class="stage-2">
<div class="account-name-preview"> <div class="account-name-preview">
<div class="nav-icon"></div> <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>
<div class="stage-3"> <div class="stage-3">
<div class="account-name-preview"> <div class="account-name-preview">

2
app/app/templates/components/section/base-editor.hbs
View file

@ -9,7 +9,7 @@
</div> </div>
<div class="buttons pull-right"> <div class="buttons pull-right">
{{#if busy}} {{#if busy}}
<img src="assets/img/busy-gray.gif" class="busy-indicator" /> <img src="/assets/img/busy-gray.gif" class="busy-indicator" />
{{/if}} {{/if}}
<div id="editor-cancel" class="flat-button flat-gray" {{action 'onCancel'}}>{{cancelLabel}}</div> <div id="editor-cancel" class="flat-button flat-gray" {{action 'onCancel'}}>{{cancelLabel}}</div>
<div class="button-gap" /> <div class="button-gap" />

4
app/app/templates/components/user-settings.hbs
View file

@ -1,6 +1,6 @@
<form> <form>
<div class="heading"> <div class="input-control">
<div class="title">Add User</div> <label>Add User</label>
<div class="tip">New users receive an invitation email with a random password</div> <div class="tip">New users receive an invitation email with a random password</div>
</div> </div>
<div class="input-control"> <div class="input-control">

21
app/bower.json
View file

@ -1,22 +1,7 @@
{ {
"name": "documize", "name": "documize",
"dependencies": { "dependencies": {
"ember": "v2.5.1", "ember": "~2.8.0",
"ember-cli-shims": "0.1.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"
} }

3
app/config/environment.js
View file

@ -18,7 +18,8 @@ module.exports = function (environment) {
podModulePrefix: 'documize/pods', podModulePrefix: 'documize/pods',
locationType: 'auto', locationType: 'auto',
environment: environment, environment: environment,
baseURL: '/', rootURL: '/',
// baseURL: '/',
apiHost: '', apiHost: '',
apiNamespace: '', apiNamespace: '',
contentSecurityPolicyHeader: 'Content-Security-Policy-Report-Only', contentSecurityPolicyHeader: 'Content-Security-Policy-Report-Only',

9
app/package.json
View file

@ -21,7 +21,7 @@
"devDependencies": { "devDependencies": {
"broccoli-asset-rev": "^2.4.2", "broccoli-asset-rev": "^2.4.2",
"ember-ajax": "2.3.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-app-version": "^1.0.0",
"ember-cli-babel": "^5.1.6", "ember-cli-babel": "^5.1.6",
"ember-cli-dependency-checker": "^1.2.0", "ember-cli-dependency-checker": "^1.2.0",
@ -30,12 +30,13 @@
"ember-cli-inject-live-reload": "^1.4.0", "ember-cli-inject-live-reload": "^1.4.0",
"ember-cli-jshint": "^1.0.0", "ember-cli-jshint": "^1.0.0",
"ember-cli-mirage": "^0.2.0", "ember-cli-mirage": "^0.2.0",
"ember-cli-qunit": "^1.4.0", "ember-cli-qunit": "^2.1.0",
"ember-cli-release": "0.2.8", "ember-cli-release": "0.2.9",
"ember-cli-test-loader": "^1.1.0",
"ember-cli-sass": "5.3.1", "ember-cli-sass": "5.3.1",
"ember-cli-sri": "^2.1.0", "ember-cli-sri": "^2.1.0",
"ember-cli-uglify": "^1.2.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-export-application-global": "^1.0.5",
"ember-load-initializers": "^0.5.1", "ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3", "ember-resolver": "^2.0.3",

3
app/public/robots.txt Normal file
View file

@ -0,0 +1,3 @@
# http://www.robotstxt.org
User-agent: *
Disallow:

1
app/tests/helpers/destroy-app.js
View file

@ -2,5 +2,4 @@ import Ember from 'ember';
export default function destroyApp(application) { export default function destroyApp(application) {
Ember.run(application, 'destroy'); Ember.run(application, 'destroy');
server.shutdown();
} }

55
app/tests/helpers/module-for-acceptance.js
View file

@ -1,39 +1,32 @@
import { module } from 'qunit'; import { module } from 'qunit';
import Ember from 'ember';
import startApp from '../helpers/start-app'; import startApp from '../helpers/start-app';
import destroyApp from '../helpers/destroy-app'; import destroyApp from '../helpers/destroy-app';
export default function (name, options = {}) { const { RSVP: { Promise } } = Ember;
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);
if (options.beforeEach) { export default function(name, options = {}) {
options.beforeEach.apply(this, arguments); 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) => { if (options.beforeEach) {
let instance = this.application.__deprecatedInstance__; return options.beforeEach.apply(this, arguments);
let registry = instance.register ? instance : instance.registry; }
},
return registry.register(fullName, Factory); afterEach() {
}; let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
}, return Promise.resolve(afterEach).then(() => destroyApp(this.application));
}
afterEach() { });
destroyApp(this.application);
if (options.afterEach) {
options.afterEach.apply(this, arguments);
}
}
});
} }

4
core/product.go
View file

@ -26,8 +26,8 @@ type ProdInfo struct {
// Product returns product edition details // Product returns product edition details
func Product() (p ProdInfo) { func Product() (p ProdInfo) {
p.Major = "0" p.Major = "0"
p.Minor = "22" p.Minor = "23"
p.Patch = "1" p.Patch = "0"
p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch) p.Version = fmt.Sprintf("%s.%s.%s", p.Major, p.Minor, p.Patch)
p.Edition = "Community" p.Edition = "Community"
p.Title = fmt.Sprintf("%s Edition", p.Edition) p.Title = fmt.Sprintf("%s Edition", p.Edition)

1215
embed/bindata_assetfs.go
View file

File diff suppressed because one or more lines are too long