Chad Weider
|
c6b8beabd3
|
Correct paths to reflect their being libraries.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
ca02ca05ae
|
Remove unnecessary line.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
2fd9019792
|
Remove require code that is unnecessary and/or incorrect.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
648603126b
|
Remove require changes in `pushScriptsTo` method.
These duplicate `pushRequireScriptTo` at least, but mostly break things.
|
2012-03-10 14:39:37 -08:00 |
|
Chad Weider
|
ee312672d3
|
This is duplicated by the contents of static.
|
2012-03-10 14:39:37 -08:00 |
Egil Moeller
|
384d768610
|
One more bug in cache dir setting
|
2012-03-08 21:47:18 +01:00 |
|
Egil Moeller
|
72571e5ef0
|
Bugfixing cache
|
2012-03-08 21:03:22 +01:00 |
|
Egil Moeller
|
f6212f452c
|
Bugfix
|
2012-03-08 21:01:01 +01:00 |
|
Egil Moeller
|
92dc3e59d6
|
First attempt to implement the block system from django templates on top of the npm module ejs.
|
2012-03-07 17:36:11 +01:00 |
Peter 'Pita' Martischka
|
7b518eeb2d
|
Fixing client side require, the minify code is completly unused now, very ugly solution
|
2012-03-04 23:45:33 +01:00 |
|
Peter 'Pita' Martischka
|
8b5925440a
|
Fix configuration of express
|
2012-03-04 21:23:05 +01:00 |
|
Peter 'Pita' Martischka
|
9f03e5ec68
|
Output nicer exceptions in hook call
|
2012-03-04 20:32:57 +01:00 |
|
Peter 'Pita' Martischka
|
4e78a6b9cc
|
Fix gitignore for custom files
|
2012-03-04 19:50:05 +01:00 |
|
Egil Moeller
|
f6b9b49ab4
|
Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually
|
2012-03-02 22:02:42 +01:00 |
|
Egil Moeller
|
ce5d2d8685
|
Merge branch 'pita'
Resolved conflicts:
.gitignore
src/static/js/ace.js
src/static/js/ace2_inner.js
src/static/js/broadcast.js
src/static/js/domline.js
src/static/pad.html
src/static/timeslider.html
Ignored conflicts (please merge manually later):
node/server.js
src/node/utils/Minify.js
|
2012-03-02 22:00:20 +01:00 |
|
Egil Moeller
|
6cd391d3fb
|
Fixed timeslider which I broke a few minutes ago
|
2012-03-01 20:18:03 +01:00 |
|
Egil Moeller
|
df531a7b2b
|
Made ace actually use the new hooks system, and removed remnants of old system
|
2012-03-01 19:22:02 +01:00 |
|
Egil Moeller
|
81440cd856
|
Removed old pluginfw stuff
|
2012-03-01 19:00:58 +01:00 |
|
Egil Moeller
|
73aa0687b8
|
Client side hooks are now loaded and works
|
2012-03-01 18:45:02 +01:00 |
|
Egil Moeller
|
35626df77b
|
Send plugin data to client
|
2012-02-29 16:05:44 +01:00 |
|
Egil Moeller
|
c9797a3714
|
Bugfix for dependency data circle
|
2012-02-29 16:05:25 +01:00 |
|
Egil Moeller
|
a894fcd4f9
|
Removed CommonCode entierly
|
2012-02-28 21:19:10 +01:00 |
|
Egil Moeller
|
cf191df0b8
|
So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage...
|
2012-02-28 21:14:31 +01:00 |
|
Egil Moeller
|
b20b86cdc8
|
Partial bugfix
|
2012-02-28 17:52:30 +01:00 |
|
Egil Moeller
|
0a4a7f538d
|
Merge branch 'temo'
|
2012-02-26 22:02:02 +01:00 |
|
Egil Moeller
|
2c7b84ca3e
|
Minify now supports plugins
|
2012-02-26 22:01:52 +01:00 |
|
Egil Moeller
|
763361a7c9
|
First stab at getting client side require(plugin/..) to work from within etherpad
|
2012-02-26 17:48:17 +01:00 |
|
Egil Moeller
|
fd5b7c1080
|
require(ep_pluginname/static/blabla); now works both on client and server
|
2012-02-26 15:34:03 +01:00 |
|
Egil Moeller
|
ac7ad6b519
|
Bugfix for git version extraction code
|
2012-02-26 14:14:54 +01:00 |
|
Egil Moeller
|
da52353ba3
|
The big rename of pluginbs from pluginomatic to ep
|
2012-02-26 13:54:32 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |