94968e69be
Add support for npm 2
2014-09-27 12:30:11 +02:00
ab607d3137
Add a script to reinsert all db values of a pad
2014-05-19 18:18:01 +02:00
3d8452b143
Replace tabs indentation with spaces indentation
...
Some files are obviously external libraries, I didn't touch them
2013-12-05 08:41:29 +01:00
8c1e066a02
mkdir
2013-11-24 13:13:29 +00:00
97f5b581b0
cp readme on build
2013-11-24 13:08:26 +00:00
1eef5278bd
growwlll
2013-11-24 12:51:50 +00:00
6ee57746c9
whoopsi
2013-11-24 12:44:09 +00:00
d6f1aa3236
clean
2013-11-24 12:41:12 +00:00
678c80d1dc
whoa there, no need to include .git folder in build
2013-11-24 02:57:15 +00:00
09429be4c9
whoops
2013-11-24 02:52:55 +00:00
61df1facd2
semi-working build script for deb packages
2013-11-24 02:42:50 +00:00
1f68f07083
support node 0.11
2013-11-14 22:46:58 +00:00
fa4ebd602c
Update installDeps.sh
2013-11-12 09:58:22 +00:00
932c9ae406
allow nix file process path to be visible in ps aux
2013-11-10 16:32:33 +00:00
b34224559d
‘Etherpad Lite’ -> ‘Etherpad’
2013-09-29 13:57:37 +02:00
f3987007b0
Back to sh, fix comparison for POSIX/dash (++ CentOS, Ubuntu compatibility)
2013-09-17 15:27:52 -06:00
dc2418e532
Start script needs bash instead of sh for root arguments
2013-08-15 11:06:48 -06:00
67b513216a
Fix safeRun that tries to shift on subsequent restarts
2013-05-29 10:40:30 +08:00
cbbf9a82ac
Pass arguments from safeRun.sh to run.sh
2013-05-26 23:06:15 +02:00
782c512e93
Drop support for node v0.6, officially
2013-04-01 14:07:38 +02:00
e050ad57e4
fix typo
2013-03-22 17:39:22 +00:00
5a9393d5da
Update version checks
2013-03-16 09:46:35 +01:00
62c13b4c3f
typo
2013-03-07 14:10:54 +01:00
70c329957d
additional ouput for importSqlFile
2013-03-07 14:05:55 +01:00
4026ba1815
fixed saved data to be escaped properly
2013-03-07 13:15:29 +01:00
f2b173f566
improved output for importSqlFile
2013-03-06 22:38:18 +01:00
76fbc29607
improved output for importSqlFile
2013-03-06 22:36:00 +01:00
4b7238c2cd
improved output for importSqlFile
2013-03-06 22:28:00 +01:00
db0d0d1f72
fixed problem with npm
2013-03-06 22:08:14 +01:00
6dfc5f2c88
a script that allows importing old etherpad db
...
this script allows you to import the sql file generated with
convert.js into all supported dbms, not only MySQL
2013-03-06 21:24:19 +01:00
af25606ea8
Fix bin/extractPadData on windows
2013-02-27 16:26:22 +01:00
ea4307ae97
remove console error
2013-02-26 16:32:34 -08:00
1fd99bfd43
fix deletePad script by remembering not to miss a callback..
2013-02-26 16:32:09 -08:00
b7d96b1dcf
a cli tool for deleting pads
2013-02-26 11:44:22 +00:00
0a19589509
fix path for windows
2013-02-18 20:40:34 +00:00
19964498f3
no need to parse already parsed json
2013-02-18 20:38:32 +00:00
f76cfad42b
remove cruft
2013-02-18 08:30:42 -08:00
4cfac2f624
fix extract and checkPad
2013-02-18 08:29:25 -08:00
bf6958ad57
Update bin/loadTesting/README
2013-02-12 15:04:06 +00:00
6aeed1268e
change message
2013-02-10 15:19:28 +00:00
3a73aa2f48
please wait msg
2013-02-10 03:17:04 +00:00
98a9b1e222
update jquery 1.7.1 -> 1.9.1
2013-02-10 02:55:50 +01:00
7066ed183d
Update bin/convert.js
...
'lil typo
2013-01-22 00:56:39 +01:00
90ca3d53c3
Fix #1367 : async.series was lacking callback in checkPad.js
2013-01-17 17:31:56 +01:00
7db6448e2a
Load npm before everything else in checkPad.js
2013-01-15 07:31:51 +01:00
025c92f346
Merge pull request #1328 from mluto/run-sh-root-argument
...
Added --root argument to run.sh to bypass the root-check, fix for #1324
2013-01-14 08:14:13 -08:00
f4b95c5ca4
Add log4js config setting
2013-01-13 12:20:49 +01:00
e7d9359737
Added error-handling for npm
2013-01-06 20:20:46 +01:00
7ec7ccc402
Fixed extractPadData.js, #1320
2013-01-06 19:25:32 +01:00
6a27a54727
Added --root argument to run.sh to bypass the root-check, fix for #1324
2013-01-06 12:48:32 +01:00
d6027726e6
Fix urls, use github.com/ether
...
Signed-off-by: Hyacinthe Cartiaux <hyacinthe.cartiaux@uni.lu>
2012-11-22 01:12:30 +01:00
b515156041
Only show errors/warnings on npm install [windows]
2012-11-19 15:24:48 +01:00
3e53a11127
Show errors on npm install
2012-11-19 15:19:59 +01:00
cefbd8354d
fix tiny error of missing space
2012-11-16 21:12:04 +00:00
fbe16da728
dont forget to allow for cleanup
2012-11-16 20:52:19 +00:00
27c5e8691f
mheh, better way of handling the buidl for windows script
2012-11-16 20:51:08 +00:00
1321d9e16f
Resolve #1171 by not including tests in windows build
2012-11-16 20:17:25 +00:00
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
fcee203a1a
Dont include git history in the windows .zip
...
git history is located in .git/objects
2012-11-15 15:16:12 +01:00
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
4c095202bd
Merged branch feature/frontend-tests
2012-11-13 07:29:57 -08:00
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
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
c8dfa6d7ae
less noise
2012-11-01 23:46:04 +00:00
ff2e7ead09
add a script to migrate from dirtyDB to MYSQL thanks to http://blog.codeborne.com
2012-10-25 09:40:33 -07:00
344ba31c92
fix paths in convert.js so it works
2012-10-25 09:35:33 -07:00
70fe1a7451
Update bin/installOnWindows.bat
2012-09-11 22:15:48 +02:00
0e258c4229
Use latest node version in buildForWindows.sh
2012-08-01 23:42:52 +02:00
2d941bf31d
Fix buildForWindows
2012-08-01 23:42:03 +02:00
3076ad9180
Exit on install if node is not installed.
2012-08-01 23:37:39 +02:00
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
d18bb81aad
Correct casing
2012-07-05 20:33:11 +03:00
f9805102f1
actually fix run script ;)
2012-07-05 18:30:59 +01:00
5195f685e2
Correct error message.
2012-07-05 19:08:20 +02:00
f15ffbb5e4
Allow v0.6.0 on UNIX
2012-07-05 19:02:20 +02:00
bc15ea5c15
Merge pull request #829 from marcelklehr/support-node-0.8
...
Support node 0.8
2012-07-05 09:54:25 -07:00
02ce537c68
Use node v0.8.1 / allow node v0.8
2012-06-30 20:20:05 +02:00
d1dc0237d3
Remove settings.json.template_windows
...
Use settings.json.template
2012-06-29 16:28:05 +02:00
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
c0ee0d8430
Add windows install script
2012-06-28 15:58:39 +02:00
73a962e6ca
Correct dependency paths for checkPad script.
2012-04-30 19:23:41 +02:00
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
434252a321
Removed prefixfree as it breaks @import in css files
2012-04-01 22:55:04 +02:00
8eb43a3ebf
replaceing AttributePoolFactory by AttributePool
2012-03-18 09:05:46 +01:00
0e110efe9e
fix debugRun
2012-03-04 21:06:37 +01:00
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
a894fcd4f9
Removed CommonCode entierly
2012-02-28 21:19:10 +01:00
763361a7c9
First stab at getting client side require(plugin/..) to work from within etherpad
2012-02-26 17:48:17 +01:00
da52353ba3
The big rename of pluginbs from pluginomatic to ep
2012-02-26 13:54:32 +01:00
758666c3e1
Better startup & symlinking
2012-02-26 13:31:47 +01:00
1239ce7f28
The Big Renaming - etherpad is now an NPM module
2012-02-26 13:07:51 +01:00
bbaa6bb7d2
add stuff for how to do load testing
2012-02-25 16:54:27 +00:00
8bac77ff80
Allow settings filename to be passed as a cli option
2012-02-21 14:20:45 -05:00
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
f8f80968ca
Share the `AttributePoolFactory`, `Changeset`, and `contentcollector` modules.
2012-02-10 14:52:34 -08:00
394d542d5e
fix jquery version regex to make @0ip happy
2012-02-06 17:36:59 +01:00
7a41cde51f
Add -k option in curl to check prefixtree to avoid check ssl certificate
2012-02-06 07:25:36 +01:00
7a03405bb0
Fix version check for jQuery 1.7.1 download.
...
This corrects 3d108d6dce
2012-02-05 13:40:19 -08:00
82bda0b0ab
Merge pull request #398 from 0ip/vendor_pref
...
Get rid of these idiotic vendor prefixes
2012-02-04 09:57:12 -08:00
dd9989c32a
fixes automatic update
2012-02-04 18:46:43 +01:00
Stefan