Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
2b41725
Initial import
JLiscom Apr 14, 2014
7489170
Test
JLiscom Apr 14, 2014
fc5ab05
Untracked bower
Apr 15, 2014
56f1914
Unwatch Bower
Apr 15, 2014
453ce2d
test
JLiscom Apr 15, 2014
7aa73a9
Having trouble with eclipse
JLiscom Apr 15, 2014
2e5f44b
Test commit
JLiscom Apr 15, 2014
4667aa3
End of day commit.
JLiscom Apr 15, 2014
c8a50f9
Extracted note screen into a partial.
JLiscom Apr 16, 2014
2e306fa
Redirect to login fixed.
JLiscom Apr 17, 2014
6d6f843
view of notes and folders working
JLiscom Apr 17, 2014
c7d410b
Update README.md
FoxUSA Apr 18, 2014
26a9973
Create License.txt
FoxUSA Apr 18, 2014
c382ef3
Notes and folders most of the way done
JLiscom Apr 19, 2014
4171713
Merge branch 'Fox-Working' of git@github.com:FoxUSA/OpenNote.git into…
JLiscom Apr 19, 2014
d569cc2
Misc Changes
JLiscom Apr 19, 2014
78cbfb5
Updated ignore file
JLiscom Apr 19, 2014
81aaed3
Now including most dependencies Fixes #36 and #35
JLiscom Apr 19, 2014
7a4ca7d
List view in progress
JLiscom Apr 20, 2014
b4a3b98
Fix token header issue caused by the list controller being declared
JLiscom Apr 21, 2014
8f80014
Fixed UI layout so it allignes on both sides in a responsive way
JLiscom Apr 21, 2014
210086d
Clickable list,
JLiscom Apr 22, 2014
0ad0450
Animations
JLiscom Apr 27, 2014
7e9be41
Rename and delete folder methods implemented
JLiscom Apr 30, 2014
368a226
List now works when list is blank
JLiscom Apr 30, 2014
b83ab49
Extracted tree partial. using newest version of angular-ui-tree
JLiscom May 1, 2014
4e42b4b
Update README.md
FoxUSA May 1, 2014
a1de7cc
Update README.md
FoxUSA May 1, 2014
2708065
Update README.md
FoxUSA May 1, 2014
8160a6f
Update README.md
FoxUSA May 1, 2014
0375cf0
Update README.md
FoxUSA May 1, 2014
32a7dac
Update README.md
FoxUSA May 1, 2014
1ff3be8
Update README.md
FoxUSA May 1, 2014
a175f83
In progress of replaceing jq dialog with alertify
JLiscom May 1, 2014
6a81775
In progress of using grunt to build css using less.
JLiscom May 2, 2014
97f2bc2
Ignore file update for node modules
JLiscom May 2, 2014
fd1603d
Fixes #41
JLiscom May 4, 2014
4272ab2
Added logout button closes #29.
JLiscom May 7, 2014
3872f88
Added
JLiscom May 10, 2014
4d57731
Merge branch 'Fox-Working' of github.com:FoxUSA/OpenNote into Fox-Wor…
JLiscom May 10, 2014
a0985f1
Tests and updated service reference
JLiscom May 12, 2014
028d109
Changed get on folder to a query
JLiscom May 18, 2014
0f72a0c
register working
JLiscom May 18, 2014
0fc498d
Server config added
JLiscom Jun 3, 2014
1e93a28
Resolves #42
JLiscom Jun 6, 2014
0b9dc6a
Added serverConfig tests
JLiscom Jun 6, 2014
6bd3658
travic ci should now run tests
JLiscom Jun 6, 2014
3746fd1
Take two ci support
JLiscom Jun 6, 2014
855bd20
' to "
JLiscom Jun 6, 2014
5fc3b69
Fixed bug where dragging folder may not reflect in view without
JLiscom Jun 7, 2014
48f12f1
Fixes #49
JLiscom Jun 9, 2014
8d217bb
Closes #44 and #49
JLiscom Jun 10, 2014
99f7492
49
JLiscom Jun 10, 2014
89f3358
Misc issues
JLiscom Jun 10, 2014
9cf8168
Adds authenticatio via a cookie(grumble grumble) for #42. Adds #45
JLiscom Jun 11, 2014
cc158c7
Fixed deplot script.
JLiscom Jun 19, 2014
4e2c80d
Fix build
JLiscom Jun 19, 2014
f0ddf0f
Made get call on folders a little cleaner
JLiscom Jun 30, 2014
cbdb428
Fixed misc style issue.
JLiscom Jul 5, 2014
fdc730f
Small change to styling
JLiscom Jul 5, 2014
a160305
Initial work in search
JLiscom Jul 10, 2014
f2e2166
Working on find
JLiscom Jul 11, 2014
b6a7ee8
Working on search
JLiscom Jul 12, 2014
9a6e9d5
https://github.com/FoxUSA/OpenNote/issues/54
JLiscom Jul 13, 2014
640a6d2
https://github.com/FoxUSA/OpenNote/issues/58
JLiscom Jul 13, 2014
93d98aa
Merge branch 'master' into Fox-Working
JLiscom Jul 13, 2014
9ef29d4
Updated Docs
JLiscom Jul 13, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/bower_components
/node_modules
/build
29 changes: 18 additions & 11 deletions .project
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OpenNote</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
</buildSpec>
<natures>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>OpenNote</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>tern.eclipse.ide.core.ternBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.angularjs.core.angularnature</nature>
<nature>tern.eclipse.ide.core.ternnature</nature>
</natures>
</projectDescription>
14 changes: 7 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php
php:
- "5.5"
- "5.4"
- "5.3"
script: phpunit --configuration ./OpenNote.Test
language: node_js
node_js:
- '0.10'
before_script:
- 'npm install -g grunt-cli'


