Age | Commit message (Collapse) | Author | |
---|---|---|---|
2013-12-05 | Replace tabs indentation with spaces indentation | Luc Didry | |
Some files are obviously external libraries, I didn't touch them | |||
2013-02-18 | Try to add some sanity to indentation | John McLear | |
2012-12-23 | Fix html10n usage in code that wouldn't allow lang switching | Marcel Klehr | |
2012-12-09 | use properties notation | Iván Eixarch | |
2012-12-07 | Added new strings to translate for js files | Iván Eixarch | |
2012-10-02 | Update src/static/js/pad_editbar.js | John McLear | |
Somehow </iframe> was no more. Now it is back.. Oh boy. | |||
2012-07-13 | Fix padeditbar.toggleDropDown | Marcel Klehr | |
Only call callback, if one was passed. | |||
2012-07-13 | Fix typo. | Marcel Klehr | |
2012-07-13 | Use nice editbar popups for connection status instead of srceen-blocking modals. | Marcel Klehr | |
2012-05-29 | Merge branch 'master' into timeslider-realtimeupdate+readonly-pads | Egil Moeller | |
Conflicts: src/node/handler/PadMessageHandler.js src/static/css/pad.css src/templates/pad.html | |||
2012-05-13 | Remove onclick attributes from editbar. | Chad Weider | |
2012-04-30 | Removed QR-Code | 0ip | |
2012-04-29 | Tidied up highlighting for currently opened module | 0ip | |
2012-04-25 | Merge branch 'master' into timeslider-realtimeupdate+readonly-pads | Egil Moeller | |
2012-04-23 | Corect ReadOnly link | Egil Moeller | |
2012-04-16 | pad_editbar adapated hacky highlighting of currently opened module to recent ↵ | 0ip | |
changes | |||
2012-04-06 | Deselect highlighted editbar module button when userlist is opened | 0ip | |
2012-04-01 | Merge branch 'johnyma22' | Egil Moeller | |
Conflicts: node/utils/Minify.js src/static/js/pad.js src/static/js/pad_docbar.js src/static/js/pad_editbar.js src/static/js/pad_savedrevs.js static/css/timeslider.css static/pad.html | |||
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-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-02-28 | Partial bugfix | Egil Moeller | |
2012-02-26 | First stab at getting client side require(plugin/..) to work from within ↵ | Egil Moeller | |
etherpad | |||
2012-02-26 | The Big Renaming - etherpad is now an NPM module | Egil Moeller | |