Commit graph

  • 5ee0067d00 Merge branch 'plugin-fix-require' into plugin Chad Weider 2012-03-10 18:11:06 -08:00
  • 3a115154e7 Migrate tar to use library paths. Chad Weider 2012-03-10 17:15:04 -08:00
  • 4e039d68da Correct indentation. Chad Weider 2012-03-10 15:52:22 -08:00
  • 6fac0750c2 These definitions have no need to be inside this closure. Chad Weider 2012-03-10 15:50:15 -08:00
  • c1a903e32e Correct ca91c0c403. Chad Weider 2012-03-10 15:57:27 -08:00
  • c0fc7f9b0c Avoid orphaned cache files from breaking the caching layer. (cherry picked from commit 57d0a2e803) Chad Weider 2012-03-04 15:04:54 -08:00
  • ca91c0c403 Correct cache location and guard against bad directories. Chad Weider 2012-03-10 15:22:30 -08:00
  • ddda347f7a Merge branch 'require-paths' into plugin Chad Weider 2012-03-10 15:08:09 -08:00
  • 86d6dde42f Rename javascript path from 'minified' to 'javascripts/src'. Chad Weider 2012-03-10 14:52:19 -08:00
  • 7b497b1522 Merge branch 'plugin-fix-require' into plugin Chad Weider 2012-03-10 14:40:28 -08:00
  • 0d6ec8c04a Minify implements virtual plugins resources. Chad Weider 2012-03-10 14:03:29 -08:00
  • 1a1f222221 Change paths. Chad Weider 2012-03-10 14:13:08 -08:00
  • c6b8beabd3 Correct paths to reflect their being libraries. Chad Weider 2012-03-10 14:23:15 -08:00
  • ca02ca05ae Remove unnecessary line. Chad Weider 2012-03-10 14:12:04 -08:00
  • 2fd9019792 Remove require code that is unnecessary and/or incorrect. Chad Weider 2012-03-10 14:11:02 -08:00
  • 648603126b Remove require changes in pushScriptsTo method. Chad Weider 2012-03-10 13:59:07 -08:00
  • ee312672d3 This is duplicated by the contents of static. Chad Weider 2012-03-10 14:36:54 -08:00
  • 652fffe8ea Upgrade require-kernel for relative path fixes. Chad Weider 2012-03-06 17:42:32 -08:00
  • 6af869cadd Modules requires use relative paths. Chad Weider 2012-03-06 17:27:03 -08:00
  • 8619cd5784 Update README.md bradh 2012-03-10 17:23:05 +11:00
  • ae5b12e018 Update README.md bradh 2012-03-10 12:50:41 +11:00
  • e6ed1cb024 Merge 0d01012409 into 6fd73ecfda GitHub Merge Button 2012-03-09 17:47:59 -08:00
  • 0d01012409 Add explicit cd step to installation bradh 2012-03-10 12:46:33 +11:00
  • 384d768610 One more bug in cache dir setting Egil Moeller 2012-03-08 21:47:18 +01:00
  • 72571e5ef0 Bugfixing cache Egil Moeller 2012-03-08 21:03:22 +01:00
  • f6212f452c Bugfix Egil Moeller 2012-03-08 21:01:01 +01:00
  • 92dc3e59d6 First attempt to implement the block system from django templates on top of the npm module ejs. Egil Moeller 2012-03-07 17:36:11 +01:00
  • 29548244fd Do not cache 404 responses. Chad Weider 2012-03-04 15:13:15 -08:00
  • 0930b64c4e Handle Windows paths correctly (again). Chad Weider 2012-03-04 15:05:22 -08:00
  • 57d0a2e803 Avoid orphaned cache files from breaking the caching layer. Chad Weider 2012-03-04 15:04:54 -08:00
  • 7b518eeb2d Fixing client side require, the minify code is completly unused now, very ugly solution Peter 'Pita' Martischka 2012-03-04 23:45:33 +01:00
  • 5b4b441697 Now that buttons are where clicks start use delegation to handle click. Chad Weider 2012-03-01 22:56:58 -08:00
  • 17b9fa4f36 Make buttons into buttons. Chad Weider 2012-02-29 15:55:42 -08:00
  • 0369860b80 Remove unnecessary styles. Chad Weider 2012-02-29 17:06:06 -08:00
  • 09a6bd5593 Make styles less restrictive. Chad Weider 2012-02-29 17:00:58 -08:00
  • eae95fec09 Shift button appearance onto anchor. Chad Weider 2012-02-29 15:29:08 -08:00
  • d33ec83678 Merge 45af962a6a into 6fd73ecfda GitHub Merge Button 2012-03-04 13:13:28 -08:00
  • 45af962a6a Patch use of forEach after method was removed. Chad Weider 2012-03-04 13:10:36 -08:00
  • 8b5925440a Fix configuration of express Peter 'Pita' Martischka 2012-03-04 21:23:05 +01:00
  • 0e110efe9e fix debugRun Peter 'Pita' Martischka 2012-03-04 21:06:37 +01:00
  • 9f03e5ec68 Output nicer exceptions in hook call Peter 'Pita' Martischka 2012-03-04 20:32:57 +01:00
  • 5396cd68db Fix dirty path for windows Peter 'Pita' Martischka 2012-03-04 19:50:52 +01:00
  • 4e78a6b9cc Fix gitignore for custom files Peter 'Pita' Martischka 2012-03-04 19:50:05 +01:00
  • 935edbf892 fix dirty path in settings.json Peter 'Pita' Martischka 2012-03-04 19:47:35 +01:00
  • 36d640d929 reverted offlinemode. It works but is hackish. Will try a better a cleaner approach. Removed tons a commented code Jean-Tiare Le Bigot 2012-03-04 12:02:39 +01:00
  • 2c5b5b5aaa disabled tab key for headings as it does not make any sense Jean-Tiare Le Bigot 2012-03-04 00:51:03 +01:00
  • 94c0ff55e3 Drag & Drop fix. Thx @johnyma22 for reporting Jean-Tiare Le Bigot 2012-03-04 00:46:56 +01:00
  • ddac4d7d38 fixed line-height overlapping issue Jean-Tiare Le Bigot 2012-03-04 00:17:29 +01:00
  • 8921c1976b amazing offline mode Jean-Tiare Le Bigot 2012-03-03 21:38:00 +01:00
  • 0a68f06610 moved the modal back to the middle, grey out all the edit zone while reconnecting Jean-Tiare Le Bigot 2012-03-03 16:04:29 +01:00
  • b3904a6497 small cleanups Jean-Tiare Le Bigot 2012-03-03 15:33:10 +01:00
  • 11682661e4 bigger timeout in re-connection. Still retries in the background when saying impossible Jean-Tiare Le Bigot 2012-03-03 15:17:12 +01:00
  • ff86dee2f5 disable toolbar when disconnected Jean-Tiare Le Bigot 2012-03-03 14:35:05 +01:00
  • dba26821e1 initial modal rework to make it less intrusive on disconnect Jean-Tiare Le Bigot 2012-03-03 14:11:58 +01:00
  • d95f08536b big CSS improvement in the dropdown of the editbar + fixed a bug in the header DOM generation that caused breakage in the authorship highlighting code Jean-Tiare Le Bigot 2012-03-02 22:20:56 +01:00
  • 21638b25f8 Merge f6b9b49ab4 into 6fd73ecfda GitHub Merge Button 2012-03-02 13:02:52 -08:00
  • f6b9b49ab4 Added the rejected/conflicting files as .rej-files so they're not forgotten but resolved manually Egil Moeller 2012-03-02 22:02:42 +01:00
  • ce5d2d8685 Merge branch 'pita' Egil Moeller 2012-03-02 22:00:20 +01:00
  • 457f9f913d attempt to fix to vertical sync issue Jean-Tiare Le Bigot 2012-03-02 21:02:26 +01:00
  • 666bdcaaf8 fixed style disapearing when adding a char + added a comment to describe the trick in contentcollector Jean-Tiare Le Bigot 2012-03-02 19:41:55 +01:00
  • edc9212ff1 line after a title should be of normal type Jean-Tiare Le Bigot 2012-03-02 18:29:15 +01:00
  • 11fc9f220b implemented HTML export Jean-Tiare Le Bigot 2012-03-02 17:12:39 +01:00
  • 349b73977b CSS adaptations + added 'normal' style in dropdown Jean-Tiare Le Bigot 2012-03-02 16:57:37 +01:00
  • 332c6de873 removed alert Jean-Tiare Le Bigot 2012-03-02 14:48:20 +01:00
  • 9a5ae726bc quick and dirty title support implementation Jean-Tiare Le Bigot 2012-03-02 14:40:46 +01:00
  • 10e2b18122 Merge f3ba353d58 into 6fd73ecfda GitHub Merge Button 2012-03-01 23:27:35 -08:00
  • f3ba353d58 Don't inline styles or scripts in Ace. Chad Weider 2012-02-29 13:07:43 -08:00
  • 5118dcc687 Drop support for file inlining in Minify. Chad Weider 2012-02-29 13:09:47 -08:00
  • b977e1acd6 Child frame uses parent's require. Chad Weider 2012-02-28 20:08:24 -08:00
  • 8645478ae6 Shift editbar styles around. Chad Weider 2012-02-29 16:37:21 -08:00
  • 9be0b557b1 Anchors are not icons Chad Weider 2012-02-29 14:39:01 -08:00
  • 1d8dd16a21 fixed typos... Jean-Tiare Le Bigot 2012-03-01 20:56:22 +01:00
  • 6cd391d3fb Fixed timeslider which I broke a few minutes ago Egil Moeller 2012-03-01 20:18:03 +01:00
  • df531a7b2b Made ace actually use the new hooks system, and removed remnants of old system Egil Moeller 2012-03-01 19:22:02 +01:00
  • 9f70e729e0 added comments in ace2_inner.js + started title support based on the list code to reduce code duplication. Jean-Tiare Le Bigot 2012-03-01 19:01:15 +01:00
  • 81440cd856 Removed old pluginfw stuff Egil Moeller 2012-03-01 19:00:58 +01:00
  • 73aa0687b8 Client side hooks are now loaded and works Egil Moeller 2012-03-01 18:45:02 +01:00
  • 326de3ad26 Merge branch 'master' of https://github.com/Pita/etherpad-lite Eric Martindale 2012-03-01 05:39:08 -05:00
  • 07d1677025 The showusers control is an anchor. Chad Weider 2012-02-29 16:47:16 -08:00
  • a30c930f93 Remove nonsense styles. Chad Weider 2012-02-29 16:02:16 -08:00
  • fbbdddae8e Remove onclick attributes from editbar. Chad Weider 2012-02-29 14:13:02 -08:00
  • 26e5caa600 Merge remote-tracking branch 'remotes/upstream/master' into titles Jean-Tiare Le Bigot 2012-02-29 21:45:27 +01:00
  • 90d2edb2e7 first tentative of adding a field Jean-Tiare Le Bigot 2012-02-29 21:45:18 +01:00
  • 89d09fa95d Merge branch 'master' of github.com:jtlebi/etherpad-lite into titles Jean-Tiare Le Bigot 2012-02-29 21:44:01 +01:00
  • 35626df77b Send plugin data to client Egil Moeller 2012-02-29 16:05:44 +01:00
  • c9797a3714 Bugfix for dependency data circle Egil Moeller 2012-02-29 16:05:25 +01:00
  • 30b5a92bd0 Bugfix for dependency Egil Moeller 2012-02-29 16:04:57 +01:00
  • 6fd73ecfda Merge pull request #524 from marcelklehr/master Peter 'Pita' Martischka 2012-02-29 06:02:46 -08:00
  • 10c04b5c6f Merge f5f82a7637 into b148a42946 GitHub Merge Button 2012-02-29 05:45:45 -08:00
  • b148a42946 Update README.md John McLear 2012-02-29 13:45:42 +00:00
  • f5f82a7637 Rework dynamic text contrast Marcel Klehr 2012-02-29 14:21:35 +01:00
  • 173e7c8f27 Extend colorutils Marcel Klehr 2012-02-29 14:16:20 +01:00
  • 0a13615254 Merge pull request #523 from 0ip/labelfix John McLear 2012-02-29 04:20:44 -08:00
  • 792ef51b89 Merge 43e90c7470 into d868fd73d4 GitHub Merge Button 2012-02-29 04:17:47 -08:00
  • 43e90c7470 cross-browser compatible solution + removed some resizing stuff 0ip 2012-02-29 13:17:35 +01:00
  • cefda46a44 fixes #520, sideeffect: looks bad now using Chrome 0ip 2012-02-29 12:54:44 +01:00
  • d868fd73d4 Merge pull request #521 from cweider/fix-minify Peter 'Pita' Martischka 2012-02-29 01:49:45 -08:00
  • 9c08ba3a67 Merge 07823ddf26 into 280e07d737 GitHub Merge Button 2012-02-28 19:51:33 -08:00
  • 07823ddf26 Update to yajsml with more windows support. Chad Weider 2012-02-28 19:40:10 -08:00
  • 82652dffda Revert "Add a hack to prevent redirect of requests for /static/js/pad to /static/js/pad.js." Chad Weider 2012-02-28 19:00:27 -08:00