John McLear
|
8d764cad33
|
Perma fix for issue #485 and #327
|
2012-02-26 13:07:09 +00:00 |
|
Constantin Jucovschi
|
e318e3d4cb
|
some new docs
|
2012-02-26 12:59:20 +00:00 |
|
Constantin Jucovschi
|
ac86535cdf
|
more docs
|
2012-02-26 12:59:11 +00:00 |
|
Constantin Jucovschi
|
3abdd34160
|
writing in jsdoc syntax
|
2012-02-26 12:59:02 +00:00 |
|
Constantin Jucovschi
|
1e8ef3bb6a
|
commented general functions
|
2012-02-26 12:58:57 +00:00 |
|
Egil Moeller
|
da52353ba3
|
The big rename of pluginbs from pluginomatic to ep
|
2012-02-26 13:54:32 +01:00 |
|
John McLear
|
681e8415b6
|
Fix issue #485
|
2012-02-26 12:38:52 +00:00 |
|
Egil Moeller
|
758666c3e1
|
Better startup & symlinking
|
2012-02-26 13:31:47 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|
Egil Moeller
|
1955bdec9a
|
plugins.plugins is now defined while loading hook modules from plugins
|
2012-02-26 00:59:05 +01:00 |
|
Egil Moeller
|
2a58a62dcc
|
Client side / server side require
|
2012-02-26 00:45:06 +01:00 |
|
John McLear
|
44ec2e148a
|
Merge pull request #502 from drdla/master
Suggestion for new favicon
|
2012-02-25 14:40:35 -08:00 |
|
Dominik Rodler
|
4e54ebb0b8
|
Added new favicon
|
2012-02-25 20:45:28 +01:00 |
|
John McLear
|
7e3a3bb9ea
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-25 19:37:29 +00:00 |
|
John McLear
|
2fd1702960
|
fix sticky chat... dont like where i put the call but it will have to do cause im tired.
|
2012-02-25 19:35:49 +00:00 |
|
0ip
|
1b339a6a6d
|
Merge pull request #486 from fourplusone/fix_redirect
use relative path for redirects avoiding problems with reverse proxies
|
2012-02-25 11:05:26 -08:00 |
|
Egil Moeller
|
261bbd460f
|
test static files for plugins
|
2012-02-25 19:43:39 +01:00 |
|
Egil Moeller
|
ce35f20988
|
Make plugins dict non-recursive
|
2012-02-25 19:43:22 +01:00 |
|
Egil Moeller
|
e542199aab
|
Serve plugin static files
|
2012-02-25 19:43:00 +01:00 |
|
John McLear
|
a449876f80
|
Merge pull request #498 from eldiddio/master
This fixes issue #308
|
2012-02-25 09:32:55 -08:00 |
|
Mark Fisher
|
164db7b074
|
Added test for IE XML HTTP and added link to wiki article
|
2012-02-25 17:30:59 +00:00 |
|
Egil Moeller
|
1d86c828bc
|
Bugfix for plugin listing
|
2012-02-25 17:58:25 +01:00 |
|
John McLear
|
bbaa6bb7d2
|
add stuff for how to do load testing
|
2012-02-25 16:54:27 +00:00 |
|
Egil Moeller
|
7b42987407
|
Moved all the hooks into a hooks directory
|
2012-02-25 17:23:44 +01:00 |
|
Egil Moeller
|
6754eed9b4
|
Renamed functions to match hook names
|
2012-02-25 16:53:15 +01:00 |
|
Egil Moeller
|
f2cfb4eee5
|
Removed some more junk
|
2012-02-25 16:50:11 +01:00 |
|
Egil Moeller
|
cddf71f6fe
|
Moved socketio
|
2012-02-25 16:44:37 +01:00 |
|
0ip
|
9790598381
|
fix for #491 + #415a (floating chat icon) & fixed hidden authorship colors button on iOS
|
2012-02-25 16:41:10 +01:00 |
|
Egil Moeller
|
db38a43fd7
|
Some code cleanup
|
2012-02-25 16:24:39 +01:00 |
|
Egil Moeller
|
6a6191f67e
|
Moved errorhandling
|
2012-02-25 16:20:40 +01:00 |
|
Egil Moeller
|
24dda0c54d
|
Moved importexport
|
2012-02-25 16:06:08 +01:00 |
|
Egil Moeller
|
1c0734e97b
|
Better hook debug printout
|
2012-02-25 15:44:04 +01:00 |
|
Egil Moeller
|
a5245c896a
|
Moved apicalls
|
2012-02-25 15:20:31 +01:00 |
|
John McLear
|
e9858041a4
|
Merge pull request #494 from 0ip/miscFix
Misc fix
|
2012-02-25 05:32:29 -08:00 |
|
John McLear
|
1b5a7659c3
|
fix bug #495
|
2012-02-25 13:28:47 +00:00 |
|
Egil Moeller
|
fe7bed6501
|
Moved webaccess
|
2012-02-25 13:38:09 +01:00 |
|
Egil Moeller
|
26d9c3ed53
|
Better plugin error handling
|
2012-02-25 13:37:47 +01:00 |
|
John McLear
|
706b7b685d
|
change copyright holder in license
|
2012-02-25 09:44:57 +00:00 |
|
John McLear
|
300418e2b0
|
Adding full apache license
|
2012-02-25 09:44:12 +00:00 |
|
John McLear
|
54da9fad73
|
Merge pull request #466 from fourplusone/cleanup-ace
Cleanup ace
|
2012-02-25 01:34:51 -08:00 |
|
Egil Moeller
|
a89c81f62f
|
Moved padreadonly
|
2012-02-25 00:15:57 +01:00 |
|
Egil Moeller
|
fed805be82
|
Reindentation of pluginomatic.json
|
2012-02-24 23:56:54 +01:00 |
|
Egil Moeller
|
28babf0aa5
|
Moved minified
|
2012-02-24 23:55:19 +01:00 |
|
Egil Moeller
|
0730eb5b8d
|
Bugfix for not loading plugins until after db, plus moved padursanitize into own module
|
2012-02-24 23:38:37 +01:00 |
|
Egil Moeller
|
e3770e42b6
|
Moved /p/:pad and /p/:pad/timeslider static html to specialpages
|
2012-02-24 20:53:42 +01:00 |
|
Egil Moeller
|
752dc5ca26
|
Moved special pages ( /, /robots.txt, /favicon.ico ) to their own module
|
2012-02-24 20:50:55 +01:00 |
|
Egil Moeller
|
21300bd6c7
|
Moved static files serving to its own file
|
2012-02-24 20:45:02 +01:00 |
|
Egil Moeller
|
1f2b52ba5a
|
Builtin 'plugin' now works
|
2012-02-24 20:29:14 +01:00 |
|
Matthias Bartelmeß
|
0191c248b5
|
Merge commit '64f04670efd582230e693a1c6b3c91bc8df27299' into cleanup-ace-fix
Conflicts:
static/js/ace2_inner.js
|
2012-02-24 20:22:32 +01:00 |
|
Egil Moeller
|
ee40b23cfc
|
Added a fake plugin __builtin__ for builtin functionality
|
2012-02-24 20:21:52 +01:00 |