Egil Moeller
|
33c53e61c2
|
Merge branch 'johnyma22'
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-04-01 13:27:38 +02:00 |
|
Egil Moeller
|
b74447aa3c
|
Styling generalization - use classes instead of id:s where applicable
|
2012-03-28 19:20:07 +02:00 |
|
Matthias Bartelmeß
|
e463273901
|
added UI to for unnamed authors
|
2012-03-25 15:48:31 +02:00 |
|
Matthias Bartelmeß
|
94a9795a04
|
CSS candy
|
2012-03-25 00:29:03 +01:00 |
|
Matthias Bartelmeß
|
371aee2e19
|
Added timeslider author UI
|
2012-03-24 20:35:45 +01:00 |
|
Egil Moeller
|
ce5d2d8685
|
Merge branch 'pita'
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-02 22:00:20 +01:00 |
|
Egil Moeller
|
1239ce7f28
|
The Big Renaming - etherpad is now an NPM module
|
2012-02-26 13:07:51 +01:00 |
|