Commit graph

1199 commits

Author SHA1 Message Date
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
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
John McLear
64f04670ef Merge pull request #483 from fourplusone/ace2_inner_patch2
refactored ace_setProperty of ace2_inner.js
2012-02-24 09:00:18 -08:00
Egil Moeller
38e62274bc Added expressServer hook to register new URLs 2012-02-24 17:59:14 +01:00
John McLear
04126690fb Merge pull request #480 from fourplusone/ace2_inner_patch-1
fixed indention + variable scoping
2012-02-24 08:52:41 -08: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
Matthias Bartelmeß
9e82aab858 use relative path for redirects avoiding problems with reverse proxies 2012-02-23 20:35:41 +01:00
Stefan 'Gared
38d93eac39 fixed a spelling mistake 2012-02-23 16:01:21 +01:00
Matthias Bartelmeß
b06f3f6903 removed ";" 2012-02-21 23:15:19 +01:00
Matthias Bartelmeß
4ef71c3534 documented ace_setProperty 2012-02-21 23:13:59 +01:00
Matthias Bartelmeß
eae87fd835 fixed indention + variable scoping 2012-02-21 21:46:25 +01: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
Chad Weider
cfe095466f Add some comments. 2012-02-19 20:47:23 -08:00
Chad Weider
98f56b53b4 Use cache for minified assets. 2012-02-19 20:47:23 -08:00
Chad Weider
6a7a3ea3ab Provide a better last modified date for require-kernel. 2012-02-19 20:47:23 -08:00
Chad Weider
78691feec7 Drop all packaging logic from minify. 2012-02-19 20:47:23 -08:00
Chad Weider
3b2a3ad324 It is ok if the directory doesn't exist. 2012-02-19 20:47:23 -08:00
Chad Weider
e0930005c3 Minify serves all static assets. 2012-02-19 20:47:23 -08:00