| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-03-10 | Merge branch 'plugin-fix-require' into plugin | Chad Weider | |
| 2012-03-10 | Migrate tar to use library paths. | Chad Weider | |
| 2012-03-10 | Correct indentation. | Chad Weider | |
| 2012-03-10 | These definitions have no need to be inside this closure. | Chad Weider | |
| 2012-03-10 | Correct ca91c0c4032658d428fadbb8f178fb52be3ac471. | Chad Weider | |
| 2012-03-10 | Avoid orphaned cache files from breaking the caching layer. | Chad Weider | |
| (cherry picked from commit 57d0a2e803d8efd2721c575e225bc9d90910d6d3) | |||
| 2012-03-10 | Correct cache location and guard against bad directories. | Chad Weider | |
| 2012-03-10 | Merge branch 'require-paths' into plugin | Chad Weider | |
| 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 | Rename javascript path from 'minified' to 'javascripts/src'. | Chad Weider | |
| Also anticipate requirement of libary modules for plugins. | |||
| 2012-03-10 | Merge branch 'plugin-fix-require' into plugin | Chad Weider | |
| 2012-03-10 | Minify implements virtual plugins resources. | Chad Weider | |
| 2012-03-10 | Change paths. | Chad Weider | |
| 2012-03-10 | Correct paths to reflect their being libraries. | Chad Weider | |
| 2012-03-10 | Remove unnecessary line. | Chad Weider | |
| 2012-03-10 | Remove require code that is unnecessary and/or incorrect. | Chad Weider | |
| 2012-03-10 | Remove require changes in `pushScriptsTo` method. | Chad Weider | |
| These duplicate `pushRequireScriptTo` at least, but mostly break things. | |||
| 2012-03-10 | This is duplicated by the contents of static. | Chad Weider | |
| 2012-03-10 | Upgrade require-kernel for relative path fixes. | Chad Weider | |
| 2012-03-10 | Modules requires use relative paths. | Chad Weider | |
| 2012-03-04 | Fixing client side require, the minify code is completly unused now, very ↵ | Peter 'Pita' Martischka | |
| ugly solution | |||
| 2012-03-04 | Fix configuration of express | Peter 'Pita' Martischka | |
| 2012-03-04 | fix debugRun | Peter 'Pita' Martischka | |
| 2012-03-04 | Output nicer exceptions in hook call | Peter 'Pita' Martischka | |
| 2012-03-04 | Fix dirty path for windows | Peter 'Pita' Martischka | |
| 2012-03-04 | Fix gitignore for custom files | Peter 'Pita' Martischka | |
| 2012-03-04 | fix dirty path in settings.json | Peter 'Pita' Martischka | |
| 2012-03-02 | Added the rejected/conflicting files as .rej-files so they're not forgotten ↵ | Egil Moeller | |
| but resolved manually | |||
| 2012-03-02 | Merge branch 'pita' | Egil Moeller | |
| 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-01 | Fixed timeslider which I broke a few minutes ago | Egil Moeller | |
| 2012-03-01 | Made ace actually use the new hooks system, and removed remnants of old system | Egil Moeller | |
| 2012-03-01 | Removed old pluginfw stuff | Egil Moeller | |
| 2012-03-01 | Client side hooks are now loaded and works | Egil Moeller | |
| 2012-02-29 | Send plugin data to client | Egil Moeller | |
| 2012-02-29 | Bugfix for dependency data circle | Egil Moeller | |
| 2012-02-29 | Bugfix for dependency | Egil Moeller | |
| 2012-02-29 | Merge pull request #524 from marcelklehr/master | Peter 'Pita' Martischka | |
| Dynamic text color (adding dynamic link text color) | |||
| 2012-02-29 | Update README.md | John McLear | |
| 2012-02-29 | Rework dynamic text contrast | Marcel Klehr | |
| -Remove hard coding of default text color -add dynamic link text contrast | |||
| 2012-02-29 | Extend colorutils | Marcel Klehr | |
| Add color invertion and calculation of complementary colors. | |||
| 2012-02-29 | Merge pull request #523 from 0ip/labelfix | John McLear | |
| fixes #520 | |||
| 2012-02-29 | cross-browser compatible solution + removed some resizing stuff | 0ip | |
| 2012-02-29 | fixes #520, sideeffect: looks bad now using Chrome | 0ip | |
| 2012-02-29 | Merge pull request #521 from cweider/fix-minify | Peter 'Pita' Martischka | |
| Fix minify | |||
| 2012-02-28 | Update to yajsml with more windows support. | Chad Weider | |
| 2012-02-28 | Revert "Add a hack to prevent redirect of requests for `/static/js/pad` to ↵ | Chad Weider | |
| `/static/js/pad.js`." This reverts commit af4bd5ca65637dc660a2ccda9f2454180f38f4d3. | |||
| 2012-02-28 | Don't let filenames be changed to Windows' backslash-notation. | Chad Weider | |
| 2012-02-28 | Windows does not like IP addresses of 0.0.0.0. | Chad Weider | |
| 2012-02-28 | Status code should not be assumed. | Chad Weider | |
| 2012-02-28 | Headers should only be set after file is written. | Chad Weider | |
| 2012-02-28 | Account for undefined argument. | Chad Weider | |
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |