Peter 'Pita' Martischka
|
da2b456b5b
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-27 00:23:14 +01:00 |
|
Peter 'Pita' Martischka
|
ed8aff22d4
|
restart abiword on crash and give the user feedback about bad import files
|
2012-02-27 00:22:53 +01:00 |
|
John McLear
|
4fc57921f0
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-26 21:27:06 +00:00 |
|
Stefan 'Gared
|
0336526a64
|
Merge branch 'master' of http://github.com/Pita/etherpad-lite
|
2012-02-26 21:26:47 +00:00 |
|
John McLear
|
4dc86f3382
|
fix #507 import showing when it shouldnt
|
2012-02-26 21:26:42 +00:00 |
|
Egil Moeller
|
0a4a7f538d
|
Merge branch 'temo'
|
2012-02-26 22:02:02 +01:00 |
|
Egil Moeller
|
2c7b84ca3e
|
Minify now supports plugins
|
2012-02-26 22:01:52 +01:00 |
|
Stefan 'Gared
|
6706332e42
|
Merge branch 'master' of http://github.com/Pita/etherpad-lite
|
2012-02-26 19:52:09 +00:00 |
|
John McLear
|
7d923277a6
|
Merge pull request #506 from jucovschi/changeset_docs
more doc updates on Changeset.js
|
2012-02-26 11:14:40 -08:00 |
|
Constantin Jucovschi
|
9fe4318e77
|
more doc update
|
2012-02-26 18:59:11 +00:00 |
|
Peter 'Pita' Martischka
|
00c3281a02
|
Forbid colons, this Fixes #301
|
2012-02-26 19:59:02 +01:00 |
|
John McLear
|
1b66a48eaf
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-26 18:17:23 +00: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 |
|
Peter 'Pita' Martischka
|
c3f728b2ed
|
Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller"
This reverts commit 9ede14a546.
|
2012-02-26 16:13:07 +01:00 |
|
John McLear
|
21246711c1
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-26 15:13:01 +00:00 |
|
John McLear
|
aa78456ab9
|
Revert "drop embedding of JS/CSS files in ace.js. May result in a little performance drop but makes code much smaller"
This reverts commit 9ede14a546.
|
2012-02-26 14:49:13 +00:00 |
|
Egil Moeller
|
fd5b7c1080
|
require(ep_pluginname/static/blabla); now works both on client and server
|
2012-02-26 15:34:03 +01:00 |
|
John McLear
|
43e72da0b9
|
I suck at md.
|
2012-02-26 14:24:21 +00:00 |
|
John McLear
|
59b414c826
|
Update README.md
|
2012-02-26 14:23:59 +00:00 |
|
John McLear
|
45d0d93d03
|
Update README.md
|
2012-02-26 14:23:07 +00:00 |
|
John McLear
|
af40ea3181
|
added paypal donation point...
|
2012-02-26 14:22:32 +00:00 |
|
John McLear
|
979cfdf738
|
Added foundation flattr account.
|
2012-02-26 14:20:50 +00:00 |
|
Egil Moeller
|
ac7ad6b519
|
Bugfix for git version extraction code
|
2012-02-26 14:14:54 +01:00 |
|
Peter 'Pita' Martischka
|
9709589f87
|
Merge pull request #505 from jucovschi/changeset_docs
Documented Changeset.js to the best of my knowledge
|
2012-02-26 05:13:27 -08:00 |
|
John McLear
|
8d764cad33
|
Perma fix for issue #485 and #327
|
2012-02-26 13:07:09 +00:00 |
|
Constantin Jucovschi
|
e318e3d4cb
|
some new docs
|
2012-02-26 12:59:20 +00:00 |
|
Constantin Jucovschi
|
ac86535cdf
|
more docs
|
2012-02-26 12:59:11 +00:00 |
|
Constantin Jucovschi
|
3abdd34160
|
writing in jsdoc syntax
|
2012-02-26 12:59:02 +00:00 |
|
Constantin Jucovschi
|
1e8ef3bb6a
|
commented general functions
|
2012-02-26 12:58:57 +00:00 |
|
Egil Moeller
|
da52353ba3
|
The big rename of pluginbs from pluginomatic to ep
|
2012-02-26 13:54:32 +01:00 |
|
John McLear
|
681e8415b6
|
Fix issue #485
|
2012-02-26 12:38:52 +00: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 |
|
Egil Moeller
|
1955bdec9a
|
plugins.plugins is now defined while loading hook modules from plugins
|
2012-02-26 00:59:05 +01:00 |
|
Egil Moeller
|
2a58a62dcc
|
Client side / server side require
|
2012-02-26 00:45:06 +01:00 |
|
John McLear
|
44ec2e148a
|
Merge pull request #502 from drdla/master
Suggestion for new favicon
|
2012-02-25 14:40:35 -08:00 |
|
Dominik Rodler
|
4e54ebb0b8
|
Added new favicon
|
2012-02-25 20:45:28 +01:00 |
|
John McLear
|
7e3a3bb9ea
|
Merge branch 'master' of github.com:Pita/etherpad-lite
|
2012-02-25 19:37:29 +00:00 |
|
John McLear
|
2fd1702960
|
fix sticky chat... dont like where i put the call but it will have to do cause im tired.
|
2012-02-25 19:35:49 +00:00 |
|
0ip
|
1b339a6a6d
|
Merge pull request #486 from fourplusone/fix_redirect
use relative path for redirects avoiding problems with reverse proxies
|
2012-02-25 11:05:26 -08:00 |
|
Egil Moeller
|
261bbd460f
|
test static files for plugins
|
2012-02-25 19:43:39 +01:00 |
|
Egil Moeller
|
ce35f20988
|
Make plugins dict non-recursive
|
2012-02-25 19:43:22 +01:00 |
|
Egil Moeller
|
e542199aab
|
Serve plugin static files
|
2012-02-25 19:43:00 +01:00 |
|
John McLear
|
a449876f80
|
Merge pull request #498 from eldiddio/master
This fixes issue #308
|
2012-02-25 09:32:55 -08:00 |
|
Mark Fisher
|
164db7b074
|
Added test for IE XML HTTP and added link to wiki article
|
2012-02-25 17:30:59 +00:00 |
|
Egil Moeller
|
1d86c828bc
|
Bugfix for plugin listing
|
2012-02-25 17:58:25 +01:00 |
|
John McLear
|
bbaa6bb7d2
|
add stuff for how to do load testing
|
2012-02-25 16:54:27 +00:00 |
|
Egil Moeller
|
7b42987407
|
Moved all the hooks into a hooks directory
|
2012-02-25 17:23:44 +01:00 |
|
Egil Moeller
|
6754eed9b4
|
Renamed functions to match hook names
|
2012-02-25 16:53:15 +01:00 |
|
Egil Moeller
|
f2cfb4eee5
|
Removed some more junk
|
2012-02-25 16:50:11 +01:00 |