GitHub Merge Button
09f5a57106
Merge 95d98f0cd0
into 165f26947d
2012-01-22 06:25:38 -08:00
Montana Scott Rowe
95d98f0cd0
forgot to edit other scripts
2012-01-19 17:51:44 -06:00
Montana Scott Rowe
2b8af11405
moved server into a module and actual invocation out of it
2012-01-19 17:46:55 -06:00
Montana Scott Rowe
a7d9e6b9a3
checked to make sure init is passed a function
2012-01-19 17:36:56 -06:00
Montana Scott Rowe
7e522eaf85
put POSTs into an object literal
2012-01-19 17:28:45 -06:00
Montana Scott Rowe
c16d3a0f67
moved GETs into an object literal
2012-01-19 17:20:26 -06:00
Montana Scott Rowe
c7d4a5cf33
moved GET functions into an object
2012-01-19 17:04:17 -06:00
Montana Scott Rowe
1b03e1991a
placed additionalSetup hook
2012-01-19 16:55:39 -06:00
Montana Scott Rowe
a45dd74b31
factored out goToPad as a combinator
2012-01-19 16:48:24 -06:00
Montana Scott Rowe
772925f285
pulled configure and basic_auth into global scope
2012-01-19 16:29:04 -06:00
Montana Scott Rowe
b0d23cb952
factored out API caller and client feedback combinators
2012-01-19 14:42:40 -06:00
Montana Scott Rowe
e703fd1ba0
factored out pad import
2012-01-19 14:26:05 -06:00
Montana Scott Rowe
b38d88e454
factored out pad export POST combinator in the least interesting way
2012-01-19 14:07:19 -06:00
Montana Scott Rowe
fdcf1d4153
factored out static serve on goToPad
2012-01-19 13:36:50 -06:00
Montana Scott Rowe
a4795eb88d
factored out read only pad getter
2012-01-19 13:17:42 -06:00
Montana Scott Rowe
c5c548db11
refactored out readonly pad render combinators
2012-01-19 12:52:52 -06:00
Montana Scott Rowe
b0a58b0b3e
finished a step I'd accidentally left half-completed in the refactoring of a higher-order function
2012-01-19 11:56:50 -06:00
Montana Scott Rowe
c109af52e1
for read-only pads, turned async series into waterfall to reduce state and factored out translation combinator
2012-01-19 11:55:59 -06:00
Montana Scott Rowe
7b96bb7f8e
factored out static sendfile
2012-01-19 10:44:38 -06:00
Azul
c4f9268cfa
make PadMessageHandler more robust against timing issues
2012-01-19 17:38:16 +01:00
Montana Scott Rowe
e1159f0ee0
factored out shutdown setup
2012-01-19 10:14:14 -06:00
Montana Scott Rowe
98f11bea6d
factored out socket.io setup
2012-01-19 10:11:51 -06:00
Montana Scott Rowe
08040e7444
factored out static serve and pad name check combinators
2012-01-19 09:46:06 -06:00
Montana Scott Rowe
fcb3b11c0e
factored out pad access as a combinator
2012-01-19 09:42:56 -06:00
Peter 'Pita' Martischka
a313c2570e
Merge pull request #331 from cweider/packaging-improvement
...
Packaging improvement
2012-01-15 12:48:41 -08:00
Chad Weider
9c91f16c71
Improve inlining of editor content.
...
Instead of replacing substrings, write each included file's content into a shared dictionary for lookup later. This eliminates duplication and arguably improves readability.
2012-01-15 11:27:04 -08:00
John McLear
f4dca37a93
Ordered list support
2012-01-15 17:20:20 +00:00
Chad Weider
77804673d7
Move packaging info into its own file.
2012-01-15 01:52:58 -08:00
Chad Weider
387dd4a48b
The value of all href attributes is escaped.
2012-01-14 14:50:23 -08:00
Chad Weider
6e36b59a59
All escaping functions replace HTML reserved characters.
2012-01-14 14:46:15 -08:00
John McLear
642b716553
Merge pull request #289 from jhollinger/no_spaces
...
Sanitize pad names
2012-01-08 07:30:07 -08:00
John McLear
86902c2c0b
Merge pull request #291 from jhollinger/export_revisions
...
Add ability to export specific pad revisions
2012-01-08 07:06:13 -08:00
Jordan
7c84d8cc74
Bugfix to API calling indexOf on an undefined padID
2011-12-22 00:22:36 -05:00
Jordan
2a86d57e46
Add ability to export specific pad revisions
2011-12-18 00:18:35 -05:00
Jordan
e8ef99fb72
Sanitize pad names
2011-12-16 15:41:11 -05:00
Peter 'Pita' Martischka
609701961e
Added some comments to help us documentating the code
2011-12-11 19:45:40 +01:00
Peter 'Pita' Martischka
c72cd49ede
Merge branch 'dokuwiki-merge' of git://github.com/adrianlang/etherpad-lite into dokuwiki
2011-12-11 18:09:51 +01:00
Peter 'Pita' Martischka
6684d6ed52
replaced all stop callbacks with customError callbacks. Fixes #270
2011-12-10 16:46:47 +01:00
Peter 'Pita' Martischka
49006a3b6a
Don't make the globalPads too global ;)
2011-12-08 23:32:51 +01:00
Adrian Lang
40c5e70aa7
Add DokuWiki export
2011-12-07 13:03:08 +01:00
Peter 'Pita' Martischka
18f90866ae
fixed reconnect
2011-12-04 22:01:49 +01:00
Peter 'Pita' Martischka
7075fbebe6
fixed a bug in auto reconnect
2011-12-04 19:43:05 +01:00
Peter 'Pita' Martischka
8a6704beef
reduced the httpAuth timeout to 1000ms
2011-12-04 17:27:36 +01:00
Peter 'Pita' Martischka
a4eef2780e
Merge branch 'issue241' of git://github.com/alx/etherpad-lite into httpAuth
2011-12-04 17:22:00 +01:00
Peter 'Pita' Martischka
bfbdac10d3
fixed #250
2011-12-04 17:09:31 +01:00
Peter 'Pita' Martischka
5c56e62d67
Changed all error handling to async-stacktrace style + fixed import/export on unix
2011-12-04 16:50:02 +01:00
Peter 'Pita' Martischka
db1ba6a65e
Don't let express catch errors, let the process die
2011-12-04 15:19:24 +01:00
Peter 'Pita' Martischka
e44b41f4a3
Fixed the easysync test
2011-12-03 21:32:52 +01:00
Alexandre Girard
71fee11656
add the ability to set global password with http basic auth
2011-12-01 16:44:51 +01:00
Peter 'Pita' Martischka
f33af4700b
Merge pull request #242 from jaseg/master
...
Random filename generation fix, made a windows-only delay actually windows-only.
2011-11-26 12:23:44 -08:00