Commit Graph

306 Commits

Author SHA1 Message Date
Peter 'Pita' Martischka c3f728b2ed Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller"
This reverts commit 9ede14a546.
2012-02-26 16:13:07 +01:00
0ip 1b339a6a6d Merge pull request #486 from fourplusone/fix_redirect
use relative path for redirects avoiding problems with reverse proxies
2012-02-25 11:05:26 -08: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
Matthias Bartelmeß 9e82aab858 use relative path for redirects avoiding problems with reverse proxies 2012-02-23 20:35:41 +01:00
Jordan 8bac77ff80 Allow settings filename to be passed as a cli option 2012-02-21 14:20:45 -05:00
Matthias Bartelmeß 9ede14a546 drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller 2012-02-19 15:02:54 +01:00
Peter 'Pita' Martischka 0d9754760d Merge pull request #458 from fourplusone/master
Should fix #417 and #360
2012-02-17 03:21:26 -08:00
Matthias Bartelmeß fe6c5e1cfe restructured and commented fixes #417 and #360 in order to make code more intuitive 2012-02-17 11:41:41 +01:00
Matthias Bartelmeß 97b7f0707f Add further checks to make sure sessioninfos[sessionID] is !== undefined 2012-02-16 23:35:00 +01:00
Chad Weider 1063a3d036 Account for more spaces and Windows paths. This fixes #456. 2012-02-16 14:19:16 -08:00
Matthias Bartelmeß bad920e28d fixes #417 and #360 2012-02-16 23:11:52 +01:00
Chad Weider 546aaae379 Merge branch 'modulize-share' 2012-02-14 12:10:41 -08:00
Chad Weider 9837cda257 Correct typo in 363e168561. 2012-02-14 12:09:47 -08:00
Peter 'Pita' Martischka ebeb2da275 Merge pull request #422 from jhollinger/fix_listPads
HTTP API listPads should return an array
2012-02-14 09:22:18 -08:00
Chad Weider e0d23e3c5d Create and use the Security module.
Use it to replace code on the client and server side.
2012-02-10 14:52:35 -08:00
Chad Weider 363e168561 Share `randomString` method.
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
Chad Weider 7038f9a61d Drop the `cssmanager_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider f6ac0b1926 Drop the `linestylefilter_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 3581a45491 Drop the `domline_client` module. 2012-02-10 14:52:34 -08:00
Chad Weider 4098cbe03b Drop the `easysync*` modules. 2012-02-10 14:52:34 -08:00
Chad Weider f8f80968ca Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules. 2012-02-10 14:52:34 -08:00
Chad Weider 3dabe81989 Create a module to proxy client-side modules. 2012-02-10 14:52:34 -08:00
Jordan 5fde0b548c HTTP API listPads should return an array 2012-02-06 21:10:37 -05: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