9ca56a4c7e
wrong path of generate.js
2017-04-04 15:13:07 +08:00
8992dd665a
Merge new release into master branch!
2016-12-23 22:00:34 +01:00
6dc808ad54
Release version 1.6.1
2016-12-23 21:59:57 +01:00
caabb4d8f7
Update nodejs for windows to 6.9.2
2016-12-22 23:15:49 +01:00
d1d2e462d0
Updated node for windows build to version 6.9.1
2016-11-20 12:32:36 +01:00
f4bbe00322
Download JQuery over HTTPS
...
Otherwise anyone can MITM the connection and add rogue code there.
2016-07-23 16:59:47 +02:00
e11decc6f8
Fix module paths for db migration script
2016-06-08 19:43:53 +02:00
1349cfd486
Fix error if whitespace in etherpad path
2016-05-16 16:58:58 +02:00
fb96f32028
Update node for windows to version 4.4.3
2016-04-24 20:42:53 +02:00
8aa297fb40
Remove node version output on start
2016-04-24 20:29:07 +02:00
7637b0cd19
Increase version of node for windows to 4.4.2
2016-04-03 16:57:15 +02:00
e1999d826c
allow greater than or equal to v 4
2016-03-27 13:31:00 +08:00
75cd4b3333
Merge pull request #2924 from Gared/update_windows_build
...
Update windows build
2016-03-26 22:11:40 +08:00
2a81d2a578
Remove support for io.js
2016-03-20 15:21:56 +01:00
18d583d92d
Check for node version 4 or higher and not special versions
2016-03-20 15:19:34 +01:00
3738211fd8
Do not include absolute path in windows zip
2016-03-20 14:13:26 +01:00
bd2372def1
Update windows build:
...
- Update node to version 4.4.0
- Create temp folder dynamically
2016-03-14 21:56:04 +01:00
843b05a6ec
Use exec to switch to node process
...
At the end of run, `exec` should be used to switch to the node process. That way node will take over the pid of `sh run.sh`, making it easier to monitor and daemonize the server.
```
exec [command [arg ...]]
Unless command is omitted, the shell process is replaced with the
specified program (which must be a real program, not a shell
built-in command or function). Any redirections on the exec com-
mand are marked as permanent, so that they are not undone when
the exec command finishes.
```
2016-01-19 16:17:16 -07:00
c61aa20028
Improve DB migration performance.
...
Achieve 10x speedup in migrating a 12mb dirtyDB file by disabling
ueberDB caching in this special case. Add some progress messages
to the migration script and rename it, as nothing in it is tied
to mysql.
2015-11-21 23:15:46 -08:00
5f9d1397e2
Update installDeps.sh
2015-11-04 21:15:13 +01:00
02f88aafff
Update installOnWindows.bat
2015-10-22 16:22:35 +01:00
fa46f0b613
Merge pull request #2797 from ypid/rebuild-better-error
...
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-22 16:15:27 +01:00
c9924ee706
Give better error message when rebuildPad.js hits a non-existing rev.
2015-10-07 12:42:19 +02:00
bf7930fccb
Support version 4 of node.js
2015-09-26 12:15:54 +02:00
376fccfe92
bugfix for correct bash syntax
...
$rocks has to be enclosed into a "string" so bash can treat is as a string.
We can compare two strings with the == operator then, ...
2015-06-22 16:11:29 +02:00
7ba5e97a60
Use current mysql client API
2015-05-30 15:14:40 +02:00
e1406b826b
cleaner update logic doesnt error when nothing to do
2015-04-26 14:42:21 +01:00
a6a8c4d909
provide a script that cleans up before running to save people doing rm rf src node_modules
2015-04-24 07:07:18 +01:00
70d338c7d5
Merge pull request #2618 from Gared/win_node_version
...
Update node version for windows build to 0.12.2
2015-04-16 21:58:13 +01:00
f81c6b6476
Update node version for windows build to 0.12.2
2015-04-16 22:56:14 +02:00
a3ce6b1ca7
remove two pointless dep removes
2015-04-15 15:51:13 +01:00
4385598de6
update node version checking to 0.10+ or io.js
2015-04-08 23:12:12 -05:00
63cbab484d
express dropped support for node 0.8; update engine requirements
2015-04-08 23:12:11 -05:00
119fc82387
Update installDeps.sh
2015-04-04 17:30:41 +02:00
dfd17d1aba
Update installDeps.sh
2015-04-04 17:14:59 +02:00
7e9bc1b7b9
Fix minor typo in safeRun.sh email report
2015-03-31 18:33:47 +02:00
0505a47356
Support node version 0.12.x
2015-02-15 22:21:41 +01:00
f880b0feb7
clean up iojs
2015-01-21 12:18:38 +00:00
648ebc08d6
check for io.js
...
Added a check for io.js
2015-01-16 11:11:34 -02:00
1f558dc843
Removed useless use of cat
2015-01-08 14:16:07 +01:00
80fa2c2868
move docs
2014-12-24 02:45:21 +00:00
1ab7dfdb7b
Merge pull request #2358 from BjarniRunar/develop
...
Created dirty-db-cleaner.py - prunes old history from dirty.db files
2014-12-23 15:50:59 +00:00
ffdce760d5
remove unused long paths from windows build
2014-12-21 22:05:07 +00:00
89adbb9f12
Merge pull request #2329 from timrchavez/rebuild-pad-script
...
Restore pad to new location at a given revision
2014-12-04 02:34:21 +00:00
c7b1aebfe8
Make changes based on code review
...
Simplified the cloning process, added validation checks to ensure the
new pad ID is valid and that a pad doesn't already exist with that ID.
Also fixed a bug in the chatHead cloning loop and added the ability to
specify a pad ID on the command the line (defaulting to the original
"-rebuilt" pad ID formula)
2014-12-03 20:11:39 -06:00
9c174023fc
Added dirty-db-cleaner.py
2014-12-01 22:39:42 +00:00
c6d7ed114e
script to update all plugins with one command on CLI
2014-11-28 16:27:12 +00:00
5434d2118d
tidy up and re-organize
2014-11-26 19:28:49 +00:00
88b3d99fbd
Merge branch 'develop' of github.com:ether/etherpad-lite into backend-tests
2014-11-26 15:33:13 +00:00
0a84379364
make additional line break at end of imported doc
2014-11-26 15:19:22 +00:00
3ac833d455
basic test runner
2014-11-25 22:47:22 +00:00
97068b562d
more old load testing cruft
2014-11-25 01:22:32 +00:00
5e843a5877
remove jshint
2014-11-25 01:21:19 +00:00
25ccb6cfc3
Simplify the rebuild process
...
The majority of the information needed to build the new pad can be
communicated by simply cloning the rev using a db.set().
2014-11-20 22:09:21 -06:00
01f6d85371
Restore pad to new location at a given revision
...
This script gives an admin with shell access the ability to restore a
pad at a given revision by essentially rebuilding it at a new location
with data associated with the original pad. The upsides to creating a
new pad vs. changing the original are: 1) avoiding service disruptions
(no deletes, no moving targets - builds from previous revision); and 2)
preservation of data (no deletes, no overwriting of the source pad).
The most obvious downside is the pad has a new ID which could require
folks to update their links, bookmarks, etc. to point at the new
location.
2014-11-19 13:09:37 -06:00
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
eb24404d3d
automatic prefixfree.js dl
2012-02-04 18:37:36 +01:00
3d108d6dce
Update jQuery, removes "event.layerX/layerY are broken and deprecated in WebKit" message
2012-02-03 19:20:32 +01:00
a300bb6e92
move randomString function into module
2012-01-28 13:24:58 +01:00
d370a5b76f
Improved npm and node version checks
2012-01-26 12:55:54 +01:00
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
ada09f3e6b
Added a jshint binary
2012-01-22 14:56:08 +01:00
50f67a57ad
Fix the url for nodejs installation
...
Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
2011-12-27 11:39:40 +05:30
6b20875355
add a tool to check for data corruption on pads
2011-12-05 18:24:59 +01:00
4986808782
updated nodejs windows version to 0.6.5
2011-12-04 19:05:33 +01:00
82d54fd70a
Fixes issue where etherpad ltie wont install deps because npm is 1.1 alpha-- Bit of a harsh fix but it works fine
2011-12-04 17:16:12 +01:00
3c8ee3df20
removed docs created with doc.md, these docs were completly useless
2011-12-04 17:12:27 +01:00
88a8853fda
Added a extractPadData Script
2011-11-27 05:32:31 +00:00
84e8fb94eb
Merge pull request #239 from riseuplabs/master
...
Fix for jquery version test: #234
2011-11-25 22:18:43 -08:00
28c5e3ffb1
Fix jquery version test: #234
2011-11-26 00:58:47 -05:00
6bcd2886e9
Fixed some problems with the database convertion
2011-11-25 17:56:50 -08:00
a6b4260cc9
Updated JQuery to 1.7, thx to @wikinaut
2011-11-19 12:18:21 -08:00
a6f7a63478
removed unneeded old parts from buildForWindows
2011-11-13 21:18:23 -08:00
646d6a4875
updated node.js version for buildForWindows Script to 0.6.1
2011-11-13 21:03:05 -08:00
08e0c91204
removed the node v0.4 check, it works now with node v0.6
2011-11-12 16:46:10 -08:00
e4af96e67b
removed unnecessary stuff from convertSettings
2011-08-21 16:51:08 +01:00
5fc2f95a9f
looks like buildForWindows was not executable anymore, don't know how that happend
2011-08-18 21:17:54 +01:00
8214e132b7
Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite
2011-08-18 21:05:44 +01:00
80c9f8ae8f
typo fix :)
2011-08-19 03:06:29 +03:00
dd4c8dc3aa
added a convert script from old etherpad to etherpad lite, instructions will follow
2011-08-18 20:58:56 +01:00
8deb853be6
updated node for windows to 0.5.4
2011-08-12 15:03:01 +01:00
53cdd893af
added a buildForWindows script
2011-08-11 22:00:52 +01:00
4b892ae4ff
check node and npm version on install
2011-08-11 15:09:05 +01:00
f5b06b0d25
Ops, fixed the folder remove
2011-08-09 11:14:09 +01:00
04ec7658e1
remove node_modules folder when the installation fails, prevents from broken dependencies
2011-08-09 10:58:43 +01:00
30f00a530e
replaced wget with curl
2011-08-09 10:54:55 +01:00
d0addfddb3
spelling fixes in the shell scripts
2011-08-03 23:18:12 +02:00
c984f496c2
fixed issue # 64, making the shell scripts more portable (for OS X)
2011-08-03 23:08:27 +02:00
051589ed47
Allow starting as root after input a silly prompt
2011-08-02 22:28:17 +01:00
22b00264d8
Ops, looks like I messed up installDeps.sh
2011-07-31 17:37:50 +01:00
de32503f8e
improve including of custom js/css
2011-07-31 17:21:01 +01:00
f1d06c55b4
fixed the generateJsDoc script
2011-07-30 17:25:49 +01:00
a47b5ab458
added the ability to add costum js/css
2011-07-30 16:33:35 +01:00
de5c0741f7
improved the bin files
2011-07-27 14:37:12 +01:00
6b43d2252b
fixed merge conflicts
2011-07-26 19:30:39 +01:00
75cc53139e
Shell scripts are now POSIX compatible, thx @ Johannes Schauer
2011-07-26 19:28:49 +01:00
2e163f2924
reorganzied the bin folder
2011-07-26 17:00:56 +01:00
bd1ac333db
update jquery
2011-07-12 13:33:44 +01:00
73e9ef18a9
fixed a little bug in runSafe
2011-07-11 22:37:11 +02:00
d9084bd8a2
Added a runSafe script that restarts ep-lite if its failing
2011-07-11 18:56:29 +02:00
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
jeffreyye