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
1f0353d680
Change 'npm link' to 'npm install'. It does the same but doesn't need root permissions and it's able to check which dependencies are already installed
2011-06-23 11:34:57 +01:00
92b8e2ea9e
Removed npm link from run.sh
2011-06-04 18:05:47 +01:00
43712c4cef
run.sh is startable from any location again
2011-06-04 15:57:39 +01:00
4e0cf8a0c3
Fixed typo
2011-06-02 14:36:12 +01:00
8693f317ac
Improve run.sh in many points
2011-06-02 13:43:34 +01:00
280b4ab9c7
Create a template of the settings file
2011-06-02 12:15:02 +01:00
14f0d443df
Empty the documentation folder before creating the new files
2011-05-29 21:53:14 +01:00
7024f3e78a
Replace JSDoc-Toolkit with doc.md
2011-05-29 21:30:56 +01:00
d0da998299
removed debug message
2011-05-13 15:53:20 +01:00
b4ca337020
Change in the project directory before starting server.js, solves a problem with npm
2011-05-13 15:52:07 +01:00
debbced185
Fixing scripts to run from both bin/ and /.
2011-04-07 19:54:41 +02:00
4b99fec6ae
Improve run.sh
2011-04-07 14:51:46 +01:00
7f851b6376
Add a runDebug Script
2011-03-28 13:27:09 +01:00
325c322a27
first-commit
2011-03-26 13:10:41 +00:00
Marcel Klehr