John McLear
2ecd5719fc
Merge pull request #1073 from Pita/librejs-header
...
Add LibreJS Licensing information to headers of HTML templates
2012-10-25 06:53:38 -07:00
neurolit
526610e2e7
Templates: relative links instead of absolute ones for /static directory
...
…irector
Two links were absolute ("/static/...") instead of relative
("../static"). The image was not loaded with sites behind reverse
proxies and subdirectory.
2012-10-24 19:48:13 +02:00
johnyma22
a770910a3a
Add LibreJS Licensing information to headers of HTML templates
2012-10-17 17:53:28 +01:00
Chad Weider
1258ed3a0d
Split client and server plugin functionality.
...
There is virtually no shared code for the client, extract it into its own
module and do away with the switches.
2012-09-11 21:16:47 -07:00
Chad Weider
9394495364
Inject plugins into hooks.
2012-09-11 21:16:47 -07:00
Marcel Klehr
eb6be84150
Fix html/css
2012-07-15 16:03:12 +02:00
Marcel Klehr
4901adeac7
Fix timeslider.
2012-07-14 15:54:44 +02:00
Egil Moeller
15a7d24450
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
...
Conflicts:
src/node/handler/PadMessageHandler.js
src/static/css/pad.css
src/templates/pad.html
2012-05-29 21:26:12 +02:00
Chad Weider
7f9bfd6b26
Add comments to templates.
2012-05-28 15:14:52 -07:00
Chad Weider
96ab3dc3b4
jQuery is packaged - this is pure duplication.
2012-05-28 15:14:52 -07:00
Chad Weider
d5ac2bfb71
Explicitly require jQuery before using it.
2012-05-28 15:14:52 -07:00
Chad Weider
595fc5710e
Add ace2_common to bottom of the page includes.
2012-05-28 15:14:52 -07:00
0ip
0d68cd23ba
Remove old CSS code
2012-05-20 14:48:02 +02:00
John McLear
fbc2cb32b3
Merge pull request #705 from johnyma22/removeWordle
...
Remove wordle
2012-05-19 05:58:38 -07:00
Egil Moeller
9f46678e5d
Bugfix for IE and document.domain
2012-05-18 18:57:18 +02:00
John McLear
def904dbed
remove wordle
2012-05-13 20:20:18 +01:00
Matthias Bartelmeß
0e941b498e
fix #677
2012-04-29 19:54:38 +02:00
Egil Moeller
c173ebe197
Merge branch 'master' into timeslider-realtimeupdate+readonly-pads
2012-04-25 17:51:03 +02:00
Matthias Bartelmeß
513deef768
added baseURL export to pad.js, timeslider.js, plugins.js, fixing #670
2012-04-25 10:23:58 +02:00
Egil Moeller
ed7e254417
Disconnect handling and cleanup of unused code
2012-04-23 14:47:07 +02:00
John McLear
7766f8aaad
Merge pull request #591 from fourplusone/timeslider_authors
...
Timeslider authors
2012-04-05 16:38:55 -07:00
Matthias Bartelmeß
9e042ee942
Merge branch 'develop' into timeslider_authors
...
Conflicts:
src/static/css/pad.css
src/templates/timeslider.html
2012-04-05 21:47:59 +02:00
Egil Moeller
4325f0b907
Set document.domain explicitly to allow fow ajaxupload and other more fancy iframe stuff
2012-04-05 01:45:14 +02:00
Egil Moeller
08cc3e128f
Bugfix for timeslider styling
2012-04-01 14:33:39 +02:00
Egil Moeller
05c2e0fde5
Made all html pages into eejs templates
2012-03-13 18:24:45 +01:00