public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,520 Commits
190 Branches
71 Tags
55 MiB
Commit Graph

1520 Commits (4195e11a41c5992bc555cef71246800bceaf1915)

Author SHA1 Message Date
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
Peter 'Pita' Martischka cfb58a80a3 Merge git://github.com/Gared/etherpad-lite 2012-03-11 16:07:29 -07:00
Peter 'Pita' Martischka f125af001f Merge branch 'develop' of github.com:Pita/etherpad-lite into develop 2012-03-11 16:06:16 -07:00
Peter 'Pita' Martischka 0b4ec7e1ad Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite into develop 2012-03-11 16:04:26 -07:00
Peter 'Pita' Martischka a6d4858f09 Merge branch 'patch-3' of git://github.com/bradh/etherpad-lite 2012-03-11 16:04:20 -07:00
Chad Weider 0944670fb7 Merge remote-tracking branch 'main/master' into develop 2012-03-11 15:58:36 -07:00
Chad Weider 6fe4034e7c Merge pull request #541 from cweider/fix-minify 
Fix minify
 2012-03-11 15:55:37 -07:00
Chad Weider 667df3f838 Merge pull request #540 from cweider/fix-timeslider 
Patch use of `forEach` after method was removed.
 2012-03-11 15:55:06 -07:00
Chad Weider d594b2db34 Merge branch 'require-paths' into plugin 
Conflicts:
	src/static/timeslider.html
 2012-03-10 18:27:21 -08:00
Chad Weider 65ad9da155 Correct resource paths. 2012-03-10 18:19:40 -08:00
Chad Weider 5ee0067d00 Merge branch 'plugin-fix-require' into plugin 2012-03-10 18:11:06 -08:00
Chad Weider 3a115154e7 Migrate tar to use library paths. 2012-03-10 17:16:50 -08:00
Chad Weider 4e039d68da Correct indentation. 2012-03-10 15:57:46 -08:00
Chad Weider 6fac0750c2 These definitions have no need to be inside this closure. 2012-03-10 15:57:46 -08:00
Chad Weider c1a903e32e Correct ca91c0c403. 2012-03-10 15:57:46 -08:00
Chad Weider c0fc7f9b0c Avoid orphaned cache files from breaking the caching layer. 
(cherry picked from commit 57d0a2e803)
 2012-03-10 15:27:17 -08:00
Chad Weider ca91c0c403 Correct cache location and guard against bad directories. 2012-03-10 15:27:09 -08:00
Chad Weider ddda347f7a Merge branch 'require-paths' into plugin 
Conflicts:
	node/server.js
	src/static/js/Changeset.js
	src/static/js/ace.js
	src/static/js/ace2_common.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/changesettracker.js
	src/static/js/chat.js
	src/static/js/collab_client.js
	src/static/js/contentcollector.js
	src/static/js/domline.js
	src/static/js/linestylefilter.js
	src/static/js/pad.js
	src/static/js/pad_connectionstatus.js
	src/static/js/pad_docbar.js
	src/static/js/pad_editbar.js
	src/static/js/pad_editor.js
	src/static/js/pad_impexp.js
	src/static/js/pad_modals.js
	src/static/js/pad_savedrevs.js
	src/static/js/pad_userlist.js
	src/static/js/pad_utils.js
	src/static/js/timeslider.js
	src/static/js/undomodule.js
	src/static/pad.html
	src/static/timeslider.html
 2012-03-10 15:08:09 -08:00
Chad Weider 86d6dde42f Rename javascript path from 'minified' to 'javascripts/src'. 
Also anticipate requirement of libary modules for plugins.
 2012-03-10 14:54:38 -08:00
Chad Weider 7b497b1522 Merge branch 'plugin-fix-require' into plugin 2012-03-10 14:40:28 -08:00
Chad Weider 0d6ec8c04a Minify implements virtual plugins resources. 2012-03-10 14:39:37 -08:00
Chad Weider 1a1f222221 Change paths. 2012-03-10 14:39:37 -08:00
Chad Weider c6b8beabd3 Correct paths to reflect their being libraries. 2012-03-10 14:39:37 -08:00