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
|
758666c3e1
|
Better startup & symlinking
|
2012-02-26 13:31:47 +01:00 |
|
Dominik Rodler
|
4e54ebb0b8
|
Added new favicon
|
2012-02-25 20:45:28 +01:00 |
|
Robin
|
dd9989c32a
|
fixes automatic update
|
2012-02-04 18:46:43 +01:00 |
|
Chad Weider
|
b175ad562a
|
Use uncompressed jQuery.
The jQuery library does not need to be compressed; it is compressed as a consequence of being included in `pad.js`.
|
2012-01-22 09:46:08 -08:00 |
|
Peter 'Pita' Martischka
|
deedc17ca8
|
Added backup and patch files to .gitignore. Makes life a bit easier
|
2011-11-28 11:28:06 -08:00 |
|
Peter 'Pita' Martischka
|
dd4c8dc3aa
|
added a convert script from old etherpad to etherpad lite, instructions will follow
|
2011-08-18 20:58:56 +01:00 |
|
Peter 'Pita' Martischka
|
b300dc1d2c
|
fixed merge conflicts
|
2011-08-13 22:18:42 +01:00 |
|
Peter 'Pita' Martischka
|
7ff8814fd7
|
added the dirty db file to gitignore
|
2011-08-13 13:03:07 +01:00 |
|
Peter 'Pita' Martischka
|
53cdd893af
|
added a buildForWindows script
|
2011-08-11 22:00:52 +01:00 |
|
Peter 'Pita' Martischka
|
f45b7ce9ea
|
Installed API infrastructure, getText works already
|
2011-08-03 19:31:25 +01:00 |
|
Peter 'Pita' Martischka
|
95b47b4940
|
use a downloaded jQuery instead of using googles CDN, and fixed btw a bug that let pad.js fails randomly
|
2011-06-30 18:06:07 +01:00 |
|
Peter 'Pita' Martischka
|
280b4ab9c7
|
Create a template of the settings file
|
2011-06-02 12:15:02 +01:00 |
|
Peter 'Pita' Martischka
|
fd4efc3b31
|
Ignore node_modules in the main folder
|
2011-06-02 12:07:48 +01:00 |