libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7442 commits 2 branches 0 tags 24 MiB
Commit graph

7442 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthias Bartelmeß
1478820d60 fixed error foreach error in timeslider.js 2012-03-24 19:01:04 +01:00
Matthias Bartelmeß
1789c6e1c5 proceed if plugin-definitions.json didn't load properly 2012-03-24 18:48:53 +01:00
Matthias Bartelmeß
ef248555aa Send the Content-Type header for plugin-definitions.json in the right format 2012-03-24 18:48:53 +01:00
Matthias Bartelmeß
04f3faac4b re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-24 18:48:53 +01:00
John McLear
f2ea56334d Merge pull request #571 from fourplusone/fix_ie9_plugins 
Fix ie9 plugins
 2012-03-24 07:58:07 -07:00
Matthias Bartelmeß
208d88cc03 proceed if plugin-definitions.json didn't load properly 2012-03-24 13:29:15 +01:00
Matthias Bartelmeß
8bf481f27b Send the Content-Type header for plugin-definitions.json in the right format 2012-03-24 13:28:17 +01:00
Matthias Bartelmeß
cf1be9b4bf added underscore to tar.json 2012-03-23 20:22:49 +01:00
Matthias Bartelmeß
349bb595b9 corrected underscore path in hooks 2012-03-23 20:19:41 +01:00
John McLear
debdc340af Merge pull request #570 from fourplusone/develop 
Re-enabled maxAge setting.
 2012-03-23 11:49:52 -07:00
Matthias Bartelmeß
c407ad3d34 re-enabled maxAge setting. maxAge is now in seconds, not milliseconds. 2012-03-23 19:28:46 +01:00
Egil Moeller
d0ad90456e Merge commit '1a64a6c1' 2012-03-22 18:43:59 +01:00
Egil Moeller
22eaa6ffc0 Made it possible to disable minification again 2012-03-22 18:35:06 +01:00
Egil Moeller
b8a4333d1b Exposed require to ejs pages! 2012-03-22 18:34:38 +01:00
Egil Moeller
5261ba5a69 Forward-ported some bugfixes from olad etherpad 2012-03-22 18:34:08 +01:00
Egil Moeller
d21cc1912c Better error message for broken JSON 2012-03-21 19:29:59 +01:00
Egil Moeller
50474dff1f Some new blocks to allow plugins to add scripts, styles and modals 2012-03-21 19:29:06 +01:00
Egil Moeller
1ca12b24e6 Bugfixes for plugin installer 2012-03-21 19:28:39 +01:00
Egil Moeller
7304a9ef3f Bugfix for misplaced hook call 2012-03-21 19:27:43 +01:00
Egil Moeller
37c0d279c1 Bugfix for when a block hook calls eejs.require recursively 2012-03-21 19:27:06 +01:00
Egil Moeller
c591efb352 Plugin list can now be reloaded 'live' 2012-03-19 17:16:49 +01:00
Egil Moeller
6fe7f2c2b2 Plugin list can now be reloaded 'live' 2012-03-19 16:59:57 +01:00
Matthias Bartelmeß
38742401c9 newSkipList() -> new SkipList() 2012-03-18 11:34:56 +01:00
Matthias Bartelmeß
902837f295 renaming AttributePoolFactory 2012-03-18 09:06:29 +01:00
Matthias Bartelmeß
8eb43a3ebf replaceing AttributePoolFactory by AttributePool 2012-03-18 09:05:46 +01:00
Egil Moeller
af96509fbb Plugin install/uninstall 2012-03-17 18:17:10 +01:00
Matthias Bartelmeß
e559df18ce use underscore.js 2012-03-17 13:38:26 +01:00
Matthias Bartelmeß
692e77b4e5 Merge branch 'feature_jquery' into use_natives 
Conflicts:
	src/static/js/ace2_inner.js
	src/static/js/pluginfw/plugins.js
 2012-03-16 18:50:32 +01:00
Matthias Bartelmeß
d0dd746c8b added .keys method to objects, if not supported, fixes IE issue with pluginfw 2012-03-16 18:21:28 +01:00
Matthias Bartelmeß
0e731a2645 Merge branch 'fix_crashes' into use_natives 2012-03-16 18:07:19 +01:00
Egil Moeller
81250cba15 Searching for plugins, plus handling async events from the server (progress) 2012-03-15 21:07:48 +01:00
Egil Moeller
51cae02e9d Show installed plugins and search new ones 2012-03-15 18:25:06 +01:00
Egil Moeller
dbdc53307e Bugfix to not have server required anywhere as it causes problems for command line script usage of modules 2012-03-14 18:50:13 +01:00
Constantin Jucovschi
1a64a6c1c5 makes plugin architecture work in client-side from inside IFrames as well 2012-03-14 11:45:25 +01:00
Constantin Jucovschi
0431c15325 Merge branch 'develop' of https://github.com/Pita/etherpad-lite into pita-plugin 2012-03-14 11:10:24 +01:00
Matthias Bartelmeß
e338aeb1a5 removing fixEvent which is not used anymore 2012-03-14 10:46:03 +01:00
Matthias Bartelmeß
3ef7e82045 added map and forEach which were accidentally removed 2012-03-14 10:45:02 +01:00
Matthias Bartelmeß
1cf3ffef4a added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly in ace2_inner 2012-03-14 01:41:05 +01:00
Matthias Bartelmeß
ede32726c1 check if sockets are available in PadMessageHandler 2012-03-14 01:32:16 +01:00
Matthias Bartelmeß
f34f0585bb smashing errors caused by .forEach 2012-03-14 01:28:08 +01:00
Matthias Bartelmeß
b28bfe8e31 map / forEach use native impl, if available. ace2_common extends the prototype of Array, if not 2012-03-13 21:10:10 +01:00
Egil Moeller
a5366a0a16 Integrated hooks into templates and provided a blokc/hook for the left and right editbar menu 2012-03-13 20:32:56 +01:00
Matthias Bartelmeß
70940521f2 Merge branch 'develop' of git://github.com/Pita/etherpad-lite 2012-03-13 19:40:33 +01:00
Egil Moeller
05c2e0fde5 Made all html pages into eejs templates 2012-03-13 18:24:45 +01:00
Egil Moeller
5f7f382a9e Merge branch 'master' into eejs 2012-03-13 17:51:42 +01:00
Egil Moeller
3ffed70850 Added inherit function 2012-03-13 17:42:15 +01:00
Egil Moeller
6fb0e00f03 Bugfixes for eejs 2012-03-13 17:31:40 +01:00
Egil Moeller
8756165ece Added a plugin-readme 2012-03-13 17:08:57 +01:00
Egil Moeller
381e64a801 Merge remote-tracking branch 'remotes/pita/develop' into pita-plugins 
Conflicts:
	src/node/utils/caching_middleware.js
 2012-03-13 17:08:38 +01:00
Peter 'Pita' Martischka
cccd8a923c Merge git://github.com/Gared/etherpad-lite into develop 2012-03-11 16:07:34 -07:00