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

4899 Commits (e3da5b5bb32434d21e37c952c7d7daa7c0a0ddbd)

Author SHA1 Message Date
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
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 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
Chad Weider 0944670fb7 Merge remote-tracking branch 'main/master' into develop 2012-03-11 15:58:36 -07: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 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
Chad Weider ca02ca05ae Remove unnecessary line. 2012-03-10 14:39:37 -08:00
Chad Weider 2fd9019792 Remove require code that is unnecessary and/or incorrect. 2012-03-10 14:39:37 -08:00
Chad Weider 648603126b Remove require changes in `pushScriptsTo` method. 
These duplicate `pushRequireScriptTo` at least, but mostly break things.
 2012-03-10 14:39:37 -08:00
Chad Weider ee312672d3 This is duplicated by the contents of static. 2012-03-10 14:39:37 -08:00
Egil Moeller 384d768610 One more bug in cache dir setting 2012-03-08 21:47:18 +01:00
Egil Moeller 72571e5ef0 Bugfixing cache 2012-03-08 21:03:22 +01:00
Egil Moeller f6212f452c Bugfix 2012-03-08 21:01:01 +01:00
Egil Moeller 92dc3e59d6 First attempt to implement the block system from django templates on top of the npm module ejs. 2012-03-07 17:36:11 +01:00
Peter 'Pita' Martischka 7b518eeb2d Fixing client side require, the minify code is completly unused now, very ugly solution 2012-03-04 23:45:33 +01:00
Peter 'Pita' Martischka 8b5925440a Fix configuration of express 2012-03-04 21:23:05 +01:00
Peter 'Pita' Martischka 9f03e5ec68 Output nicer exceptions in hook call 2012-03-04 20:32:57 +01:00
Peter 'Pita' Martischka 4e78a6b9cc Fix gitignore for custom files 2012-03-04 19:50:05 +01:00
Egil Moeller f6b9b49ab4 Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually 2012-03-02 22:02:42 +01:00
Egil Moeller ce5d2d8685 Merge branch 'pita' 
Resolved conflicts:
	.gitignore
	src/static/js/ace.js
	src/static/js/ace2_inner.js
	src/static/js/broadcast.js
	src/static/js/domline.js
	src/static/pad.html
	src/static/timeslider.html

Ignored conflicts (please merge manually later):
	node/server.js
	src/node/utils/Minify.js
 2012-03-02 22:00:20 +01:00
Egil Moeller 6cd391d3fb Fixed timeslider which I broke a few minutes ago 2012-03-01 20:18:03 +01:00
Egil Moeller df531a7b2b Made ace actually use the new hooks system, and removed remnants of old system 2012-03-01 19:22:02 +01:00
Egil Moeller 81440cd856 Removed old pluginfw stuff 2012-03-01 19:00:58 +01:00
Egil Moeller 73aa0687b8 Client side hooks are now loaded and works 2012-03-01 18:45:02 +01:00
Egil Moeller 35626df77b Send plugin data to client 2012-02-29 16:05:44 +01:00
Egil Moeller c9797a3714 Bugfix for dependency data circle 2012-02-29 16:05:25 +01:00
Egil Moeller a894fcd4f9 Removed CommonCode entierly 2012-02-28 21:19:10 +01:00
Egil Moeller cf191df0b8 So simple, yet so hard to find. Finally I found you, oh error caused by the new require usage... 2012-02-28 21:14:31 +01:00
Egil Moeller b20b86cdc8 Partial bugfix 2012-02-28 17:52:30 +01:00
Egil Moeller 0a4a7f538d Merge branch 'temo' 2012-02-26 22:02:02 +01:00
Egil Moeller 2c7b84ca3e Minify now supports plugins 2012-02-26 22:01:52 +01:00
Egil Moeller 763361a7c9 First stab at getting client side require(plugin/..) to work from within etherpad 2012-02-26 17:48:17 +01:00
Egil Moeller fd5b7c1080 require(ep_pluginname/static/blabla); now works both on client and server 2012-02-26 15:34:03 +01:00
Egil Moeller ac7ad6b519 Bugfix for git version extraction code 2012-02-26 14:14:54 +01:00
Egil Moeller da52353ba3 The big rename of pluginbs from pluginomatic to ep 2012-02-26 13:54:32 +01:00
Egil Moeller 1239ce7f28 The Big Renaming - etherpad is now an NPM module 2012-02-26 13:07:51 +01:00