repo
string
commit
string
message
string
diff
string
bensomers/openaccess
ca2e616c039dd8d97555de89710793b440374e17
Added gitignore
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bf93449 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*~ +log/* +tmp/* +db/schema.rb +Rakefile +.DS_Store +.project +*.orig +*.sqlite3
n3dst4/irid
d9aa887c01c90fc7a2e1b9708e2b1dd8d2ff9d51
remove circular dependency
diff --git a/src/can-interpret.js b/src/can-interpret.js deleted file mode 100644 index ca4bdc1..0000000 --- a/src/can-interpret.js +++ /dev/null @@ -1,22 +0,0 @@ -import Irid from "./irid"; -import hexToRGB from "./hex-to-rgb"; -import cssRGBToRGB from "./css-rgb-to-rgb"; -import cssHSLToHSL from "./css-hsl-to-hsl"...
n3dst4/irid
478b1f572d32baac031089200a67373b6ae65cc2
Revert "switch to es modules output"
diff --git a/tsconfig.json b/tsconfig.json index b32d68b..63f9932 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,14 +1,14 @@ { "compilerOptions":{ - "module": "ESNext", + "module": "commonjs", "sourceMap": true, - "target": "ESNext", + "target": "es5", "i...
n3dst4/irid
afec6fc6a8ddb95e9acab143cd69bc6a55da2bc7
export Irid as a named export
diff --git a/src/irid.js b/src/irid.js index 372b7b6..f9616c8 100644 --- a/src/irid.js +++ b/src/irid.js @@ -1,296 +1,296 @@ import hexToRGB from "./hex-to-rgb"; import cssHSLToHSL from "./css-hsl-to-hsl"; import cssRGBToRGB from "./css-rgb-to-rgb"; import hslToCSSHSL from "./hsl-to-css-hsl"; import rgbToCSSRGB fr...
n3dst4/irid
bcd0bb05d82d67bc636be9e3d55f08b26d74e530
switch to es modules output
diff --git a/tsconfig.json b/tsconfig.json index 63f9932..b32d68b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,14 +1,14 @@ { "compilerOptions":{ - "module": "commonjs", + "module": "ESNext", "sourceMap": true, - "target": "es5", + "target": "ESNext", "i...
n3dst4/irid
35500af370bfbc3d71f8472279a70bb5d3065b7e
Fixes README markdown
diff --git a/README.markdown b/README.markdown index a8d6ccd..4212bfa 100644 --- a/README.markdown +++ b/README.markdown @@ -1,426 +1,426 @@ Irid ====== ![travis build status](https://travis-ci.org/n3dst4/irid.svg) Parse, convert and manipulate colors. For a page which makes extensive use of irid.js, see htt...
n3dst4/irid
ff2bb01222d04b99b64b0c1eff6a30872de9b788
npm audit fix --force
diff --git a/package-lock.json b/package-lock.json index 87afe52..569b550 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,4603 +1,4514 @@ { "name": "irid", "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/code-frame": { + "version": "7.0.0", + ...
n3dst4/irid
c3d8c6dfae2cd0258898b6ba578e0cca58421d31
npm audit
diff --git a/package-lock.json b/package-lock.json index 3d47158..87afe52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,3751 +1,4603 @@ { "name": "irid", "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint-config-n3dst4": { "version": ...
n3dst4/irid
2f8b5703a0bbae64b6259e75c60722885da74322
remove a stray console.log
diff --git a/src/irid.js b/src/irid.js index 50460ac..372b7b6 100644 --- a/src/irid.js +++ b/src/irid.js @@ -1,298 +1,296 @@ import hexToRGB from "./hex-to-rgb"; import cssHSLToHSL from "./css-hsl-to-hsl"; import cssRGBToRGB from "./css-rgb-to-rgb"; import hslToCSSHSL from "./hsl-to-css-hsl"; import rgbToCSSRGB fr...
n3dst4/irid
3062edb7cb63d2bb96791d78139029999b58efa7
2.0.0-alpha.4
diff --git a/package-lock.json b/package-lock.json index 8394ca1..3352e62 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,515 +1,515 @@ { "name": "irid", - "version": "2.0.0-alpha.3", + "version": "2.0.0-alpha.4", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint...
n3dst4/irid
6c9f9ecff333642bdd39c89efb211c01e618f96c
fix race condition at startup
diff --git a/src/irid.js b/src/irid.js index aa92c45..50460ac 100644 --- a/src/irid.js +++ b/src/irid.js @@ -1,298 +1,298 @@ import hexToRGB from "./hex-to-rgb"; import cssHSLToHSL from "./css-hsl-to-hsl"; import cssRGBToRGB from "./css-rgb-to-rgb"; import hslToCSSHSL from "./hsl-to-css-hsl"; import rgbToCSSRGB fr...
n3dst4/irid
70688dfb1873985f6235aa8ea381fe4682a71270
2.0.0-alpha.3
diff --git a/package-lock.json b/package-lock.json index 5284b55..8394ca1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,515 +1,515 @@ { "name": "irid", - "version": "2.0.0-alpha.2", + "version": "2.0.0-alpha.3", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint...
n3dst4/irid
575e6012897df30bb24640f077b96ac2a65a4809
get build working
diff --git a/package.json b/package.json index db5a509..43afbcb 100644 --- a/package.json +++ b/package.json @@ -1,43 +1,43 @@ { "name": "irid", "version": "2.0.0-alpha.2", "description": "Parse, convert and manipulate colors", "main": "__build/irid.js", "scripts": { "test": "cross-env NODE_ENV=tes...
n3dst4/irid
d007ad7a65a51fc8dfc8ee48e1a478584e8a2b7e
get tests running in TS
diff --git a/package-lock.json b/package-lock.json index 6df3fb0..5284b55 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,4777 +1,3751 @@ { "name": "irid", "version": "2.0.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint-config-n3dst4": { "ve...
n3dst4/irid
7422281eb3ba6064dcdee86e93081bf7f93582e6
remove vestiges of karma config
diff --git a/karma.conf.js b/karma.conf.js deleted file mode 100644 index f5a9f11..0000000 --- a/karma.conf.js +++ /dev/null @@ -1,96 +0,0 @@ -// Karma configuration - -// Run normally, this Karma config will stay open in watch mode and re-run your -// tests when the code changes. It will also pop-up a desktop notifica...
n3dst4/irid
2b694eddffa110c84f89f19b7f131b13ea5b49e2
2.0.0-alpha.2
diff --git a/package-lock.json b/package-lock.json index a5e02f0..d28b91b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,515 +1,515 @@ { "name": "irid", - "version": "2.0.0-alpha.1", + "version": "2.0.0-alpha.2", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint...
n3dst4/irid
87edabbb1714e87df0b1b7604b31da64dee0fd57
#3 add `opacity` as alias for `alpha`
diff --git a/README.markdown b/README.markdown index 78fa196..a8d6ccd 100644 --- a/README.markdown +++ b/README.markdown @@ -1,421 +1,426 @@ Irid ====== ![travis build status](https://travis-ci.org/n3dst4/irid.svg) Parse, convert and manipulate colors. For a page which makes extensive use of irid.js, see htt...
n3dst4/irid
8b4770212818f40fe2e74b3c079dc29e23decfd8
#8 blurb on color generation
diff --git a/README.markdown b/README.markdown index 69f634d..78fa196 100644 --- a/README.markdown +++ b/README.markdown @@ -1,403 +1,421 @@ Irid ====== ![travis build status](https://travis-ci.org/n3dst4/irid.svg) Parse, convert and manipulate colors. For a page which makes extensive use of irid.js, see htt...
n3dst4/irid
8dedd7e2221ce7a8c67b51f6ac1cb388348789d4
use mocha reporter
diff --git a/karma.conf.js b/karma.conf.js index 7bb6d9b..f5a9f11 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,96 +1,96 @@ // Karma configuration // Run normally, this Karma config will stay open in watch mode and re-run your // tests when the code changes. It will also pop-up a desktop notification on //...
n3dst4/irid
764fdfbd569dbcacc047fc21626781a9d49ec186
colour -> color throughout
diff --git a/src/irid.js b/src/irid.js index b7cb854..aca627b 100644 --- a/src/irid.js +++ b/src/irid.js @@ -1,286 +1,286 @@ import hexToRGB from "./hex-to-rgb"; import cssHSLToHSL from "./css-hsl-to-hsl"; import cssRGBToRGB from "./css-rgb-to-rgb"; import hslToCSSHSL from "./hsl-to-css-hsl"; import rgbToCSSRGB fr...
n3dst4/irid
b3787517001e56564b89b8fa3c1e2f184f0746db
prerelease version
diff --git a/package.json b/package.json index c0bacad..81dac66 100644 --- a/package.json +++ b/package.json @@ -1,78 +1,78 @@ { "name": "irid", - "version": "2.0.0", + "version": "2.0.0-alpha.1", "description": "Parse, convert and manipulate colors", "main": "__build/irid.js", "scripts": { "test": ...
n3dst4/irid
8a881b70c8e6b5ac0f663cb493b92fd5a86ea27d
move swatches into their own file
diff --git a/src/irid.js b/src/irid.js index 95c4b60..b7cb854 100644 --- a/src/irid.js +++ b/src/irid.js @@ -1,440 +1,286 @@ -/* xeslint "comma-spacing": 0, "space-infix-ops": 0, "no-use-before-define": 0, "space-unary-ops": 0 */ -/* global module*/ import hexToRGB from "./hex-to-rgb"; import cssHSLToHSL from "./css-...
n3dst4/irid
e9230eea71eb3791fedc22d5da21708b2ad00608
linting & formatting
diff --git a/karma.conf.js b/karma.conf.js index 62d3288..7bb6d9b 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -1,99 +1,96 @@ // Karma configuration // Run normally, this Karma config will stay open in watch mode and re-run your // tests when the code changes. It will also pop-up a desktop notification on //...
n3dst4/irid
3b45a8fbd310f396acf4bb2f8279a59b8f7dcb02
green test suite!
diff --git a/.travis.yml b/.travis.yml index 2197832..bb8c462 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ language: node_js node_js: - - "node" + - node +before_script: + - 'export DISPLAY=:99.0' + - sh -e /etc/init.d/xvfb start diff --git a/karma.conf.js b/karma.conf.js new file mode 100644 index ...
n3dst4/irid
8ac9bc3d3d76d4f2d5babc8053a4781d0050aa8c
start modularizing
diff --git a/package-lock.json b/package-lock.json index d992e6e..ead0ed3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,515 +1,515 @@ { "name": "irid", - "version": "1.0.0", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { "@n3dst4/eslint-config-n3dst4":...
n3dst4/irid
21913d5473dff439d9baa0e20ec4231f7c5f5b4c
wtf happened to all the degree symbols?
diff --git a/README.md b/README.md index 11a4068..0371ce9 100644 --- a/README.md +++ b/README.md @@ -1,402 +1,402 @@ Irid ====== ![travis build status](https://travis-ci.org/n3dst4/irid.svg) Parse, convert and manipulate colours (also known as colors). For a page which makes extensive use of irid.js, see htt...
n3dst4/irid
e688635c5c3928d7c3e847f063e2247f2fae6bd0
rebuild `.min`
diff --git a/irid.min.js b/irid.min.js index e0b6f21..270766a 100644 --- a/irid.min.js +++ b/irid.min.js @@ -1,21 +1,21 @@ var invalidError="Invalid colour specification",undef="undefined",round=Math.round,max=Math.max,min=Math.min,floor=Math.floor,Irid=function(a){if(!(this instanceof Irid))return new Irid(a);if(!a)t...
n3dst4/irid
0ebaffe24f0082682e0f594e49913bf4f75dfbea
defaults for `contrast` are now black and white
diff --git a/irid.js b/irid.js index 97f02a3..b5012f4 100644 --- a/irid.js +++ b/irid.js @@ -1,562 +1,562 @@ /*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, max = Math.m...
n3dst4/irid
0bb26f8ee5237f2decb777e6fefa7ddbb711a4b3
calculate contrast color in a better way
diff --git a/irid.js b/irid.js index a86ae48..97f02a3 100644 --- a/irid.js +++ b/irid.js @@ -1,560 +1,562 @@ /*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, max = Math.m...
n3dst4/irid
62cf799e3223f25949930c34996e447497b654fe
rename old contrast test
diff --git a/tests/tests.js b/tests/tests.js index c9fca39..2da4793 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -1,611 +1,611 @@ /*global require */ if (typeof require !== "undefined") { if (typeof QUnit == 'undefined') { var QUnit = require('qunit-cli'); } var Irid = require("...
n3dst4/irid
995d92d6df6f968c9b91ec3bf9dde04fdffd2d2a
regenerate minified version
diff --git a/irid.min.js b/irid.min.js index ca5faa1..e0b6f21 100644 --- a/irid.min.js +++ b/irid.min.js @@ -1,21 +1,21 @@ var invalidError="Invalid colour specification",undef="undefined",round=Math.round,max=Math.max,min=Math.min,floor=Math.floor,Irid=function(a){if(!(this instanceof Irid))return new Irid(a);if(!a)t...
n3dst4/irid
9a810dcbe118106036a8aed0ee0c2658882c8b42
move existing changelog entries into CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5de822d..018f04f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,18 @@ # Changelog +## 1.2.0 + +* Add "canInterpret" helper function + + +## 1.3.0 + +* Add rebeccapurple and transparent + + ## 1.3.1 -* Add a changelog :) +* Add CHANGELOG.md * Bug fixes from ...
n3dst4/irid
7efe0218f9c1b15afd6e081c370f6d4342d8461d
add travis build status badge
diff --git a/README.md b/README.md index 64dffa9..da3fa25 100644 --- a/README.md +++ b/README.md @@ -1,403 +1,405 @@ Irid ====== +![travis build status](https://travis-ci.org/n3dst4/irid.svg) + Parse, convert and manipulate colours (also known as colors). For a page which makes extensive use of irid.js, see htt...
n3dst4/irid
e83aff7ffa4bef47a7aa99cb979721aa362d04d7
add travis file
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..2197832 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,3 @@ +language: node_js +node_js: + - "node"
n3dst4/irid
040cb6a9c39543cb51360e6db07a0c7fd25b2d0a
add a changelog
diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..5de822d --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +# Changelog + +## 1.3.1 + +* Add a changelog :) +* Bug fixes from @kriskowal: + * Fix luma for colors that have not been RGB initialized + * Fix recognition of HSL CSS candidate color...
n3dst4/irid
452b0354843496dba44302984c00ebda183c7169
enable new tests
diff --git a/tests/tests.js b/tests/tests.js index 1e5e477..c9fca39 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -93,519 +93,519 @@ QUnit.test("hslToCSSHSL", function (assert) { assert.equal( Irid.hslToCSSHSL({h: 0.5, s: 0.6, l: 0.7}), "hsl(180, 60%, 70%)" ); }); QUnit.test("hslToCSSHSL with alpha", ...
n3dst4/irid
41b206b71d7766cb9faab3090df4895ec58eae91
two tests for pending pull requests
diff --git a/tests/tests.js b/tests/tests.js index 502e5c4..1e5e477 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -92,512 +92,520 @@ QUnit.test("rgbToCSSRGB with alpha", function (assert) { QUnit.test("hslToCSSHSL", function (assert) { assert.equal( Irid.hslToCSSHSL({h: 0.5, s: 0.6, l: 0.7}), "hsl(180, 60%...
n3dst4/irid
0e2919d3dcc96adacd2fb1aa3fd9ba8d2c1217f7
Fix recognition of HSL CSS candidate color strings
diff --git a/irid.js b/irid.js index 56fdda8..41a6a31 100644 --- a/irid.js +++ b/irid.js @@ -1,560 +1,560 @@ /*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, max = Math.m...
n3dst4/irid
4ebbde8685142aa4871be5b6bbf8d901e55dd1ae
Fix luma for colors that have not been RGB initialized
diff --git a/irid.js b/irid.js index 56fdda8..9c6d0a6 100644 --- a/irid.js +++ b/irid.js @@ -1,560 +1,560 @@ /*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, max = Math.m...
n3dst4/irid
25a97de1801ded866b65e418f099f5f408a9da69
upgrade minifier to python 3
diff --git a/make_minified.py b/make_minified.py index 7bc145b..860f078 100644 --- a/make_minified.py +++ b/make_minified.py @@ -1,21 +1,21 @@ #!/usr/bin/env python -import urllib2 -import urllib +import urllib.request +import urllib.parse with open("irid.js") as input: code = input.read() -minif...
n3dst4/irid
a2ce74503c38438b358e6be6bf4e73cc905b3706
formatting & comments
diff --git a/irid.js b/irid.js index 253bda9..56fdda8 100644 --- a/irid.js +++ b/irid.js @@ -1,555 +1,560 @@ /*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, max = Math.m...
n3dst4/irid
06689486add2189b138fe7c1ece7527f77f75381
add two new colours
diff --git a/irid.js b/irid.js index d202244..253bda9 100644 --- a/irid.js +++ b/irid.js @@ -10,543 +10,546 @@ var invalidError = "Invalid colour specification", floor = Math.floor; var Irid = function (initial) { if ( ! (this instanceof Irid)) { return new Irid(initial); } if ( ! initial ) { ...
n3dst4/irid
642c681f7594a0e677468bf1a08ffde58fe1d632
canInterpret utility
diff --git a/README.md b/README.md index fd3c9f1..2ada0a8 100644 --- a/README.md +++ b/README.md @@ -1,388 +1,397 @@ Irid ====== Parse, convert and manipulate colours (also known as colors). For a page which makes extensive use of irid.js, see http://colourtoy.lumphammer.com/ Usage =============== ``` n...
n3dst4/irid
2e15a3925b6aafa45f981100fc9e4260922b7a05
add relative luminance and contrast ratio calculation
diff --git a/README.md b/README.md index b69e66a..fd3c9f1 100644 --- a/README.md +++ b/README.md @@ -1,378 +1,388 @@ Irid ====== Parse, convert and manipulate colours (also known as colors). For a page which makes extensive use of irid.js, see http://colourtoy.lumphammer.com/ Usage =============== ``` n...
n3dst4/irid
04f7c0fa1d98d6c9a1afd32287721adda2abc6cb
rename to Irid
diff --git a/README.md b/README.md index 44f7fd5..b69e66a 100644 --- a/README.md +++ b/README.md @@ -1,378 +1,378 @@ -colour +Irid ====== Parse, convert and manipulate colours (also known as colors). -For a page which makes extensive use of colour.js, see http://colourtoy.lumphammer.com/ +For a page which makes e...
n3dst4/irid
1d5df035319ed4419ab258d5e2532bd1c6c05b0b
reanimate the dried out corpse of the tests
diff --git a/colour.js b/colour.js index 74f40b6..5722f9a 100755 --- a/colour.js +++ b/colour.js @@ -1,519 +1,522 @@ +/*global module*/ "use strict"; var invalidError = "Invalid colour specification", // Silly micro-optimizations (vars get minified): undef = "undefined", round = Math.round, ...
n3dst4/irid
6ed496ecdcbe00ccf6c5b0ffad34909fd18b643f
start converting this thing into an npm package
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8b6c49 --- /dev/null +++ b/.gitignore @@ -0,0 +1,213 @@ +# Logs +logs +*.log + +# Runtime data +pids +*.pid +*.seed + +# Directory for instrumented libs generated by jscoverage/JSCover +lib-cov + +# Coverage directory used by tools like istanbul ...
n3dst4/irid
c858483dade7c24c48fd55e3bf8ee6491b8463c0
added opacity for blending
diff --git a/README.md b/README.md new file mode 100644 index 0000000..2ee33b1 --- /dev/null +++ b/README.md @@ -0,0 +1,382 @@ +colour.js +========= + +Parse, convert and manipulate colours (also known as colors) in JavaScript. + +For a page which makes extensive use of colour.js, see http://colourtoy.lumphammer.com/ +...
panuta/OpenGIS
8f1429e464a7e1a5803b978f79d298861a93f77b
fix data grid context menu action, clear property grid when shown
diff --git a/opengis_platform/media/scripts/workspace/workspace.view.js b/opengis_platform/media/scripts/workspace/workspace.view.js index 78cbc74..68a57a3 100644 --- a/opengis_platform/media/scripts/workspace/workspace.view.js +++ b/opengis_platform/media/scripts/workspace/workspace.view.js @@ -1,784 +1,792 @@ var ...
panuta/OpenGIS
679e6a3057d446a6374bcca64c2d64c3c4b1f853
use url tag in homepage
diff --git a/opengis_platform/settings.py b/opengis_platform/settings.py index 9b9d6c4..56860d9 100644 --- a/opengis_platform/settings.py +++ b/opengis_platform/settings.py @@ -1,76 +1,78 @@ import os _base = os.path.dirname(__file__) DEBUG = True TEMPLATE_DEBUG = DEBUG +##FORCE_SCRIPT_NAME = '/opengis' WEBSIT...
panuta/OpenGIS
ebc405052d1416081a906fec237c1b4b8b2c20a7
finishing workspace page
diff --git a/opengis_platform/media/css/styles.css b/opengis_platform/media/css/styles.css index 2096356..fb155e9 100644 --- a/opengis_platform/media/css/styles.css +++ b/opengis_platform/media/css/styles.css @@ -1,20 +1,23 @@ .view_workspace_page h1 {font-size:16px;margin:7px 0px 0px 5px;} +.view_workspace_page .ma...
panuta/OpenGIS
7e98b877f0f8232ec87369642cf3d41da5cc4e15
add data tab when add layer
diff --git a/opengis_platform/media/scripts/workspace/workspace.view.js b/opengis_platform/media/scripts/workspace/workspace.view.js index 1f103b3..0aca847 100644 --- a/opengis_platform/media/scripts/workspace/workspace.view.js +++ b/opengis_platform/media/scripts/workspace/workspace.view.js @@ -1,671 +1,684 @@ var ...
panuta/OpenGIS
9378554db2fd753a2db56d334aa4615f63881388
change google map type to hybrid
diff --git a/opengis_platform/media/scripts/workspace/workspace.view.map.js b/opengis_platform/media/scripts/workspace/workspace.view.map.js index 41498f7..1c5a696 100644 --- a/opengis_platform/media/scripts/workspace/workspace.view.map.js +++ b/opengis_platform/media/scripts/workspace/workspace.view.map.js @@ -1,351 +...
panuta/OpenGIS
ae89344b015687bd16ba1d3ec18a34116db53ed1
fix bugs
diff --git a/opengis_platform/workspace/views_ajax.py b/opengis_platform/workspace/views_ajax.py index f2dbe3b..85f7fcc 100644 --- a/opengis_platform/workspace/views_ajax.py +++ b/opengis_platform/workspace/views_ajax.py @@ -1,239 +1,242 @@ from django.conf import settings from django.db.models import Max from djang...
panuta/OpenGIS
248337784c9b4dc7e51b0a67b81f71a8cfa56a16
add gmap api key
diff --git a/opengis_platform/templates/workspace/workspace_view.html b/opengis_platform/templates/workspace/workspace_view.html index 9544a1e..1dbe43e 100644 --- a/opengis_platform/templates/workspace/workspace_view.html +++ b/opengis_platform/templates/workspace/workspace_view.html @@ -1,41 +1,41 @@ {% extends "base...
panuta/OpenGIS
d8e08b4d716d307997cbb9afd5fb6955b1718e1b
fix import bug
diff --git a/opengis_platform/helper/utilities.py b/opengis_platform/helper/utilities.py index 8147e7e..53a07f2 100644 --- a/opengis_platform/helper/utilities.py +++ b/opengis_platform/helper/utilities.py @@ -1,24 +1,24 @@ -from project.sql import * +from helper.constants import * def change_to_extjs_field_type(da...
panuta/OpenGIS
94c117e7f8e49f75159d4dc1a9fdc7393ce5d22a
remove predefined data
diff --git a/opengis_platform/project/management.py b/opengis_platform/project/management.py index ec422d0..8338615 100644 --- a/opengis_platform/project/management.py +++ b/opengis_platform/project/management.py @@ -1,80 +1,82 @@ from django.conf import settings from django.contrib.auth.models import User from dj...
panuta/OpenGIS
7f9f1d00d707b2579ae0450fc165fd2eafdb03f8
workspace page m1
diff --git a/opengis_platform/domain/__init__.py b/opengis_platform/accounts/__init__.py similarity index 73% rename from opengis_platform/domain/__init__.py rename to opengis_platform/accounts/__init__.py index 116c5a4..84ddb71 100644 --- a/opengis_platform/domain/__init__.py +++ b/opengis_platform/accounts/__init__.p...
panuta/OpenGIS
85558e790be6d712c546387b3413c45df4359239
- Show data table checkbox - Edit mode
diff --git a/opengis_platform/media/css/styles.css b/opengis_platform/media/css/styles.css index 474b9bf..7a0745c 100644 --- a/opengis_platform/media/css/styles.css +++ b/opengis_platform/media/css/styles.css @@ -1,13 +1,15 @@ .view_workspace_page h1 {font-size:16px;margin:7px 0px 0px 5px;} .view_workspace_page .la...
panuta/OpenGIS
c85ee03ae8139ef45e6ebbef39b6bf999943903b
- Create table from descriptor and create Django model class from descriptor - Load layer data from server to display in workspace grid and map
diff --git a/opengis_platform/domain/__init__.py b/opengis_platform/domain/__init__.py index ebd47fe..116c5a4 100644 --- a/opengis_platform/domain/__init__.py +++ b/opengis_platform/domain/__init__.py @@ -1,10 +1,11 @@ # Callback after a user object is saved from django.contrib.auth.models import User from django.db...
panuta/OpenGIS
4a55afa5269b8dce079b5bc46572331ef0ec5342
remove unnecessary code
diff --git a/opengis_platform/media/scripts/script.workspace.js b/opengis_platform/media/scripts/script.workspace.js index 0c0441e..3114908 100644 --- a/opengis_platform/media/scripts/script.workspace.js +++ b/opengis_platform/media/scripts/script.workspace.js @@ -1,375 +1,336 @@ /* GLOBAL VARIABLES */ /* OPEN...
panuta/OpenGIS
bb1992d60477238c2402cb0e1e17f966c805edb5
prototyping workspace page
diff --git a/opengis_platform/domain/__init__.py b/opengis_platform/domain/__init__.py index e69de29..ebd47fe 100644 --- a/opengis_platform/domain/__init__.py +++ b/opengis_platform/domain/__init__.py @@ -0,0 +1,10 @@ +# Callback after a user object is saved +from django.contrib.auth.models import User +from django.db....
romankrv/django-apache-wsgi
d1a9181c207241517b445dd52f132ddf6a3f9317
Tiny modification settings.py
diff --git a/.gitignore b/.gitignore index 366f6a0..e7eaac4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc +*.pyo *.kpf *.tmp secret_key db diff --git a/settings.py b/settings.py index ec5f5c5..165f648 100755 --- a/settings.py +++ b/settings.py @@ -1,97 +1,98 @@ # Django settings for {{ project_na...
romankrv/django-apache-wsgi
342e6b286dccb85b5b0b791a5a2a1bfab3f803f6
Init working repo. Try it use now
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..366f6a0 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.pyc +*.kpf +*.tmp +secret_key +db diff --git a/README b/README new file mode 100644 index 0000000..d6a62b8 --- /dev/null +++ b/README @@ -0,0 +1 @@ +required: Django 1.1 mod_wsgi apache2 di...
robertkrimen/framework-redmash
6a239d74fd7544599652b60f838d2bea2fd42cde
Oops, forget to add README.design
diff --git a/README.design b/README.design new file mode 100644 index 0000000..3cdab14 --- /dev/null +++ b/README.design @@ -0,0 +1,15 @@ +script/redmash + + setup <package> create .redmash containg Kit <package>, iterate through + setup_manifest and create each file (unless it + ...
robertkrimen/framework-redmash
f2b13d606e82a9714e56336dc663dee6c134a528
Started README.design
diff --git a/lib/Framework/Redmash.pm b/lib/Framework/Redmash.pm index e97385e..23020ed 100644 --- a/lib/Framework/Redmash.pm +++ b/lib/Framework/Redmash.pm @@ -1,119 +1,120 @@ package Framework::Redmash; use warnings; use strict; =head1 NAME Framework::Redmash - Framework for quickly setting up a webpage/we...
robertkrimen/framework-redmash
2b6b41f419ae2ac42f18b7b74fc03b677309f690
Added $kit->build, $kit->setup, $kit->update Added testing for ->build and 'app' build
diff --git a/lib/Framework/Redmash/App.pm b/lib/Framework/Redmash/App.pm index 4685837..f865f64 100644 --- a/lib/Framework/Redmash/App.pm +++ b/lib/Framework/Redmash/App.pm @@ -1,126 +1,158 @@ package Framework::Redmash::App; use strict; use warnings; use Getopt::Chain; use Class::Inspector; use Path::Class; ...
robertkrimen/framework-redmash
a3bc94c6b8547696fdcc809150326ccdec7bf294
plug => plugin
diff --git a/t/001-basic.t b/t/001-basic.t index c215745..794e5dd 100644 --- a/t/001-basic.t +++ b/t/001-basic.t @@ -1,31 +1,31 @@ #!/usr/bin/perl -w use strict; use warnings; use Test::Most; plan qw/no_plan/; package t::Project; use Test::More; use Moose; use MooseX::ClassAttribute; use Framework...
robertkrimen/framework-redmash
cac63139669f0458609c90a5b009b5d1b2a71308
Dropped base in favor of plugin system
diff --git a/MANIFEST b/MANIFEST index ddd91e2..bccb08b 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,53 +1,57 @@ Changes MANIFEST META.yml # Will be created by "make dist" Makefile.PL README inc/Module/AutoInstall.pm inc/Module/Install.pm inc/Module/Install/AutoInstall.pm inc/Module/Install/Base.pm inc/Module/I...
robertkrimen/framework-redmash
c1d469d453a43b4c82c6d50de4088c79fad014ea
initialize => PREPARE_kit
diff --git a/lib/Framework/Redmash/Base/Bare.pm b/lib/Framework/Redmash/Base/Bare.pm index d4c5705..26401c3 100644 --- a/lib/Framework/Redmash/Base/Bare.pm +++ b/lib/Framework/Redmash/Base/Bare.pm @@ -1,10 +1,10 @@ package Framework::Redmash::Base::Bare; use Moose; -sub initialize { +sub PREPARE_kit { # Do n...
robertkrimen/framework-redmash
e4243399bc692b6d5fb0cc647dea5978cd2246fb
Refactored ::Manifest into ::Manifest::Setup Added ::Manifest::Render Added render_manifest functionality $kit->render() will now render the manifest Added tests for the above
diff --git a/lib/Framework/Redmash/App.pm b/lib/Framework/Redmash/App.pm index 4e61700..0f777dd 100644 --- a/lib/Framework/Redmash/App.pm +++ b/lib/Framework/Redmash/App.pm @@ -1,126 +1,126 @@ package Framework::Redmash::App; use strict; use warnings; use Getopt::Chain; use Class::Inspector; use Path::Class; ...
robertkrimen/framework-redmash
83659be1879a12d8fa5995e997e5c8a408273a9d
Added modified _render_page & render_rsc
diff --git a/lib/Framework/Redmash/Kit.pm b/lib/Framework/Redmash/Kit.pm index 95790ee..bf15fd8 100644 --- a/lib/Framework/Redmash/Kit.pm +++ b/lib/Framework/Redmash/Kit.pm @@ -1,222 +1,258 @@ package Framework::Redmash::Kit; use Moose; use MooseX::ClassAttribute; use Framework::Redmash::Carp; use Framework::Red...
robertkrimen/framework-redmash
1ed597040a785f418613ec651ce450ab6cecf8d7
Completing complete rewrite
diff --git a/lib/Framework/Redmash/Configure/Kit.pm b/lib/Framework/Redmash/Configure/Kit.pm new file mode 100644 index 0000000..7972448 --- /dev/null +++ b/lib/Framework/Redmash/Configure/Kit.pm @@ -0,0 +1,32 @@ +package Framework::Redmash::Configure::Kit; + +use Moose; +use Framework::Redmash::Carp; +use Framework::R...
robertkrimen/framework-redmash
a57986f7ffa9e733c74b6d47f918db8a1ddf3efd
Rewrite complete
diff --git a/MANIFEST b/MANIFEST index e7de5ef..ddd91e2 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,38 +1,53 @@ Changes MANIFEST META.yml # Will be created by "make dist" Makefile.PL README inc/Module/AutoInstall.pm inc/Module/Install.pm inc/Module/Install/AutoInstall.pm inc/Module/Install/Base.pm inc/Module/I...
robertkrimen/framework-redmash
3479f33ccffd89089e5a5539e965f58727e410d6
Partial refactoring
diff --git a/lib/Framework/Redmash.pm b/lib/Framework/Redmash.pm index 6e2954e..e97385e 100644 --- a/lib/Framework/Redmash.pm +++ b/lib/Framework/Redmash.pm @@ -1,119 +1,119 @@ package Framework::Redmash; use warnings; use strict; =head1 NAME Framework::Redmash - Framework for quickly setting up a webpage/we...
robertkrimen/framework-redmash
a61907b2f7468370b9f8ecafee6806c188886490
Work-in-progress
diff --git a/lib/Framework/Redmash/Configuration.pm b/lib/Framework/Redmash/Configuration.pm index d35276a..8d871cc 100644 --- a/lib/Framework/Redmash/Configuration.pm +++ b/lib/Framework/Redmash/Configuration.pm @@ -1,16 +1,22 @@ package Framework::Redmash::Configuration; use Moose; use Framework::Redmash::Carp; ...
robertkrimen/framework-redmash
36394382ebe8ae7483d44fb71b6bcce39632e355
Added F::Rm::Configuration and refactored accordingly
diff --git a/lib/Framework/Redmash.pm b/lib/Framework/Redmash.pm index 45d7d06..6e2954e 100644 --- a/lib/Framework/Redmash.pm +++ b/lib/Framework/Redmash.pm @@ -1,119 +1,119 @@ package Framework::Redmash; use warnings; use strict; =head1 NAME Framework::Redmash - Framework for quickly setting up a webpage/we...
robertkrimen/framework-redmash
e3fb56aa3d154b22f925b0ada5316bb8aa35a9b1
Reworking to work with MooseX::Scaffold Basic documentation (synposis) and packaging boilerplate
diff --git a/MANIFEST b/MANIFEST index 27bd44d..e7de5ef 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,7 +1,38 @@ Changes MANIFEST META.yml # Will be created by "make dist" Makefile.PL README +inc/Module/AutoInstall.pm +inc/Module/Install.pm +inc/Module/Install/AutoInstall.pm +inc/Module/Install/Base.pm +inc/Module/In...
robertkrimen/framework-redmash
9e787347919d61c8fef89e522aad1bfe68e340df
Command-line app (redmash) baseline Added ../tt/frame.tt.html to Standard Added ../css/<name>.css to Standard
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a004b82 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +Makefile +inc +local +Framework-* diff --git a/lib/Framework/Redmash/App.pm b/lib/Framework/Redmash/App.pm new file mode 100644 index 0000000..15061f3 --- /dev/null +++ b/lib/Framework/Redmas...
robertkrimen/framework-redmash
e75f7fa1f3f40b308460899a036ca06d90817500
Added name requirement
diff --git a/lib/Framework/Redmash/Meta.pm b/lib/Framework/Redmash/Meta.pm index daa36fe..0876465 100644 --- a/lib/Framework/Redmash/Meta.pm +++ b/lib/Framework/Redmash/Meta.pm @@ -1,123 +1,135 @@ package Framework::Redmash::Meta; use Moose; use Framework::Redmash::Carp; use Framework::Redmash::Types; use Fr...
robertkrimen/framework-redmash
5fb9e5941c8c699b7e64e00d6a79effb095856c0
Added ::Base::Bare
diff --git a/lib/Framework/Redmash/Base/Bare.pm b/lib/Framework/Redmash/Base/Bare.pm new file mode 100644 index 0000000..c31ffd1 --- /dev/null +++ b/lib/Framework/Redmash/Base/Bare.pm @@ -0,0 +1,10 @@ +package Framework::Redmash::Base::Bare; + +use Moose; + +sub configure { + # Do nothing, it is bare after all +} + ...
robertkrimen/framework-redmash
b0d98f3736e9fc5b169e26f89c47c229c1870aff
Baseline working
diff --git a/MANIFEST b/MANIFEST index 971892b..27bd44d 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1,10 +1,7 @@ Changes MANIFEST META.yml # Will be created by "make dist" Makefile.PL README lib/Framework/Redmash.pm t/00-load.t -t/boilerplate.t -t/pod-coverage.t -t/pod.t diff --git a/Makefile.PL b/Makefile.PL index...
robertkrimen/framework-redmash
adb38ff080c2d3c62e5abc96811401c2702f740f
Initial import
diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000..c4c18d3 --- /dev/null +++ b/.cvsignore @@ -0,0 +1,10 @@ +blib* +Makefile +Makefile.old +Build +_build* +pm_to_blib* +*.tar.gz +.lwpcookies +Framework-Redmash-* +cover_db diff --git a/.screenrc b/.screenrc new file mode 100644 index 0000000..288099...
sebastiaanvisser/salvia-demo
383c2ecb05846002bd9a804b250eed3102445c78
Temp turned off websockets.
diff --git a/src/Demo.hs b/src/Demo.hs index f9a8e0a..bcca01a 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,120 +1,120 @@ {-# LANGUAGE CPP, FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative -import Control.Concurrent +-- import Control.Concurrent import Control.Concur...
sebastiaanvisser/salvia-demo
1cf0068e77e93ae08c28a18648c1472787ed523b
New filestore interface.
diff --git a/src/Demo.hs b/src/Demo.hs index b3d339a..f9a8e0a 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,118 +1,120 @@ {-# LANGUAGE CPP, FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative import Control.Concurrent import Control.Concurrent.STM import Control.Monad...
sebastiaanvisser/salvia-demo
823f8c6ea4e101019fb5fd05ee0b246ae53bb5ef
Build against new fclabels.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 06f5383..38738af 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,84 +1,84 @@ Name: salvia-demo Version: 1.2.0 Synopsis: Demo Salvia servers. Description: This package contains six simple example programs that show ...
sebastiaanvisser/salvia-demo
8ab130af3c5b445f90ebdbb45ecc73c349193cd5
Fix against updated salvia.
diff --git a/src/Demo.hs b/src/Demo.hs index 13956f6..b3d339a 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,118 +1,118 @@ {-# LANGUAGE CPP, FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative import Control.Concurrent import Control.Concurrent.STM import Control.Monad...
sebastiaanvisser/salvia-demo
ccacd3d0ec6cccb6660d28aad451c0e2105f3be6
Removed typ.lab reference.
diff --git a/src/Demo.hs b/src/Demo.hs index b0eeacc..13956f6 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,118 +1,118 @@ {-# LANGUAGE CPP, FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative import Control.Concurrent import Control.Concurrent.STM import Control.Monad...
sebastiaanvisser/salvia-demo
15eff3c9c1d37d525ff310a680d68725ac107aa5
Monad libs version changes.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index c95558e..06f5383 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,84 +1,84 @@ Name: salvia-demo Version: 1.2.0 Synopsis: Demo Salvia servers. Description: This package contains six simple example programs that show ...
sebastiaanvisser/salvia-demo
ae951639cbd500b28e72bcc096d675c5606f8d03
Adapted to the new fclabels.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 7095882..c95558e 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,84 +1,84 @@ Name: salvia-demo -Version: 1.0.0 +Version: 1.2.0 Synopsis: Demo Salvia servers. Description: This package contains six simple ex...
sebastiaanvisser/salvia-demo
6ed6f93cf66b1fbbf4b918735da724b86eefbf8d
Demo runs in GHCi again.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 0775f5a..7095882 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,83 +1,84 @@ Name: salvia-demo Version: 1.0.0 Synopsis: Demo Salvia servers. Description: This package contains six simple example programs that show ...
sebastiaanvisser/salvia-demo
735adbeaccc7f07fe8e74de735626903b98199e4
Added doc.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 6ffaf15..0775f5a 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,82 +1,83 @@ Name: salvia-demo Version: 1.0.0 Synopsis: Demo Salvia servers. Description: - This package contains three example programs that show how t...
sebastiaanvisser/salvia-demo
bc0f1e2ac55af4b6abbab3141c843ab97246aa09
Fixed www serve.
diff --git a/src/Demo.hs b/src/Demo.hs index 67a43bc..8a993bd 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,110 +1,110 @@ {-# LANGUAGE FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative import Control.Concurrent import Control.Concurrent.STM import Data.FileStore im...
sebastiaanvisser/salvia-demo
a62d3e8b6ceb1462fc1cbb4fe3433243deb8ce1e
Serve filestore and extended file system from the correct folder.
diff --git a/src/Demo.hs b/src/Demo.hs index cc93244..67a43bc 100644 --- a/src/Demo.hs +++ b/src/Demo.hs @@ -1,110 +1,110 @@ {-# LANGUAGE FlexibleContexts, NoMonomorphismRestriction #-} module Main where import Control.Applicative import Control.Concurrent import Control.Concurrent.STM import Data.FileStore im...
sebastiaanvisser/salvia-demo
987a72ff05d73c179c10899b9d265a884ee2e7f0
Directory Handling demo and removed warnings.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 0c9fa6a..6ffaf15 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,76 +1,82 @@ Name: salvia-demo Version: 1.0.0 Synopsis: Demo Salvia servers. Description: This package contains three example programs that show how t...
sebastiaanvisser/salvia-demo
77a8c9395c9950d6517ecf94bfa817aab8d9e77c
Query parameter demo.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index ac8ae1c..0c9fa6a 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,70 +1,76 @@ Name: salvia-demo Version: 1.0.0 Synopsis: Demo Salvia servers. Description: This package contains three example programs that show how t...
sebastiaanvisser/salvia-demo
84f19b253fa3fd52055489b7d18e1fd84b2eec15
HelloWorld as HTML.
diff --git a/src/HelloWorld.hs b/src/HelloWorld.hs index 3d10752..db40aef 100644 --- a/src/HelloWorld.hs +++ b/src/HelloWorld.hs @@ -1,15 +1,22 @@ +{-# LANGUAGE FlexibleContexts #-} module Main where +import Data.Record.Label +import Network.Protocol.Http +import Network.Salvia import Network.Salvia.Handler.ColorLo...
sebastiaanvisser/salvia-demo
c59dbcf725f995c361dbb0ef194b78599a7a7dbd
Hello world demo.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 3eebd00..bdfd3ba 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,56 +1,61 @@ Name: salvia-demo Version: 1.0.0 Description: Demo Salvia servers, one default implementation, one running as CGI and one running on the C10k se...
sebastiaanvisser/salvia-demo
417096d0feb32932037a26c4c5678b933c717656
Add email field to signup form so it works again.
diff --git a/www/signup.html b/www/signup.html index 443e0ca..60df67e 100644 --- a/www/signup.html +++ b/www/signup.html @@ -1,19 +1,20 @@ <!DOCTYPE html> <!-- html5! --> <title>Salvia signup demo.</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta charset="utf-8"> <header> <h1...
sebastiaanvisser/salvia-demo
d5d542661100c2aa6c743b060f70f93fc335eaaa
Added more documentation.
diff --git a/salvia-demo.cabal b/salvia-demo.cabal index 3eebd00..90a6d08 100644 --- a/salvia-demo.cabal +++ b/salvia-demo.cabal @@ -1,56 +1,65 @@ Name: salvia-demo Version: 1.0.0 -Description: Demo Salvia servers, one default implementation, one running as CGI and one running on the C10k se...