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
Egil Moeller
ee40b23cfc
Added a fake plugin __builtin__ for builtin functionality
2012-02-24 20:21:52 +01:00
Egil Moeller
441fd2f8eb
Bugfix for there being no registrations for a hook at all
2012-02-24 20:21:22 +01:00
Egil Moeller
30b018833c
Added a simple test plugin that doesn't do much
2012-02-24 20:03:58 +01:00
Egil Moeller
168f481980
Restructuring of some code to make it more readable
2012-02-24 19:02:56 +01:00
Egil Moeller
38e62274bc
Added expressServer hook to register new URLs
2012-02-24 17:59:14 +01:00
Egil Moeller
1ea5954a3b
Merge branch 'master' of github.com:redhog/etherpad-lite
2012-02-24 17:43:25 +01:00
Egil Moeller
e5a46f5850
Added hook.callAll and hook.aCallAll
2012-02-24 17:37:40 +01:00
Egil Moeller
e994b5b2b1
Oups, bad format
2012-02-24 15:33:20 +01:00
Egil Moeller
b4b0026068
Added the basic parts for a plugin loader
2012-02-24 13:42:36 +01:00
John McLear
88744901c0
Fixes import major bug caused by removing container required for callback of import
2012-02-24 12:23:31 +00:00
Jordan
6467a1a40f
Document the -s|--settings cli option in README
2012-02-21 15:36:05 -05:00
Peter 'Pita' Martischka
481489e6e5
Merge pull request #478 from jhollinger/settings_option
...
Allow settings filename to be passed as a cli option
2012-02-21 12:16:14 -08:00
Jordan
8bac77ff80
Allow settings filename to be passed as a cli option
2012-02-21 14:20:45 -05:00
Peter 'Pita' Martischka
10cbb485fb
Merge pull request #473 from drdla/patch-1
...
Promote proper use of css specificity
2012-02-21 02:45:08 -08:00
drdla
ec2d415a92
Promote proper use of css specificity
2012-02-20 22:28:25 +01:00
John McLear
d479784559
Hotfix for issue #467 https://github.com/Pita/etherpad-lite/issues/467 -- probably wants a permafix
2012-02-20 01:11:34 +00:00
John McLear
6ba865521a
See 1caaff9308
...
https://github.com/Pita/etherpad-lite/pull/462
2012-02-18 17:51:39 +00:00
Peter 'Pita' Martischka
0d9754760d
Merge pull request #458 from fourplusone/master
...
Should fix #417 and #360
2012-02-17 03:21:26 -08:00
Matthias Bartelmeß
fe6c5e1cfe
restructured and commented fixes #417 and #360 in order to make code more intuitive
2012-02-17 11:41:41 +01:00
Matthias Bartelmeß
97b7f0707f
Add further checks to make sure sessioninfos[sessionID] is !== undefined
2012-02-16 23:35:00 +01:00
Chad Weider
2bc07204f8
Merge pull request #459 from cweider/fix-common-code
...
Account for more spaces and Windows paths. This fixes #456 .
2012-02-16 14:21:51 -08:00
Chad Weider
1063a3d036
Account for more spaces and Windows paths. This fixes #456 .
2012-02-16 14:19:16 -08:00
Matthias Bartelmeß
bad920e28d
fixes #417 and #360
2012-02-16 23:11:52 +01:00
Chad Weider
9ca914f8cd
Merge pull request #454 from cweider/fix-common-code
...
Fix CommonCode (#451 )
2012-02-15 13:40:21 -08:00
Chad Weider
2931382a10
Update require-kernel, which fixes #451 .
2012-02-15 13:35:16 -08:00
Peter 'Pita' Martischka
a8469dcdaa
Merge pull request #450 from drdla/master
...
Improved structure and legibility of file; reduced redundancies
2012-02-15 05:42:36 -08:00
drdla
f93fba2511
Improved file structure and CSS coding style; also ran CSSLint on it;
...
To be done: sprite and compress images
2012-02-14 23:49:43 +01:00
Chad Weider
546aaae379
Merge branch 'modulize-share'
2012-02-14 12:10:41 -08:00
Chad Weider
9837cda257
Correct typo in 363e168561
.
2012-02-14 12:09:47 -08:00
Peter 'Pita' Martischka
ebeb2da275
Merge pull request #422 from jhollinger/fix_listPads
...
HTTP API listPads should return an array
2012-02-14 09:22:18 -08:00
Peter 'Pita' Martischka
5751a8e434
Merge pull request #352 from cweider/modulize-share
...
Module Sharing
2012-02-14 09:21:45 -08:00
Peter 'Pita' Martischka
da1fbaad9a
Merge pull request #434 from jhollinger/unknown_message
...
Unknown message
2012-02-14 09:21:20 -08:00
Jordan
da23a62c49
Remove an unused collab client message
2012-02-13 22:59:12 -05:00
Jordan
0d3188365a
Bugfix to noColors view option
2012-02-13 22:59:12 -05:00
Chad Weider
e0d23e3c5d
Create and use the Security module.
...
Use it to replace code on the client and server side.
2012-02-10 14:52:35 -08:00
Chad Weider
363e168561
Share `randomString` method.
...
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
Chad Weider
34edba3adf
Share `createCookie` and `readCookie` methods.
2012-02-10 14:52:34 -08:00
Chad Weider
7038f9a61d
Drop the `cssmanager_client` module.
2012-02-10 14:52:34 -08:00
Chad Weider
f6ac0b1926
Drop the `linestylefilter_client` module.
2012-02-10 14:52:34 -08:00
Chad Weider
3581a45491
Drop the `domline_client` module.
2012-02-10 14:52:34 -08:00
Chad Weider
4098cbe03b
Drop the `easysync*` modules.
2012-02-10 14:52:34 -08:00
Chad Weider
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
Chad Weider
3dabe81989
Create a module to proxy client-side modules.
2012-02-10 14:52:34 -08:00