| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2012-03-24 | fixed error foreach error in timeslider.js | Matthias Bartelmeß | |
| 2012-03-23 | added underscore to tar.json | Matthias Bartelmeß | |
| 2012-03-23 | corrected underscore path in hooks | Matthias Bartelmeß | |
| 2012-03-17 | use underscore.js | Matthias Bartelmeß | |
| 2012-03-16 | Merge branch 'feature_jquery' into use_natives | Matthias Bartelmeß | |
| Conflicts: src/static/js/ace2_inner.js src/static/js/pluginfw/plugins.js | |||
| 2012-03-16 | added .keys method to objects, if not supported, fixes IE issue with pluginfw | Matthias Bartelmeß | |
| 2012-03-16 | Merge branch 'fix_crashes' into use_natives | Matthias Bartelmeß | |
| 2012-03-14 | removing fixEvent which is not used anymore | Matthias Bartelmeß | |
| 2012-03-14 | added map and forEach which were accidentally removed | Matthias Bartelmeß | |
| 2012-03-14 | added jQuery to ace2_inner, make it embeddable, ace hooks work now propertly ↵ | Matthias Bartelmeß | |
| in ace2_inner | |||
| 2012-03-14 | check if sockets are available in PadMessageHandler | Matthias Bartelmeß | |
| 2012-03-14 | smashing errors caused by .forEach | Matthias Bartelmeß | |
| 2012-03-13 | map / forEach use native impl, if available. ace2_common extends the ↵ | Matthias Bartelmeß | |
| prototype of Array, if not | |||
| 2012-03-11 | Merge git://github.com/Gared/etherpad-lite into develop | Peter 'Pita' Martischka | |
| 2012-03-11 | Merge remote-tracking branch 'main/master' into develop | Chad Weider | |
| 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 | 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-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 | Output nicer exceptions in hook call | Peter 'Pita' Martischka | |
| 2012-03-04 | Fix gitignore for custom files | 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-28 | Removed CommonCode entierly | Egil Moeller | |
| 2012-02-28 | So simple, yet so hard to find. Finally I found you, oh error caused by the ↵ | Egil Moeller | |
| new require usage... | |||
| 2012-02-28 | Partial bugfix | Egil Moeller | |
| 2012-02-26 | Merge branch 'temo' | Egil Moeller | |
| 2012-02-26 | Minify now supports plugins | Egil Moeller | |
| 2012-02-26 | First stab at getting client side require(plugin/..) to work from within ↵ | Egil Moeller | |
| etherpad | |||
| 2012-02-26 | require(ep_pluginname/static/blabla); now works both on client and server | Egil Moeller | |
| 2012-02-26 | Bugfix for git version extraction code | Egil Moeller | |
 |
index : etherpad-lite | |
| Really real-time collaborative document editing. http://etherpad.org | cos |
| summaryrefslogtreecommitdiff |