Marcel Klehr
3e53a11127
Show errors on npm install
2012-11-19 15:19:59 +01:00
johnyma22
cefbd8354d
fix tiny error of missing space
2012-11-16 21:12:04 +00:00
johnyma22
fbe16da728
dont forget to allow for cleanup
2012-11-16 20:52:19 +00:00
johnyma22
27c5e8691f
mheh, better way of handling the buidl for windows script
2012-11-16 20:51:08 +00:00
johnyma22
1321d9e16f
Resolve #1171 by not including tests in windows build
2012-11-16 20:17:25 +00:00
John McLear
bad9b2ee66
Merge pull request #1162 from ether/windows-build-script-exclusions
...
Dont include git history in the windows .zip
2012-11-15 08:10:30 -08:00
Marcel Klehr
fcee203a1a
Dont include git history in the windows .zip
...
git history is located in .git/objects
2012-11-15 15:16:12 +01:00
John McLear
3821c1441c
Merge pull request #1150 from marcelklehr/fix/script-migrate-dirty-mysql
...
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
2012-11-14 10:40:11 -08:00
Peter 'Pita' Martischka
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
Marcel Klehr
b057759eae
Fix #1142 error in bin/migrateDirtyDBtoMySQL.js
...
npm must be npm.load'ed before using it
2012-11-09 22:06:26 +01:00
Bastian
05f96429ef
added solaris compatibility: removed -v flag from cp, witch is not known by solaris cp // added condition for gnu-grep (ggrep), solaris grep has no -o flag
2012-11-07 12:51:51 +01:00
Peter 'Pita' Martischka
c8dfa6d7ae
less noise
2012-11-01 23:46:04 +00:00
John McLear
ff2e7ead09
add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne.com
2012-10-25 09:40:33 -07:00
John McLear
344ba31c92
fix paths in convert.js so it works
2012-10-25 09:35:33 -07:00
John McLear
70fe1a7451
Update bin/installOnWindows.bat
2012-09-11 22:15:48 +02:00
Marcel Klehr
0e258c4229
Use latest node version in buildForWindows.sh
2012-08-01 23:42:52 +02:00
Marcel Klehr
2d941bf31d
Fix buildForWindows
2012-08-01 23:42:03 +02:00
Marcel Klehr
3076ad9180
Exit on install if node is not installed.
2012-08-01 23:37:39 +02:00
Marcel Klehr
df38915b63
Simplify windows install
...
Don't download node.exe and jquery on install
Check node version
Exit on error
2012-08-01 15:51:14 +02:00
John McLear
d18bb81aad
Correct casing
2012-07-05 20:33:11 +03:00
johnyma22
f9805102f1
actually fix run script ;)
2012-07-05 18:30:59 +01:00
Marcel Klehr
5195f685e2
Correct error message.
2012-07-05 19:08:20 +02:00
Marcel Klehr
f15ffbb5e4
Allow v0.6.0 on UNIX
2012-07-05 19:02:20 +02:00
John McLear
bc15ea5c15
Merge pull request #829 from marcelklehr/support-node-0.8
...
Support node 0.8
2012-07-05 09:54:25 -07:00
Marcel Klehr
02ce537c68
Use node v0.8.1 / allow node v0.8
2012-06-30 20:20:05 +02:00
Marcel Klehr
d1dc0237d3
Remove settings.json.template_windows
...
Use settings.json.template
2012-06-29 16:28:05 +02:00
Marcel Klehr
3d397b1bc2
Fix windows install script
...
* would overwrite settings.json
* didn't correctly copy custom templates
* cleans var/minified* now
2012-06-29 12:41:50 +02:00
Marcel Klehr
c0ee0d8430
Add windows install script
2012-06-28 15:58:39 +02:00
John McLear
73a962e6ca
Correct dependency paths for checkPad script.
2012-04-30 19:23:41 +02:00
John McLear
9ecd864ac6
Merge pull request #557 from redhog/master
...
Templating system built on top of EJS and plugin installer
2012-04-02 12:42:38 -07:00
Egil Moeller
434252a321
Removed prefixfree as it breaks @import in css files
2012-04-01 22:55:04 +02:00
Matthias Bartelmeß
8eb43a3ebf
replaceing AttributePoolFactory by AttributePool
2012-03-18 09:05:46 +01:00
Peter 'Pita' Martischka
0e110efe9e
fix debugRun
2012-03-04 21:06:37 +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
a894fcd4f9
Removed CommonCode entierly
2012-02-28 21:19:10 +01:00
Egil Moeller
763361a7c9
First stab at getting client side require(plugin/..) to work from within etherpad
2012-02-26 17:48:17 +01:00
Egil Moeller
da52353ba3
The big rename of pluginbs from pluginomatic to ep
2012-02-26 13:54:32 +01:00
Egil Moeller
758666c3e1
Better startup & symlinking
2012-02-26 13:31:47 +01:00
Egil Moeller
1239ce7f28
The Big Renaming - etherpad is now an NPM module
2012-02-26 13:07:51 +01:00
John McLear
bbaa6bb7d2
add stuff for how to do load testing
2012-02-25 16:54:27 +00:00
Jordan
8bac77ff80
Allow settings filename to be passed as a cli option
2012-02-21 14:20:45 -05:00
Chad Weider
363e168561
Share `randomString` method.
...
This simply shares a common implementation and makes no judgements on the validity of its use. The string created is not a secure random number, so some uses of it may not be applicable.
2012-02-10 14:52:34 -08:00
Chad Weider
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
Peter 'Pita' Martischka
394d542d5e
fix jquery version regex to make @0ip happy
2012-02-06 17:36:59 +01:00
Pedro Gracia
7a41cde51f
Add -k option in curl to check prefixtree to avoid check ssl certificate
2012-02-06 07:25:36 +01:00
Chad Weider
7a03405bb0
Fix version check for jQuery 1.7.1 download.
...
This corrects 3d108d6dce
, which caused jQuery's version to mismatch and installDeps to download a new version every run.
2012-02-05 13:40:19 -08:00
John McLear
82bda0b0ab
Merge pull request #398 from 0ip/vendor_pref
...
Get rid of these idiotic vendor prefixes
2012-02-04 09:57:12 -08:00
Robin
dd9989c32a
fixes automatic update
2012-02-04 18:46:43 +01:00
Robin
eb24404d3d
automatic prefixfree.js dl
2012-02-04 18:37:36 +01:00
0ip
3d108d6dce
Update jQuery, removes "event.layerX/layerY are broken and deprecated in WebKit" message
2012-02-03 19:20:32 +01:00