libretic/etherpad-lite
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1396 commits 2 branches 0 tags 24 MiB
Commit graph

78 commits

Author SHA1 Message Date
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
booo
a300bb6e92 move randomString function into module 2012-01-28 13:24:58 +01:00
Peter 'Pita' Martischka
d370a5b76f Improved npm and node version checks 2012-01-26 12:55:54 +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
ada09f3e6b Added a jshint binary 2012-01-22 14:56:08 +01:00
Sankar P
50f67a57ad Fix the url for nodejs installation 
Signed-off-by: Sankar P <sankar.curiosity@gmail.com>
 2011-12-27 11:39:40 +05:30
Peter 'Pita' Martischka
6b20875355 add a tool to check for data corruption on pads 2011-12-05 18:24:59 +01:00
Peter 'Pita' Martischka
4986808782 updated nodejs windows version to 0.6.5 2011-12-04 19:05:33 +01:00
John McLear
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
Peter 'Pita' Martischka
3c8ee3df20 removed docs created with doc.md, these docs were completly useless 2011-12-04 17:12:27 +01:00
Peter 'Pita' Martischka
88a8853fda Added a extractPadData Script 2011-11-27 05:32:31 +00:00
Peter 'Pita' Martischka
84e8fb94eb Merge pull request #239 from riseuplabs/master 
Fix for jquery version test: #234
 2011-11-25 22:18:43 -08:00
Micah Anderson
28c5e3ffb1 Fix jquery version test: #234 2011-11-26 00:58:47 -05:00
Peter 'Pita' Martischka
6bcd2886e9 Fixed some problems with the database convertion 2011-11-25 17:56:50 -08:00
Peter 'Pita' Martischka
a6b4260cc9 Updated JQuery to 1.7, thx to @wikinaut 2011-11-19 12:18:21 -08:00
Peter 'Pita' Martischka
a6f7a63478 removed unneeded old parts from buildForWindows 2011-11-13 21:18:23 -08:00
Peter 'Pita' Martischka
646d6a4875 updated node.js version for buildForWindows Script to 0.6.1 2011-11-13 21:03:05 -08:00
Peter 'Pita' Martischka
08e0c91204 removed the node v0.4 check, it works now with node v0.6 2011-11-12 16:46:10 -08:00
Peter 'Pita' Martischka
e4af96e67b removed unnecessary stuff from convertSettings 2011-08-21 16:51:08 +01:00
Peter 'Pita' Martischka
5fc2f95a9f looks like buildForWindows was not executable anymore, don't know how that happend 2011-08-18 21:17:54 +01:00
Peter 'Pita' Martischka
8214e132b7 Merge branch 'patch-6' of git://github.com/0ip/etherpad-lite 2011-08-18 21:05:44 +01:00
Robin Buse
80c9f8ae8f typo fix :) 2011-08-19 03:06:29 +03: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
8deb853be6 updated node for windows to 0.5.4 2011-08-12 15:03:01 +01:00
Peter 'Pita' Martischka
53cdd893af added a buildForWindows script 2011-08-11 22:00:52 +01:00
Peter 'Pita' Martischka
4b892ae4ff check node and npm version on install 2011-08-11 15:09:05 +01:00
Peter 'Pita' Martischka
f5b06b0d25 Ops, fixed the folder remove 2011-08-09 11:14:09 +01:00
Peter 'Pita' Martischka
04ec7658e1 remove node_modules folder when the installation fails, prevents from broken dependencies 2011-08-09 10:58:43 +01:00
Peter 'Pita' Martischka
30f00a530e replaced wget with curl 2011-08-09 10:54:55 +01:00
Garrett LeSage
d0addfddb3 spelling fixes in the shell scripts 2011-08-03 23:18:12 +02:00