Skip to content

Commit dd1c4da

Browse files
FoxUSAFoxUSA
committed
Merge pull request #63 from FoxUSA/Fox-Working
Fox working
2 parents 5e20a3f + 9ef29d4 commit dd1c4da

File tree

406 files changed

+2494
-26226
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

406 files changed

+2494
-26226
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/bower_components
2+
/node_modules
3+
/build

‎.project‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<projectDescription>
3-
<name>OpenNote</name>
4-
<comment></comment>
5-
<projects>
6-
</projects>
7-
<buildSpec>
8-
</buildSpec>
9-
<natures>
10-
</natures>
11-
</projectDescription>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>OpenNote</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>tern.eclipse.ide.core.ternBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
</buildSpec>
14+
<natures>
15+
<nature>org.eclipse.angularjs.core.angularnature</nature>
16+
<nature>tern.eclipse.ide.core.ternnature</nature>
17+
</natures>
18+
</projectDescription>

‎.travis.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
language: php
2-
php:
3-
- "5.5"
4-
- "5.4"
5-
- "5.3"
6-
7-
script: phpunit --configuration ./OpenNote.Test
1+
language: node_js
2+
node_js:
3+
- '0.10'
4+
before_script:
5+
- 'npm install -g grunt-cli'
6+
7+

‎Doc/HowToUse.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
How To Use
1+
How to use
22
--------------
33
OpenNote uses a touch to open scheme.
44
If you want to open something just click it.

‎Doc/Install.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# How To Install
1+
# How to install
22
# Automatic(Wizard Based Install)
33
To run the installer open
44
`<install path>/Service/install.php`

‎Doc/Upgrade.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# How To Upgrade
1+
# How to upgrade
22
###MYSql
33
- Make sure you make a copy of you database and the OpenNote directory
44
- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.

‎Gruntfile.js‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
module.exports = function(grunt) {
2+
//Initializing the configuration object
3+
grunt.initConfig({
4+
//Style
5+
less: {
6+
devDark: {
7+
options: {
8+
paths: ["assets/css"],
9+
modifyVars: {
10+
offset: "#000000"
11+
}
12+
},
13+
files: {
14+
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
15+
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
16+
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
17+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
18+
19+
}
20+
},
21+
devLight: {
22+
options: {
23+
paths: ["assets/css"],
24+
modifyVars: {
25+
offset: "#FFFFFF"
26+
}
27+
},
28+
files: {
29+
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
30+
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
31+
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
32+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
33+
}
34+
},
35+
prodDark: {
36+
options: {
37+
paths: ["assets/css"],
38+
cleancss: true,
39+
modifyVars: {
40+
offset: "#000000"
41+
}
42+
},
43+
files: {
44+
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
45+
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
46+
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
47+
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
48+
}
49+
},
50+
prodLight: {
51+
options: {
52+
paths: ["assets/css"],
53+
cleancss: true,
54+
modifyVars: {
55+
offset: "#FFFFFF"
56+
}
57+
},
58+
files: {
59+
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
60+
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
61+
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
62+
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
63+
}
64+
}
65+
},
66+
//Testing setup
67+
karma: {
68+
unit: {
69+
configFile: "OpenNote.Test/karma.conf.js",
70+
background: true
71+
},
72+
travis: {
73+
configFile: "OpenNote.Test/karma.conf.js",
74+
singleRun: true,
75+
browsers: ["PhantomJS"]//Override config browsers
76+
}
77+
},
78+
watch: {
79+
karma: {
80+
files: ["src/**/*.js", "test/unit/**/*.js"],
81+
tasks: ["karma:unit:run"]
82+
}
83+
},
84+
shell: {
85+
bowerInstall: {
86+
command: [ "cd OpenNote",
87+
"bower install" ].join("&&")
88+
},
89+
clean:{
90+
command: [ "rm -rf build",
91+
"cd OpenNote",
92+
"rm -rf bower_components",
93+
"cd openNote/style/invert/",
94+
"rm -rf dark",
95+
"rm -rf light"].join("&&")
96+
},
97+
phpPackage:{
98+
command: [ "mkdir build",
99+
"cd build",
100+
"cp -r ../OpenNote/* ./",
101+
"cp -r ../../OpenNoteService-PHP/Service ./",
102+
"cp -r ../../OpenNoteService-PHP/vendor ./"].join("&&")
103+
}
104+
}
105+
});
106+
107+
//Plugin loading
108+
grunt.loadNpmTasks("grunt-contrib-less");
109+
grunt.loadNpmTasks("grunt-contrib-watch");
110+
grunt.loadNpmTasks("grunt-karma");
111+
grunt.loadNpmTasks("grunt-shell");
112+
113+
//Task definition
114+
//css
115+
grunt.registerTask("buildDevCSS", ["less:devDark","less:devLight"]);
116+
grunt.registerTask("buildProdCSS", ["less:prodDark","less:prodLight"]);
117+
118+
//deployment
119+
grunt.registerTask("clean", ["shell:clean"]);
120+
grunt.registerTask("build", ["shell:bowerInstall", "buildDevCSS"]);
121+
grunt.registerTask("default", ["build"]);
122+
grunt.registerTask("deploy", ["clean", "shell:bowerInstall", "buildProdCSS", "shell:phpPackage"]);
123+
124+
//testing
125+
grunt.registerTask("devmode", ["karma:unit", "watch"]);
126+
grunt.registerTask("test", ["karma:travis"])
127+
grunt.registerTask("ci", ["build","karma:travis"])
128+
};

‎License.txt‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014 Jacob Liscom
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

‎OpenNote.Test/.gitignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎OpenNote.Test/TestingConfig.php‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)