2 changes: 1 addition & 1 deletion Doc/HowToUse.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
How To Use
How to use
--------------
OpenNote uses a touch to open scheme.
If you want to open something just click it.
Expand Down
2 changes: 1 addition & 1 deletion Doc/Install.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# How To Install
# How to install
# Automatic(Wizard Based Install)
To run the installer open
`<install path>/Service/install.php`
Expand Down
2 changes: 1 addition & 1 deletion Doc/Upgrade.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# How To Upgrade
# How to upgrade
###MYSql
- Make sure you make a copy of you database and the OpenNote directory
- Run `Service/model/sql/updateScript/` scripts to roll the database up to current specs.
Expand Down
128 changes: 128 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,128 @@
module.exports = function(grunt) {
//Initializing the configuration object
grunt.initConfig({
//Style
less: {
devDark: {
options: {
paths: ["assets/css"],
modifyVars: {
offset: "#000000"
}
},
files: {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"

}
},
devLight: {
options: {
paths: ["assets/css"],
modifyVars: {
offset: "#FFFFFF"
}
},
files: {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
},
prodDark: {
options: {
paths: ["assets/css"],
cleancss: true,
modifyVars: {
offset: "#000000"
}
},
files: {
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/dark/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/dark/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
},
prodLight: {
options: {
paths: ["assets/css"],
cleancss: true,
modifyVars: {
offset: "#FFFFFF"
}
},
files: {
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
"OpenNote/openNote/style/invert/light/note.css": "OpenNote/openNote/style/invert/note.less",
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less",
"OpenNote/openNote/style/invert/light/intojs.css": "OpenNote/openNote/style/invert/introjs.less"
}
}
},
//Testing setup
karma: {
unit: {
configFile: "OpenNote.Test/karma.conf.js",
background: true
},
travis: {
configFile: "OpenNote.Test/karma.conf.js",
singleRun: true,
browsers: ["PhantomJS"]//Override config browsers
}
},
watch: {
karma: {
files: ["src/**/*.js", "test/unit/**/*.js"],
tasks: ["karma:unit:run"]
}
},
shell: {
bowerInstall: {
command: [ "cd OpenNote",
"bower install" ].join("&&")
},
clean:{
command: [ "rm -rf build",
"cd OpenNote",
"rm -rf bower_components",
"cd openNote/style/invert/",
"rm -rf dark",
"rm -rf light"].join("&&")
},
phpPackage:{
command: [ "mkdir build",
"cd build",
"cp -r ../OpenNote/* ./",
"cp -r ../../OpenNoteService-PHP/Service ./",
"cp -r ../../OpenNoteService-PHP/vendor ./"].join("&&")
}
}
});

//Plugin loading
grunt.loadNpmTasks("grunt-contrib-less");
grunt.loadNpmTasks("grunt-contrib-watch");
grunt.loadNpmTasks("grunt-karma");
grunt.loadNpmTasks("grunt-shell");

//Task definition
//css
grunt.registerTask("buildDevCSS", ["less:devDark","less:devLight"]);
grunt.registerTask("buildProdCSS", ["less:prodDark","less:prodLight"]);

//deployment
grunt.registerTask("clean", ["shell:clean"]);
grunt.registerTask("build", ["shell:bowerInstall", "buildDevCSS"]);
grunt.registerTask("default", ["build"]);
grunt.registerTask("deploy", ["clean", "shell:bowerInstall", "buildProdCSS", "shell:phpPackage"]);

//testing
grunt.registerTask("devmode", ["karma:unit", "watch"]);
grunt.registerTask("test", ["karma:travis"])
grunt.registerTask("ci", ["build","karma:travis"])
};
21 changes: 21 additions & 0 deletions License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
The MIT License (MIT)

Copyright (c) 2014 Jacob Liscom

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:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
3 changes: 0 additions & 3 deletions OpenNote.Test/.gitignore

This file was deleted.

17 changes: 0 additions & 17 deletions OpenNote.Test/TestingConfig.php

This file was deleted.

32 changes: 32 additions & 0 deletions OpenNote.Test/karma.conf.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
module.exports = function(config){
config.set({
basePath : "../",
files : [
"OpenNote/bower_components/angular/angular.js",
"OpenNote/bower_components/angular-mocks/angular-mocks.js",
"OpenNote/bower_components/angular-route/angular-route.js",
"OpenNote/bower_components/angular-resource/angular-resource.js",
"OpenNote/bower_components/angular-sanitize/angular-sanitize.js",
"OpenNote/bower_components/angular-animate/angular-animate.js",
"OpenNote/bower_components/angular-ui-tree/dist/angular-ui-tree.js",
"OpenNote/bower_components/jquery/jquery.js",
"OpenNote/openNote/openNote.js",
"OpenNote/openNote/**/*.js",
"OpenNote.Test/**/*.js"
],
autoWatch : false,
frameworks: ["jasmine"],
browsers : ["Firefox"],
plugins : [
"karma-junit-reporter",
"karma-chrome-launcher",
"karma-firefox-launcher",
"karma-phantomjs-launcher",
"karma-jasmine"
],
junitReporter : {
outputFile: "test_out/unit.xml",
suite: "unit"
}
})
}
24 changes: 0 additions & 24 deletions OpenNote.Test/phpunit.xml.dist

This file was deleted.

17 changes: 0 additions & 17 deletions OpenNote.Test/runner.php

This file was deleted.

Loading