Commit Graph

286 Commits (aaad7d1428bad099b60a90f5a706607d99c3ec15)

Author SHA1 Message Date
Peter 'Pita' Martischka aaad7d1428 restructuring save/load process of a pad, this makes it easier to extend the meta data of a pad 2012-03-29 19:50:38 +01:00
Peter 'Pita' Martischka f631e1e8ab Added saved revisions support 2012-03-29 19:43:26 +01:00
John McLear 9c9e5db72d Add ability to export specific pad revisions
Conflicts:

	node/utils/Minify.js
	node/utils/Settings.js
	static/css/timeslider.css
	static/js/pad_impexp.js
	static/timeslider.html
2012-03-29 19:40:55 +01:00
Chad Weider 4bf9b0c805 Always include the require kernel. 2012-02-05 16:59:40 -08:00
Chad Weider 348e7ef1d5 Define packaging for iframe JS in the same way as pad.js and timeslider.js. 2012-02-05 16:59:40 -08:00
Chad Weider 458b5a4f03 Combine tar and isolate, so that everything is done in one definition. 2012-02-05 16:59:40 -08:00
Chad Weider ddc74cd0f1 Make the comment a part of the module. 2012-02-05 16:59:40 -08:00
Chad Weider ebb5055ce8 Extract file retrieval. 2012-02-05 16:59:40 -08:00
Chad Weider e68413d998 Extract Ace.js file generation. 2012-02-05 16:59:40 -08:00
Chad Weider f010f3ae9d Remove redundant line. 2012-02-05 13:59:34 -08:00
Robin 7075ff6731 get rid of vendor prefixes 2012-02-04 18:08:04 +01:00
Robin bb808d11ac remove jquery ui 2012-02-03 21:20:02 +01:00
booo 3f3bb95073 Revert "Optimize javascript minification, slight increase of file size, but massive performance improvement"
This reverts commit b32f883a9d.
2012-02-02 11:26:36 +01:00
Peter 'Pita' Martischka be1bd1d12d Merge pull request #381 from booo/master
remove joose as dependency
2012-01-31 05:51:55 -08:00
Peter 'Pita' Martischka b32f883a9d Optimize javascript minification, slight increase of file size, but massive performance improvement 2012-01-31 13:27:46 +01:00
booo 0c723c2686 remove joose dependency 2012-01-30 15:59:13 +01:00
Peter 'Pita' Martischka aeea061f69 Merge pull request #366 from booo/master
move randomString function into a module
2012-01-30 01:58:28 -08:00
Peter 'Pita' Martischka 4d714cee94 Merge pull request #371 from cweider/page-initialization
Page initialization
2012-01-30 01:56:02 -08:00
Chad Weider a408557a0e Make implicit loading of modules unnecessary.
This is one step on the way to simplifying `Minify` and allowing all of the modules within pad.js to be loaded independently in development mode (which is useful for debugging).
2012-01-28 23:11:54 -08:00
Jordan 01cacff008 Convert goToPad to middleware 2012-01-28 21:51:25 -05:00
Chad Weider 67e6f9fa5a Move timeslider code into JS. 2012-01-28 18:42:49 -08:00
Chad Weider 3e9b56aa75 Give controller for pad.html a more appropriate name. 2012-01-28 14:48:53 -08:00
booo a300bb6e92 move randomString function into module 2012-01-28 13:24:58 +01:00
Robin 57075d1545 Beautified html, sticky chat, dynamic inputs, beautified qr-code, fixed chat bug 2012-01-26 17:22:44 +01:00
booo 87b11045e1 fix issue #281? 2012-01-25 22:00:08 +01:00
Chad Weider 62e0a8f26c Use require-kernel for require functionality. 2012-01-22 09:54:28 -08:00
Chad Weider 71dfced06d Provide filename to isolation function. 2012-01-22 09:49:13 -08:00
Chad Weider 8bf0e7c2aa Allow dashes in included file names. 2012-01-22 09:49:13 -08:00
Chad Weider 8a0d6c6636 Add missing dependency for `timeslider.js`.
When dependencies are made explicity `pad_savedrevs.js` will be required by several of the `pad_*.js`.
2012-01-22 09:49:13 -08:00
Chad Weider da95016228 Add a fake `require` to go with the fake `exports`. 2012-01-22 09:49:13 -08:00
Chad Weider fc68a25b21 Isolate all files in a closure. 2012-01-22 09:49:13 -08:00
Chad Weider ab02135643 Factor out taring process. 2012-01-22 09:49:13 -08:00
Chad Weider 9e16b9a575 Always use the JS assets processed by Minify.
This allows the preprocessing that will restrict scope of files to be done once in Minify.
2012-01-22 09:49:13 -08:00
Chad Weider b175ad562a Use uncompressed jQuery.
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
2012-01-22 09:46:08 -08:00
Chad Weider 53549b7422 Use constants and CWD-independent paths for resource directories. 2012-01-22 09:42:09 -08:00
Chad Weider c3acdbe329 Minify uses the stardard middleware interface. 2012-01-22 09:33:17 -08:00
Chad Weider 1c0a74d7c6 Use middleware to specify Server name in header. 2012-01-22 09:30:51 -08:00
Peter 'Pita' Martischka cf47153769 Merge branch 'master' of github.com:Pita/etherpad-lite 2012-01-22 15:25:50 +01:00
Peter 'Pita' Martischka d391dab558 fixed merge conflict 2012-01-22 15:23:50 +01:00
Azul c4f9268cfa make PadMessageHandler more robust against timing issues 2012-01-19 17:38:16 +01:00
Peter 'Pita' Martischka a313c2570e Merge pull request #331 from cweider/packaging-improvement
Packaging improvement
2012-01-15 12:48:41 -08:00
Chad Weider 9c91f16c71 Improve inlining of editor content.
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear f4dca37a93 Ordered list support 2012-01-15 17:20:20 +00:00
Chad Weider 77804673d7 Move packaging info into its own file. 2012-01-15 01:52:58 -08:00
Chad Weider 387dd4a48b The value of all href attributes is escaped. 2012-01-14 14:50:23 -08:00
Chad Weider 6e36b59a59 All escaping functions replace HTML reserved characters. 2012-01-14 14:46:15 -08:00
John McLear 642b716553 Merge pull request #289 from jhollinger/no_spaces
Sanitize pad names
2012-01-08 07:30:07 -08:00
John McLear 86902c2c0b Merge pull request #291 from jhollinger/export_revisions
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
Azul 7dcc7be8e0 get the proper git revision even when not started from node dir 2012-01-05 11:44:08 +01:00
Azul b1faa8e0f8 Make sure Minify.js finds its files 2012-01-05 11:44:07 +01:00