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
|
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
|
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
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|