Jason Skomorowski [Mon, 4 Aug 2014 14:58:55 +0000 (10:58 -0400)]
Fix termlist templates.
Jason Skomorowski [Mon, 4 Aug 2014 14:35:36 +0000 (10:35 -0400)]
Warn, don't fail, on missing template
Jason Skomorowski [Mon, 4 Aug 2014 14:33:35 +0000 (10:33 -0400)]
Add mkws-templates.js to test.
Jason Skomorowski [Tue, 8 Jul 2014 21:22:57 +0000 (17:22 -0400)]
Remove generated mkws-templates.js (.gitignore moved under my feet)
Jason Skomorowski [Tue, 8 Jul 2014 20:23:29 +0000 (16:23 -0400)]
Merge branch 'master' into templateallthemarkup
Jason Skomorowski [Tue, 8 Jul 2014 20:19:22 +0000 (16:19 -0400)]
Support Apache 2.4 for phantomjs test
Jason Skomorowski [Tue, 8 Jul 2014 20:02:18 +0000 (16:02 -0400)]
Merge branch 'master' into templateallthemarkup
Wolfram Schneider [Tue, 8 Jul 2014 16:15:43 +0000 (18:15 +0200)]
MacOS: symlink to /usr/libexec, MKWS-240
Mike Taylor [Tue, 8 Jul 2014 13:09:26 +0000 (13:09 +0000)]
Comment out ProxyPreserveHost for now -- it's causing problems
Mike Taylor [Tue, 8 Jul 2014 12:46:53 +0000 (12:46 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Mike Taylor [Tue, 8 Jul 2014 12:46:15 +0000 (12:46 +0000)]
Preserve hostname when proxying the SP.
Jason Skomorowski [Tue, 8 Jul 2014 00:32:13 +0000 (20:32 -0400)]
Per-facet templates.
Jason Skomorowski [Mon, 7 Jul 2014 23:53:47 +0000 (19:53 -0400)]
Tidy up bootstrap example.
Jason Skomorowski [Mon, 7 Jul 2014 23:30:04 +0000 (19:30 -0400)]
Merge branch 'master' into templateallthemarkup
Conflicts:
src/.gitignore
src/mkws-core.js
src/mkws-team.js
src/mkws-widget-termlists.js
tools/htdocs/Makefile
Wolfram Schneider [Mon, 7 Jul 2014 16:24:16 +0000 (16:24 +0000)]
enable sort by check for jasmine-local-popup.html
make p PHANTOMJS_PATH=jasmine-local-popup.html
Wolfram Schneider [Mon, 7 Jul 2014 16:24:03 +0000 (16:24 +0000)]
different second jquery lib
Wolfram Schneider [Mon, 7 Jul 2014 16:21:02 +0000 (16:21 +0000)]
use window.mkws.$ object, MKWS-238
Wolfram Schneider [Mon, 7 Jul 2014 16:06:30 +0000 (16:06 +0000)]
validate that MKWS does not break other jQuery Apps, MKWS-228
Test jquery.js before and after MKWS is running.
Make sure that mkws.$ will not be affected by other jquery libs.
Wolfram Schneider [Mon, 7 Jul 2014 15:39:34 +0000 (15:39 +0000)]
replace jQuery.pazpar2() with static HTML widget, part of MKWS-228
Wolfram Schneider [Mon, 7 Jul 2014 14:19:49 +0000 (14:19 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Mon, 7 Jul 2014 14:17:00 +0000 (14:17 +0000)]
include reference universe widget
Mike Taylor [Mon, 7 Jul 2014 13:07:12 +0000 (14:07 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Mon, 7 Jul 2014 13:06:46 +0000 (14:06 +0100)]
Use mkws.log instead of console.log in the code that sets window.name,
so that this doesn't break IE8. Fixes bug MKWS-77 yet AGAIN.
Perhaps instead of constantly closing and re-opening this, it's time
to make a new JIRA project "MKWS compatibility with IE8", and file new
bugs in that area every time we break this?
Meanwhile, see http://theie8countdown.com/
Mike Taylor [Mon, 7 Jul 2014 13:04:51 +0000 (14:04 +0100)]
Slight code-reordering to enable the next delta.
Wolfram Schneider [Mon, 7 Jul 2014 12:29:31 +0000 (12:29 +0000)]
wait longer for Firefox
Wolfram Schneider [Mon, 7 Jul 2014 12:15:50 +0000 (12:15 +0000)]
improve help
Wolfram Schneider [Mon, 7 Jul 2014 12:14:18 +0000 (12:14 +0000)]
increase timeout
Wolfram Schneider [Mon, 7 Jul 2014 12:12:03 +0000 (12:12 +0000)]
less debugging
Wolfram Schneider [Mon, 7 Jul 2014 12:10:23 +0000 (12:10 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Mon, 7 Jul 2014 11:55:43 +0000 (11:55 +0000)]
make sort by check optional
Wolfram Schneider [Mon, 7 Jul 2014 11:38:01 +0000 (11:38 +0000)]
typo
Wolfram Schneider [Mon, 7 Jul 2014 11:30:09 +0000 (11:30 +0000)]
less debugging
Wolfram Schneider [Mon, 7 Jul 2014 11:30:02 +0000 (11:30 +0000)]
improve help
Wolfram Schneider [Mon, 7 Jul 2014 11:23:27 +0000 (11:23 +0000)]
remove facets links one after each other, not a the same time
Sometimes the facets links disappears, but the new search results
does not appears. But it is very unlikely that a user clicks
both links a the same time, so don't do that in a jasmine test.
Wolfram Schneider [Mon, 7 Jul 2014 11:09:44 +0000 (11:09 +0000)]
less debugging
Wolfram Schneider [Mon, 7 Jul 2014 11:07:48 +0000 (11:07 +0000)]
better readable CSS path for records/targets link
Mike Taylor [Mon, 7 Jul 2014 11:05:56 +0000 (12:05 +0100)]
Tidy up other SP authentication message.
Mike Taylor [Mon, 7 Jul 2014 11:05:11 +0000 (12:05 +0100)]
Better diagnostics when SP authentication fails.
Mike Taylor [Mon, 7 Jul 2014 11:02:42 +0000 (12:02 +0100)]
We don't need the .gitignore any longer, as no compiled files are left in the src directory
Wolfram Schneider [Mon, 7 Jul 2014 10:59:38 +0000 (10:59 +0000)]
working sort check, MKWS-140
Mike Taylor [Mon, 7 Jul 2014 10:59:23 +0000 (11:59 +0100)]
ProxyPreserveHost On
Wolfram Schneider [Mon, 7 Jul 2014 10:31:00 +0000 (10:31 +0000)]
check that we got exactly 20 records after select change
Wolfram Schneider [Mon, 7 Jul 2014 10:24:27 +0000 (10:24 +0000)]
trigger change event after changing per page value
Mike Taylor [Mon, 7 Jul 2014 10:18:25 +0000 (11:18 +0100)]
For now, hardwire to use sansa.
Will reset after SP configuration debugging.
Mike Taylor [Mon, 7 Jul 2014 10:17:53 +0000 (11:17 +0100)]
Clearer commenting on SP proxying options.
Wolfram Schneider [Mon, 7 Jul 2014 09:36:54 +0000 (09:36 +0000)]
wait for DOM change after removing facet limit links
Wolfram Schneider [Mon, 7 Jul 2014 09:36:39 +0000 (09:36 +0000)]
indent
Wolfram Schneider [Mon, 7 Jul 2014 08:55:17 +0000 (08:55 +0000)]
Jasmine test should check that sorting works, MKWS-140
Mike Taylor [Mon, 7 Jul 2014 08:50:32 +0000 (09:50 +0100)]
Remove configuration for sp-mkws.indexdata.com, now in its own Apache2
configuration fragment sp-mkws-live, as this is a separate service
that could be on a different host.
Mike Taylor [Mon, 7 Jul 2014 08:49:43 +0000 (09:49 +0100)]
New file sp-mkws-live, extracted from mkws-live.
This is a separate service that could be on a different host.
Mike Taylor [Mon, 7 Jul 2014 08:48:46 +0000 (09:48 +0100)]
Set pazpar2_url and service_proxy_auth both to point at sp-mkws.
Mike Taylor [Fri, 4 Jul 2014 14:38:11 +0000 (15:38 +0100)]
Use mkws.$.toJSON rather than regular-ass $.toJSON
Mike Taylor [Fri, 4 Jul 2014 14:13:29 +0000 (15:13 +0100)]
default target runs "make install" (not "make all") in doc subdirectory.
Mike Taylor [Fri, 4 Jul 2014 14:12:52 +0000 (15:12 +0100)]
Use chmod ugo-w for installed files, rather than just -w, which
sometimes fails oddly on caliban:
caliban$ whoami
mike
caliban$ cd /home/indexdata/mkws/tools/htdocs
caliban$ ls -l mkws-doc.css
-r--rw-r-- 1 mike users 1242 Apr 17 11:34 mkws-doc.css
caliban$ chmod -w mkws-doc.css
chmod: mkws-doc.css: new permissions are r--rw-r--, not r--r--r--
caliban$ ls -l mkws-doc.css
-r--rw-r-- 1 mike users 1242 Apr 17 11:34 mkws-doc.css
caliban$
Wolfram Schneider [Fri, 4 Jul 2014 10:39:54 +0000 (12:39 +0200)]
downgrade jasmine-reporters, MKWS-236
Wolfram Schneider [Fri, 4 Jul 2014 09:57:36 +0000 (11:57 +0200)]
always use .tmp extension for temporary files generated by make.
We used a mix of .tmp and .new, which is kinda confusing.
Wolfram Schneider [Fri, 4 Jul 2014 09:55:16 +0000 (11:55 +0200)]
generation of mkws.js must be atomar
Mike Taylor [Thu, 3 Jul 2014 16:34:19 +0000 (17:34 +0100)]
Indentation
Mike Taylor [Thu, 3 Jul 2014 16:33:28 +0000 (17:33 +0100)]
Use sp-mkws for service-proxy authentication.
Mike Taylor [Thu, 3 Jul 2014 16:30:09 +0000 (17:30 +0100)]
"make" now does "make all"
Mike Taylor [Thu, 3 Jul 2014 16:28:47 +0000 (17:28 +0100)]
New stanza for sp-mkws.indexdata.com
Mike Taylor [Thu, 3 Jul 2014 16:23:53 +0000 (17:23 +0100)]
Typo
Mike Taylor [Thu, 3 Jul 2014 16:23:50 +0000 (17:23 +0100)]
Add stub index.html to sp-htdocs
Mike Taylor [Thu, 3 Jul 2014 16:19:51 +0000 (17:19 +0100)]
Not sure why this was still around
Mike Taylor [Thu, 3 Jul 2014 16:15:50 +0000 (17:15 +0100)]
Add SSL proxying support for sp-mkws.indexdata.com
Mike Taylor [Thu, 3 Jul 2014 16:15:26 +0000 (17:15 +0100)]
SSL version of MKWS Apache2 config now has mkws-git as a ServerAlias
rather then the old, misleadingly named mkws-dev (which isn't
supported at the back-end).
Mike Taylor [Thu, 3 Jul 2014 16:13:25 +0000 (17:13 +0100)]
Remove trailing whitespace.
Mike Taylor [Thu, 3 Jul 2014 11:16:10 +0000 (12:16 +0100)]
Remove arbitrary distclean rule.
Wolfram Schneider [Thu, 3 Jul 2014 10:47:35 +0000 (10:47 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Thu, 3 Jul 2014 10:44:57 +0000 (10:44 +0000)]
enable to set path of jasmine HTML page
e.g.:
APACHE_PORT=5050 DEBUG=0 make -s phantomjs PHANTOMJS_PATH=jasmine-pp2.html
Mike Taylor [Thu, 3 Jul 2014 10:35:32 +0000 (10:35 +0000)]
Add ServerAlias for sp-mkws.indexdata.com
Wolfram Schneider [Thu, 3 Jul 2014 10:12:28 +0000 (10:12 +0000)]
more cleanup
Wolfram Schneider [Thu, 3 Jul 2014 10:11:39 +0000 (10:11 +0000)]
cleanup
Wolfram Schneider [Thu, 3 Jul 2014 10:10:41 +0000 (10:10 +0000)]
import mkws test settings, used by jasmine-pp2.html
Mike Taylor [Wed, 2 Jul 2014 16:23:37 +0000 (17:23 +0100)]
Add commented-out non-proxied version of the SP auth URL.
This DOES NOT work: the error message in the JavaScript console is:
XMLHttpRequest cannot load http://sp-mkc-sansa.indexdata.com:8080/service-proxy/?command=auth&action=check,login&username=orex&password=orexmkc. No 'Access-Control-Allow-Origin' header is present on the requested resource. Origin 'http://x.example.indexdata.com' is therefore not allowed access.
I think this must be because of the mod_perl magic on
mkws.indexdata.com, which I'd all but forgotten about. From
mkws/tools/apache2/mkws-live:
PerlOptions +Parent
PerlSwitches -I/home/indexdata/mkws/tools/mod_perl
<Location /service-proxy>
PerlOutputFilterHandler MyApache2::SetACAO
</Location>
Mike Taylor [Wed, 2 Jul 2014 16:11:08 +0000 (17:11 +0100)]
Explicit SP auth URL.
Mike Taylor [Wed, 2 Jul 2014 16:08:55 +0000 (17:08 +0100)]
Whitespace
Mike Taylor [Wed, 2 Jul 2014 15:00:11 +0000 (16:00 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Mike Taylor [Wed, 2 Jul 2014 14:37:45 +0000 (15:37 +0100)]
Comment on other SP URLs that go direct to sansa or arya
Wolfram Schneider [Wed, 2 Jul 2014 13:02:54 +0000 (13:02 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 13:00:33 +0000 (13:00 +0000)]
need to use mkws.$, not jQuery, part of mkws-226
this will fix the issue with the $.pazpar2() extention
Mike Taylor [Wed, 2 Jul 2014 11:49:38 +0000 (12:49 +0100)]
Major rewrite of library configuration text.
Mike Taylor [Wed, 2 Jul 2014 10:46:07 +0000 (11:46 +0100)]
Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 09:14:37 +0000 (11:14 +0200)]
enable to run the tests on a different port.
APACHE_PORT=5000 make check
thats helpfull if the port is already blocked by some other users.
Wolfram Schneider [Wed, 2 Jul 2014 09:03:53 +0000 (09:03 +0000)]
using VPATH was a sweet idea, but it is to error-prone. Using direct path instead.
Wolfram Schneider [Wed, 2 Jul 2014 08:55:07 +0000 (08:55 +0000)]
Merge remote branch 'origin/MKWS-229'
Wolfram Schneider [Wed, 2 Jul 2014 08:49:06 +0000 (08:49 +0000)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws
Wolfram Schneider [Wed, 2 Jul 2014 08:48:55 +0000 (08:48 +0000)]
make check should run the phantomjs tests as well, MKWS-233
Wolfram Schneider [Wed, 2 Jul 2014 08:47:26 +0000 (08:47 +0000)]
cleanup stale code
Mike Taylor [Tue, 1 Jul 2014 17:47:41 +0000 (18:47 +0100)]
Formatting
Mike Taylor [Tue, 1 Jul 2014 17:44:15 +0000 (18:44 +0100)]
New section (empty)
Mike Taylor [Tue, 1 Jul 2014 17:29:24 +0000 (18:29 +0100)]
Better description of setting SP auth URL.
Mike Taylor [Tue, 1 Jul 2014 15:47:52 +0000 (16:47 +0100)]
Update information on target selection within the library.
Mike Taylor [Fri, 27 Jun 2014 17:06:14 +0000 (18:06 +0100)]
use Orex library, no autosearch
Wolfram Schneider [Fri, 27 Jun 2014 15:04:54 +0000 (17:04 +0200)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
Mike Taylor [Fri, 27 Jun 2014 14:52:13 +0000 (15:52 +0100)]
Add new /service-proxy-orexauth rewrite-rule.
Wolfram Schneider [Fri, 27 Jun 2014 14:47:12 +0000 (16:47 +0200)]
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws into MKWS-229
Wolfram Schneider [Fri, 27 Jun 2014 14:46:55 +0000 (16:46 +0200)]
fix pathes for new mkws.js build process
Wolfram Schneider [Fri, 27 Jun 2014 14:32:52 +0000 (16:32 +0200)]
re-organize mkws.js build process, MKWS-229
Wolfram Schneider [Fri, 27 Jun 2014 14:31:19 +0000 (16:31 +0200)]
don't depend on /usr/bin/perl, use your default perl interpreter